Index: SDDs/HeaderBar/images/ButtonRow.png
===================================================================
diff -u -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5 -r9cf3722af44d68c46b511c2be8c945ffd3bc3873
Binary files differ
Index: SDDs/HeaderBar/images/HeaderBar.png
===================================================================
diff -u -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5 -r9cf3722af44d68c46b511c2be8c945ffd3bc3873
Binary files differ
Index: SDDs/HeaderBar/images/Highlight.png
===================================================================
diff -u -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5 -r9cf3722af44d68c46b511c2be8c945ffd3bc3873
Binary files differ
Index: SDDs/HeaderBar/images/MainMenu.png
===================================================================
diff -u -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5 -r9cf3722af44d68c46b511c2be8c945ffd3bc3873
Binary files differ
Index: SDDs/HeaderBar/images/MenuRow.png
===================================================================
diff -u -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5 -r9cf3722af44d68c46b511c2be8c945ffd3bc3873
Binary files differ
Index: SDDs/HeaderBar/images/delegateItem.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/menuDelegate.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/images/menuHighlight.png
===================================================================
diff -u
Binary files differ
Index: SDDs/HeaderBar/main.dot
===================================================================
diff -u -rcf4466dfa9b676d38cf535e2c1a23b14a83ea8b5 -r9cf3722af44d68c46b511c2be8c945ffd3bc3873
--- SDDs/HeaderBar/main.dot	(.../main.dot)	(revision cf4466dfa9b676d38cf535e2c1a23b14a83ea8b5)
+++ SDDs/HeaderBar/main.dot	(.../main.dot)	(revision 9cf3722af44d68c46b511c2be8c945ffd3bc3873)
@@ -6,14 +6,15 @@
     // Prefix: q - Qt component, d - Diality component, i - image
     // Define the main componenets
     dTopLevelComponent      [shape=box,     label="HeaderBar.qml\nRectangle",               fontsize="30pt"];
-    dMainMenu               [shape=box,     label="MainMenu.qml\nItem",                     fontsize="30pt"];
+    dMainMenu               [shape=box,     label="MainMenu.qml\nRectangle",                fontsize="30pt"];
     dWifiButton             [shape=box,     label="IconButton.qml\nTouchRect.qml",          fontsize="30pt"];
     dCloudSyncButton        [shape=box,     label="IconButton.qml\nTouchRect.qml",          fontsize="30pt"];
     dBlueToothButton        [shape=box,     label="IconButton.qml\nTouchRect.qml",          fontsize="30pt"];
     dSettingsButton         [shape=box,     label="IconButton.qml\nTouchRect.qml",          fontsize="30pt"];
     dPrescriptionButton     [shape=box,     label="IconButton.qml\nTouchRect.qml",          fontsize="30pt"];
     dInformationButton      [shape=box,     label="IconButton.qml\nTouchRect.qml",          fontsize="30pt"];
     dStorageButton          [shape=box,     label="IconButton.qml\nTouchRect.qml",          fontsize="30pt"];
+    dDelegateTouchRect      [shape=box,     label="TouchRect.qml\nRectangle",               fontsize="30pt"];
 
     // screenshots
     iHeaderBar      [shape=none,    label="",                       image="images/HeaderBar.png",       fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
@@ -30,8 +31,10 @@
     iCloudSync      [shape=none,    label="",                       image="images/CloudSync.png",       fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
     iInformation    [shape=none,    label="",                       image="images/Information.png",     fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
     iStorage        [shape=none,    label="",                       image="images/Storage.png",         fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
-    iMenuRow        [shape=none,    label="",                       image="images/MenuRow.png",         fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
-    
+    iMenuHighlight  [shape=none,    label="",                       image="images/menuHighlight.png",   fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+    iMenuDelegate   [shape=none,    label="",                       image="images/menuDelegate.png",    fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+    iDelegateItem   [shape=none,    label="",                       image="images/delegateItem.png",    fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true];
+
     // qml types
     qDateTimeItem       [shape=ellipse, label="Item\nid: _dateTimeItem",        fontsize="30pt"];
     qDateTimeColumn     [shape=ellipse, label="Column",                         fontsize="30pt"];
@@ -45,8 +48,10 @@
     qPrescriptionButton [shape=ellipse, label="Image",                          fontsize="30pt"];
     qInformationButton  [shape=ellipse, label="Image",                          fontsize="30pt"];
     qStorageButton      [shape=ellipse, label="Image",                          fontsize="30pt"];
-    qHighlight          [shape=ellipse, label="Rectangle\nid : _highlightRect", fontsize="30pt"];
-    qMenuRow            [shape=ellipse, label="Row\nRepeater\nTouchRect",       fontsize="30pt"];
+    qMenuRow            [shape=ellipse, label="ListView",                       fontsize="30pt"];
+    qMenuHighlight      [shape=ellipse, label="Rectangle\nid: _highlightRectangle", fontsize="30pt"];
+    qHighlight          [shape=ellipse, label="Rectangle\nid : _highlightedItem",fontsize="30pt"];
+    qMenuDeligate       [shape=ellipse, label="Rectangle\nid: _delegateControl", fontsize="30pt"];
 
     // Diagram Layout
     subgraph cluster_one  {
@@ -59,16 +64,17 @@
         qDateTimeColumn -> qDateText -> iDateText;
 
         iHeaderBar -> dMainMenu -> iMainMenu
-        iMainMenu -> qHighlight -> iHighlight
-        iMainMenu -> qMenuRow -> iMenuRow
+        iMainMenu -> qMenuRow
+        qMenuRow -> qMenuHighlight -> iMenuHighlight -> qHighlight -> iHighlight
+        qMenuRow -> qMenuDeligate -> iMenuDelegate -> dDelegateTouchRect -> iDelegateItem
 
         iHeaderBar -> qButtonRow -> iButtonRow
         iButtonRow -> dPrescriptionButton -> iPrescription -> qPrescriptionButton
-        iButtonRow -> dSettingsButton -> iSettings -> qSettingsButton
         iButtonRow -> dWifiButton -> iWifi -> qWifiButton
         iButtonRow -> dBlueToothButton -> iBluetooth -> qBlueToothButton
         iButtonRow -> dCloudSyncButton -> iCloudSync -> qCloudSyncButton
         iButtonRow -> dStorageButton ->iStorage -> qStorageButton
+        iButtonRow -> dSettingsButton -> iSettings -> qSettingsButton
         iButtonRow -> dInformationButton -> iInformation -> qInformationButton
     }
 }
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -r204d5f7514be78430a667297ced829bd104880d5 -r9cf3722af44d68c46b511c2be8c945ffd3bc3873
--- sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 204d5f7514be78430a667297ced829bd104880d5)
+++ sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 9cf3722af44d68c46b511c2be8c945ffd3bc3873)
@@ -74,7 +74,7 @@
             color: "transparent"
 
             Rectangle {
-                id: highlightedItem
+                id: _highlightedItem
                 objectName: "highlightedItem"
                 anchors {
                     horizontalCenter: parent.horizontalCenter