preparation of a more simple HMI: alpha version runs

34 files changed, 821 insertions, 304 deletions

diff --git a/src/hmi/qml/CameraSettings.qml b/src/hmi/qml/CameraSettings.qml
index b980868..5876860 100644
--- a/src/hmi/qml/CameraSettings.qml
+++ b/src/hmi/qml/CameraSettings.qml
@@ -262,13 +262,13 @@ HMIMenu {
                       }
 
                  StdButton {source:StyleSheetSettings.tiltp[Constants.SOURCE]; x:StyleSheetSettings.tiltp[StyleSheetSettings.X]; y:StyleSheetSettings.tiltp[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltp[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltp[StyleSheetSettings.HEIGHT];
-                            id:tiltp; explode:false; next:tiltm; prev:daynight;
+                            id:tiltp;  next:tiltm; prev:daynight;
                          onPressed: {camera_start_clamp("CameraTiltAngle",-10,0);}
                          onReleased: {camera_stop();}
                  }
 
                  StdButton {source:StyleSheetSettings.tiltm[Constants.SOURCE]; x:StyleSheetSettings.tiltm[StyleSheetSettings.X]; y:StyleSheetSettings.tiltm[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltm[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltm[StyleSheetSettings.HEIGHT];
-                            id:tiltm; explode:false; next:heightp; prev:tiltp;
+                            id:tiltm;  next:heightp; prev:tiltp;
                          onPressed: {camera_start_clamp("CameraTiltAngle",10,90);}
                          onReleased: {camera_stop();}
                  }
@@ -282,13 +282,13 @@ HMIMenu {
                       }
 
                  StdButton {source:StyleSheetSettings.heightp[Constants.SOURCE]; x:StyleSheetSettings.heightp[StyleSheetSettings.X]; y:StyleSheetSettings.heightp[StyleSheetSettings.Y]; width:StyleSheetSettings.heightp[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightp[StyleSheetSettings.HEIGHT];
-                            id:heightp;explode:false; next:heightm; prev:tiltm;
+                            id:heightp; next:heightm; prev:tiltm;
                          onPressed: {camera_start("CameraHeight",10);}
                          onReleased: {camera_stop();}
                  }
 
                  StdButton {source:StyleSheetSettings.heightm[Constants.SOURCE]; x:StyleSheetSettings.heightm[StyleSheetSettings.X]; y:StyleSheetSettings.heightm[StyleSheetSettings.Y]; width:StyleSheetSettings.heightm[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightm[StyleSheetSettings.HEIGHT];
-                            id:heightm; explode:false; next:distancep; prev:heightp;
+                            id:heightm;  next:distancep; prev:heightp;
                          onPressed: {camera_start("CameraHeight",-10);}
                          onReleased: {camera_stop();}
                  }
@@ -302,47 +302,47 @@ HMIMenu {
                       }
 
                  StdButton {source:StyleSheetSettings.distancep[Constants.SOURCE]; x:StyleSheetSettings.distancep[StyleSheetSettings.X]; y:StyleSheetSettings.distancep[StyleSheetSettings.Y]; width:StyleSheetSettings.distancep[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distancep[StyleSheetSettings.HEIGHT];
-                            id:distancep; explode:false; next:distancem; prev:heightm;
+                            id:distancep;  next:distancem; prev:heightm;
                          onPressed: {camera_start("CameraDistanceFromTargetPoint",10);}
                          onReleased: {camera_stop();}
                  }
 
                  StdButton {source:StyleSheetSettings.distancem[Constants.SOURCE]; x:StyleSheetSettings.distancem[StyleSheetSettings.X]; y:StyleSheetSettings.distancem[StyleSheetSettings.Y]; width:StyleSheetSettings.distancem[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distancem[StyleSheetSettings.HEIGHT];
-                            id:distancem; explode:false; next:exit; prev:distancep;
+                            id:distancem;  next:exit; prev:distancep;
                          onPressed: {camera_start("CameraDistanceFromTargetPoint",-10);}
                          onReleased: {camera_stop();}
                  }
 
                  StdButton {source:StyleSheetSettings.north[Constants.SOURCE]; x:StyleSheetSettings.north[StyleSheetSettings.X]; y:StyleSheetSettings.north[StyleSheetSettings.Y]; width:StyleSheetSettings.north[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.north[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.northText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.northText[StyleSheetSettings.PIXELSIZE];
-                            id:north; text: Genivi.gettext("North"); explode:false; next:south; prev:exit;
+                            id:north; text: Genivi.gettext("North");  next:south; prev:exit;
                      onClicked: {
                          set_angle(0);
                      }
                  }
 
                  StdButton { source:StyleSheetSettings.south[Constants.SOURCE]; x:StyleSheetSettings.south[StyleSheetSettings.X]; y:StyleSheetSettings.south[StyleSheetSettings.Y]; width:StyleSheetSettings.south[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.south[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.southText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.southText[StyleSheetSettings.PIXELSIZE];
-                            id:south; text:Genivi.gettext("South"); explode:false; next:east; prev:north;
+                            id:south; text:Genivi.gettext("South");  next:east; prev:north;
                      onClicked: {
                          set_angle(180);
                      }
                  }
 
                  StdButton {source:StyleSheetSettings.east[Constants.SOURCE]; x:StyleSheetSettings.east[StyleSheetSettings.X]; y:StyleSheetSettings.east[StyleSheetSettings.Y]; width:StyleSheetSettings.east[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.east[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.eastText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.eastText[StyleSheetSettings.PIXELSIZE];
-                            id:east; text:Genivi.gettext("East"); explode:false; next:west; prev:south;
+                            id:east; text:Genivi.gettext("East");  next:west; prev:south;
                      onClicked: {
                          set_angle(90);
                      }
                  }
 
                  StdButton {source:StyleSheetSettings.west[Constants.SOURCE]; x:StyleSheetSettings.west[StyleSheetSettings.X]; y:StyleSheetSettings.west[StyleSheetSettings.Y]; width:StyleSheetSettings.west[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.west[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.westText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.westText[StyleSheetSettings.PIXELSIZE];
-                            id:west; text:Genivi.gettext("West"); explode:false; next:split; prev:east;
+                            id:west; text:Genivi.gettext("West");  next:split; prev:east;
                      onClicked: {
                          set_angle(270);
                      }
                  }
 
                  StdButton {source:StyleSheetSettings.exit[Constants.SOURCE]; x:StyleSheetSettings.exit[StyleSheetSettings.X]; y:StyleSheetSettings.exit[StyleSheetSettings.Y]; width:StyleSheetSettings.exit[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.exit[StyleSheetSettings.HEIGHT];
-                            id:exit; explode:false; next:north; prev:west;
+                            id:exit;  next:north; prev:west;
                      onClicked: {
                          Genivi.data['show_current_position']=true;
                          move_stop();
@@ -352,17 +352,17 @@ HMIMenu {
                  }
 
                  StdButton {source:StyleSheetSettings.split[Constants.SOURCE]; x:StyleSheetSettings.split[StyleSheetSettings.X]; y:StyleSheetSettings.split[StyleSheetSettings.Y]; width:StyleSheetSettings.split[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.split[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.splitText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.splitText[StyleSheetSettings.PIXELSIZE];
-                            id:split; text:Genivi.gettext("Split"); explode:false; next:perspective; prev:west;
+                            id:split; text:Genivi.gettext("Split");  next:perspective; prev:west;
                          onClicked: {toggleSplit();}
                  }
 
                  StdButton {source:StyleSheetSettings.perspective[Constants.SOURCE]; x:StyleSheetSettings.perspective[StyleSheetSettings.X]; y:StyleSheetSettings.perspective[StyleSheetSettings.Y]; width:StyleSheetSettings.perspective[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.perspective[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.perspectiveText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.perspectiveText[StyleSheetSettings.PIXELSIZE];
-                            id:perspective; text:Genivi.gettext("CameraPerspective3d"); explode:false; next:daynight; prev:split;
+                            id:perspective; text:Genivi.gettext("CameraPerspective3d");  next:daynight; prev:split;
                          onClicked: {togglePerspective();}
                  }
 
                  StdButton {source:StyleSheetSettings.daynight[Constants.SOURCE]; x:StyleSheetSettings.daynight[StyleSheetSettings.X]; y:StyleSheetSettings.daynight[StyleSheetSettings.Y]; width:StyleSheetSettings.daynight[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.daynight[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.daynightText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.daynightText[StyleSheetSettings.PIXELSIZE];
-                            id:daynight; text:Genivi.gettext("Day"); explode:false; next:tiltp; prev:perspective;
+                            id:daynight; text:Genivi.gettext("Day");  next:tiltp; prev:perspective;
                      onClicked: {
                          toggleDayNight();
                      }
diff --git a/src/hmi/qml/Core/NavigationAppHMIMenu.qml b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
index ef6b0c6..d6e142a 100644
--- a/src/hmi/qml/Core/NavigationAppHMIMenu.qml
+++ b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
@@ -157,19 +157,11 @@ Rectangle {
         container.load(outmenu);
     }
 
-    function routeMenu()
-    { //location entered, go to route menu and reinit the heap
-        menu.state="hidden";
-        Genivi.entrybackheapsize = 1;
-        Genivi.entryback[Genivi.entrybackheapsize] = "MainMenu";
-        container.load("NavigationAppBrowseMap");
-    }
-
     function mapMenu()
     { //go to map view menu and reinit the heap
         menu.state="hidden";
         Genivi.entrybackheapsize = 1;
-        Genivi.entryback[Genivi.entrybackheapsize] = "MainMenu";
+        Genivi.entryback[Genivi.entrybackheapsize] = "NavigationAppMain";
         container.load("NavigationAppBrowseMap");
     }
 
diff --git a/src/hmi/qml/Core/StdButton.qml b/src/hmi/qml/Core/StdButton.qml
index 3548951..de8a629 100644
--- a/src/hmi/qml/Core/StdButton.qml
+++ b/src/hmi/qml/Core/StdButton.qml
@@ -33,6 +33,7 @@ Button {
 	height: content.h
     source:"images/button-keyboard.png";
     property string page
+    explode: false
 	onClicked: {
 		if (page) {
 			pageOpen(page);
diff --git a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMap.xcf b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMap.xcf
index 81da5af..3e85a28 100644
--- a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMap.xcf
+++ b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMap.xcf
diff --git a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapManeuver.xcf b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapManeuver.xcf
new file mode 100755
index 0000000..3bbd59b
--- /dev/null
+++ b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapManeuver.xcf
diff --git a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapRoute.xcf b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapRoute.xcf
index 990a7c3..a444646 100755
--- a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapRoute.xcf
+++ b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapRoute.xcf
diff --git a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapSettings.xcf b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapSettings.xcf
index 537b101..891d2cb 100755
--- a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapSettings.xcf
+++ b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppBrowseMapSettings.xcf
diff --git a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppSearch.xcf b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppSearch.xcf
index 8925d33..d1caeaa 100644
--- a/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppSearch.xcf
+++ b/src/hmi/qml/Core/gimp/draft-theme/800x480/NavigationAppSearch.xcf
diff --git a/src/hmi/qml/Core/translations/deu_DEU.js b/src/hmi/qml/Core/translations/deu_DEU.js
index d5d8ddf..e9ae31c 100644
--- a/src/hmi/qml/Core/translations/deu_DEU.js
+++ b/src/hmi/qml/Core/translations/deu_DEU.js
@@ -95,7 +95,7 @@ translations["NavigationCalculatedRoute"]="GUIDANCE";
 translations["RouteDistance"]="DISTANCE";
 translations["RouteTime"]="TIME";
 translations["Guidance"]="GUIDANCE";
-translations["DisplayRoute"]="DISPLAY ROUTE";
+translations["DisplayRoute"]="DISPLAY";
 translations["OnMap"]="ON MAP";
 translations["InAList"]="IN A LIST";
 translations["StatusTitle"]="STATUS";
diff --git a/src/hmi/qml/Core/translations/eng_USA.js b/src/hmi/qml/Core/translations/eng_USA.js
index c0b41a6..582e5f9 100644
--- a/src/hmi/qml/Core/translations/eng_USA.js
+++ b/src/hmi/qml/Core/translations/eng_USA.js
@@ -95,7 +95,7 @@ translations["NavigationCalculatedRoute"]="GUIDANCE";
 translations["RouteDistance"]="DISTANCE";
 translations["RouteTime"]="TIME";
 translations["Guidance"]="GUIDANCE";
-translations["DisplayRoute"]="DISPLAY ROUTE";
+translations["DisplayRoute"]="DISPLAY";
 translations["OnMap"]="ON MAP";
 translations["InAList"]="IN A LIST";
 translations["StatusTitle"]="STATUS";
diff --git a/src/hmi/qml/Core/translations/fra_FRA.js b/src/hmi/qml/Core/translations/fra_FRA.js
index 6c7e7d7..5c2e4c9 100644
--- a/src/hmi/qml/Core/translations/fra_FRA.js
+++ b/src/hmi/qml/Core/translations/fra_FRA.js
@@ -95,7 +95,7 @@ translations["NavigationCalculatedRoute"]="GUIDAGE";
 translations["RouteDistance"]="DISTANCE";
 translations["RouteTime"]="DUREE";
 translations["Guidance"]="GUIDAGE";
-translations["DisplayRoute"]="AFFICHER LA ROUTE";
+translations["DisplayRoute"]="AFFICHER";
 translations["OnMap"]="CARTE";
 translations["InAList"]="LISTE";
 translations["StatusTitle"]="STATUS";
diff --git a/src/hmi/qml/Core/translations/jpn_JPN.js b/src/hmi/qml/Core/translations/jpn_JPN.js
index d669411..6d4d1e0 100644
--- a/src/hmi/qml/Core/translations/jpn_JPN.js
+++ b/src/hmi/qml/Core/translations/jpn_JPN.js
@@ -95,7 +95,7 @@ translations["NavigationCalculatedRoute"]="GUIDANCE";
 translations["RouteDistance"]="DISTANCE";
 translations["RouteTime"]="TIME";
 translations["Guidance"]="GUIDANCE";
-translations["DisplayRoute"]="DISPLAY ROUTE";
+translations["DisplayRoute"]="DISPLAY";
 translations["OnMap"]="ON MAP";
 translations["InAList"]="IN A LIST";
 translations["StatusTitle"]="STATUS";
diff --git a/src/hmi/qml/MainMenu.qml b/src/hmi/qml/MainMenu.qml
index 51a6129..36e359c 100644
--- a/src/hmi/qml/MainMenu.qml
+++ b/src/hmi/qml/MainMenu.qml
@@ -57,7 +57,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_navigation[Constants.SOURCE]; x:StyleSheet.select_navigation[Constants.X]; y:StyleSheet.select_navigation[Constants.Y]; width:StyleSheet.select_navigation[Constants.WIDTH]; height:StyleSheet.select_navigation[Constants.HEIGHT];
-            id:navigation; explode:false; next:mapview; prev:quit; onClicked: {
+            id:navigation;  next:mapview; prev:quit; onClicked: {
                 entryMenu("NavigationSearch",menu);
             }
         }
@@ -72,7 +72,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_mapview[Constants.SOURCE]; x:StyleSheet.select_mapview[Constants.X]; y:StyleSheet.select_mapview[Constants.Y]; width:StyleSheet.select_mapview[Constants.WIDTH]; height:StyleSheet.select_mapview[Constants.HEIGHT];
-            id:mapview; explode:false; next:trip; prev:navigation; onClicked: {
+            id:mapview;  next:trip; prev:navigation; onClicked: {
 				Genivi.data["show_current_position"]=true;
                 entryMenu("NavigationBrowseMap",menu);
 			}
@@ -88,7 +88,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_trip[Constants.SOURCE]; x:StyleSheet.select_trip[Constants.X]; y:StyleSheet.select_trip[Constants.Y]; width:StyleSheet.select_trip[Constants.WIDTH]; height:StyleSheet.select_trip[Constants.HEIGHT];
-            id:trip; explode:false; next:poi; prev:mapview;onClicked: {
+            id:trip;  next:poi; prev:mapview;onClicked: {
                 entryMenu("TripComputer",menu);
             }
         }
@@ -103,7 +103,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_poi[Constants.SOURCE]; x:StyleSheet.select_poi[Constants.X]; y:StyleSheet.select_poi[Constants.Y]; width:StyleSheet.select_poi[Constants.WIDTH]; height:StyleSheet.select_poi[Constants.HEIGHT];
-            id:poi; explode:false; next:configuration; prev:trip; onClicked: {
+            id:poi;  next:configuration; prev:trip; onClicked: {
                 entryMenu("POI",menu);
             }
         }
@@ -118,13 +118,13 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_configuration[Constants.SOURCE]; x:StyleSheet.select_configuration[Constants.X]; y:StyleSheet.select_configuration[Constants.Y]; width:StyleSheet.select_configuration[Constants.WIDTH]; height:StyleSheet.select_configuration[Constants.HEIGHT];
-            id:configuration; explode:false; next:quit; prev:trip; onClicked: {
+            id:configuration;  next:quit; prev:trip; onClicked: {
                 entryMenu("NavigationSettings",menu);
             }
         }
 
         StdButton {
             source:StyleSheet.quit[Constants.SOURCE]; x:StyleSheet.quit[Constants.X]; y:StyleSheet.quit[Constants.Y]; width:StyleSheet.quit[Constants.WIDTH]; height:StyleSheet.quit[Constants.HEIGHT];textColor:StyleSheet.quitText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.quitText[Constants.PIXELSIZE];
-            id:quit; text: Genivi.gettext("Quit"); explode:false; next:navigation; prev:configuration; onClicked:{Qt.quit()}}
+            id:quit; text: Genivi.gettext("Quit");  next:navigation; prev:configuration; onClicked:{Qt.quit()}}
     }
 }
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index d167121..3ea8ff8 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -35,6 +35,7 @@ import "Core/style-sheets/NavigationAppBrowseMapGuidance-css.js" as StyleSheetGu
 import "Core/style-sheets/NavigationAppBrowseMapScroll-css.js" as StyleSheetScroll
 import "Core/style-sheets/NavigationAppBrowseMapSimulation-css.js" as StyleSheetSimulation
 import "Core/style-sheets/NavigationAppBrowseMapTop-css.js" as StyleSheetTop
+import "Core/style-sheets/NavigationAppBrowseMapManeuver-css.js" as StyleSheetManeuver
 
 import lbs.plugin.dbusif 1.0
 
@@ -53,6 +54,7 @@ HMIMenu {
 	property Item fuelStopAdvisorSignal;
 	property bool north:false;
     property int speedValueSent: 0;
+    property bool displayManeuvers:false;
 
 	DBusIf {
 		id:dbusIf
@@ -157,7 +159,7 @@ HMIMenu {
             on_off.setState("OFF");
             simu_mode.setState("FREE");
         }
-}
+    }
 
     function updateSimulation()
     {
@@ -298,6 +300,31 @@ HMIMenu {
          }
 	}
 
+    function getManeuversList()
+    {
+        var res=Genivi.guidance_GetManeuversList(dbusIf,0xffff,0);
+        var maneuversList=res[5];
+        var model=maneuverArea.model;
+        for (var i = 0 ; i < maneuversList.length ; i+=2) {
+            var roadNameAfterManeuver=maneuversList[i+1][3];
+            var offsetOfNextManeuver=maneuversList[i+1][9];
+            var items=maneuversList[i+1][11];
+
+            for (var j = 0 ; j < items.length ; j+=2) {
+                //multiple maneuvers are not managed !
+                var offsetOfManeuver=items[j+1][1];
+                var direction=items[j+1][5];
+                var maneuver=items[j+1][7];
+                var maneuverData=items[j+1][9];
+                if (maneuverData[1] == Genivi.NAVIGATIONCORE_DIRECTION)
+                {
+                   var text=Genivi.distance(offsetOfManeuver)+" "+Genivi.distance(offsetOfNextManeuver)+" "+Genivi.ManeuverType[maneuver]+":"+Genivi.ManeuverDirection[direction]+" "+roadNameAfterManeuver;
+                   model.append({"name":text});
+                }
+            }
+        }
+    }
+
 	function connectSignals()
     {
         guidanceWaypointReachedSignal=Genivi.connect_guidanceWaypointReachedSignal(dbusIf,menu);
@@ -322,12 +349,6 @@ HMIMenu {
         fuelStopAdvisorSignal.destroy();
     }
 
-	function routeOverview()
-	{
-        disconnectSignals();
-        entryMenu("NavigationCalculatedRoute",menu);
-	}
-
 	function toggleOrientation()
 	{
 		north=!north;
@@ -419,6 +440,27 @@ HMIMenu {
         Genivi.mapmatchedposition_StartSimulation(dbusIf);
     }
 
+    function showManeuversList()
+    {
+        displayManeuvers=true;
+        maneuver.visible=true;
+        route.visible=false;
+        guidance.visible=false;
+        maneuverList.disabled=true;
+        exit.disabled=false;
+        getManeuversList();
+    }
+
+    function hideManeuversList()
+    {
+        displayManeuvers=false;
+        maneuver.visible=false;
+        route.visible=true;
+        guidance.visible=true;
+        maneuverList.disabled=false;
+        exit.disabled=true;
+    }
+
     Rectangle {
         id:map
         x:0
@@ -450,7 +492,6 @@ HMIMenu {
                     source:StyleSheetTop.select_search_for_refill_in_top[Constants.SOURCE]; x:StyleSheetTop.select_search_for_refill_in_top[Constants.X]; y:StyleSheetTop.select_search_for_refill_in_top[Constants.Y]; width:StyleSheetTop.select_search_for_refill_in_top[Constants.WIDTH]; height:StyleSheetTop.select_search_for_refill_in_top[Constants.HEIGHT];
                     id:select_search_for_refill_in_top
                     visible:false
-                    explode: false
                     onClicked: {
                         disconnectSignals();
                         entryMenu("NavigationAppPOI",menu);
@@ -507,7 +548,7 @@ HMIMenu {
 
                 StdButton {
                     x:StyleSheetBottom.directiondestination[Constants.X]; y:StyleSheetBottom.directiondestination[Constants.Y]; width:StyleSheetBottom.directiondestination[Constants.WIDTH]; height:StyleSheetBottom.directiondestination[Constants.HEIGHT];
-                    id:orientation; next:zoomin; prev:menub; explode:false; disabled:false;
+                    id:orientation; next:zoomin; prev:menub;  disabled:false;
                     source:StyleSheetBottom.directiondestination[Constants.SOURCE]; //todo call get status
                     property int status: 0;
                     function setState(name)
@@ -538,7 +579,7 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetBottom.zoomin[Constants.SOURCE]; x:StyleSheetBottom.zoomin[Constants.X]; y:StyleSheetBottom.zoomin[Constants.Y]; width:StyleSheetBottom.zoomin[Constants.WIDTH]; height:StyleSheetBottom.zoomin[Constants.HEIGHT];
-                    id:zoomin; explode:false; next:zoomout; prev:orientation;
+                    id:zoomin;  next:zoomout; prev:orientation;
                     onClicked: {
                         Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,1);
                         showZoom();
@@ -556,7 +597,7 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetBottom.zoomout[Constants.SOURCE]; x:StyleSheetBottom.zoomout[Constants.X]; y:StyleSheetBottom.zoomout[Constants.Y]; width:StyleSheetBottom.zoomout[Constants.WIDTH]; height:StyleSheetBottom.zoomout[Constants.HEIGHT];
-                    id:zoomout; explode:false; next:settings; prev:zoomin;
+                    id:zoomout;  next:settings; prev:zoomin;
                     onClicked: {
                         Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,-1);
                         showZoom();
@@ -565,16 +606,16 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetBottom.settings[Constants.SOURCE]; x:StyleSheetBottom.settings[Constants.X]; y:StyleSheetBottom.settings[Constants.Y]; width:StyleSheetBottom.settings[Constants.WIDTH]; height:StyleSheetBottom.settings[Constants.HEIGHT];
-                    id:settings; explode:false; next:menub; prev:zoomout;
+                    id:settings;  next:menub; prev:zoomout;
                     onClicked: {
                         disconnectSignals();
-                        entryMenu("CameraSettings",menu);
+                        entryMenu("NavigationAppBrowseMapSettings",menu);
                     }
                 }
 
                 StdButton {
                     x:StyleSheetBottom.guidanceon[Constants.X]; y:StyleSheetBottom.guidanceon[Constants.Y]; width:StyleSheetBottom.guidanceon[Constants.WIDTH]; height:StyleSheetBottom.guidanceon[Constants.HEIGHT];
-                    id:guidanceStatus; next:zoomin; prev:menub; explode:false; disabled:false;
+                    id:guidanceStatus; next:zoomin; prev:menub;  disabled:false;
                     source:StyleSheetBottom.guidanceoff[Constants.SOURCE]; //todo call get status
                     property int status: 1;
                     function setState(name)
@@ -629,13 +670,13 @@ HMIMenu {
                 opacity: 0.8
                 image:StyleSheetRoute.navigation_app_browse_map_route_background[Constants.SOURCE]
                 anchors { fill: parent; topMargin: parent.headlineHeight}
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        routeOverview();
-                                }
+                StdButton {
+                    source:StyleSheetRoute.show_maneuver_list[Constants.SOURCE]; x:StyleSheetRoute.show_maneuver_list[Constants.X]; y:StyleSheetRoute.show_maneuver_list[Constants.Y]; width:StyleSheetRoute.show_maneuver_list[Constants.WIDTH]; height:StyleSheetRoute.show_maneuver_list[Constants.HEIGHT];
+                    id:maneuverList;
+                    disabled:false;
+                    onClicked: { showManeuversList(); }
+                    next:maneuverList; prev:maneuverList;
                 }
-
                 Text {
                     x:StyleSheetRoute.timetodestinationValue[Constants.X]; y:StyleSheetRoute.timetodestinationValue[Constants.Y]; width:StyleSheetRoute.timetodestinationValue[Constants.WIDTH]; height:StyleSheetRoute.timetodestinationValue[Constants.HEIGHT];color:StyleSheetRoute.timetodestinationValue[Constants.TEXTCOLOR];styleColor:StyleSheetRoute.timetodestinationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetRoute.timetodestinationValue[Constants.PIXELSIZE];
                     visible: true
@@ -644,7 +685,6 @@ HMIMenu {
                     id:timetodestinationValue
                     text: "-------"
                 }
-
                 Text {
                     x:StyleSheetRoute.distancetodestinationValue[Constants.X]; y:StyleSheetRoute.distancetodestinationValue[Constants.Y]; width:StyleSheetRoute.distancetodestinationValue[Constants.WIDTH]; height:StyleSheetRoute.distancetodestinationValue[Constants.HEIGHT];color:StyleSheetRoute.distancetodestinationValue[Constants.TEXTCOLOR];styleColor:StyleSheetRoute.distancetodestinationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetRoute.distancetodestinationValue[Constants.PIXELSIZE];
                     visible: true
@@ -722,28 +762,28 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetScroll.scrollup[Constants.SOURCE]; x:StyleSheetScroll.scrollup[Constants.X]; y:StyleSheetScroll.scrollup[Constants.Y]; width:StyleSheetScroll.scrollup[Constants.WIDTH]; height:StyleSheetScroll.scrollup[Constants.HEIGHT];
-                    id:scrollup; explode:false; next:scrollleft; prev:scrolldown;
+                    id:scrollup;  next:scrollleft; prev:scrolldown;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 + scroll.panY);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollleft[Constants.SOURCE]; x:StyleSheetScroll.scrollleft[Constants.X]; y:StyleSheetScroll.scrollleft[Constants.Y]; width:StyleSheetScroll.scrollleft[Constants.WIDTH]; height:StyleSheetScroll.scrollleft[Constants.HEIGHT];
-                    id:scrollleft; explode:false; next:scrollright; prev:scrollup;
+                    id:scrollleft;  next:scrollright; prev:scrollup;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 + scroll.panX,map.height/2);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollright[Constants.SOURCE]; x:StyleSheetScroll.scrollright[Constants.X]; y:StyleSheetScroll.scrollright[Constants.Y]; width:StyleSheetScroll.scrollright[Constants.WIDTH]; height:StyleSheetScroll.scrollright[Constants.HEIGHT];
-                    id:scrollright; explode:false; next:scrolldown; prev:scrollleft;
+                    id:scrollright;  next:scrolldown; prev:scrollleft;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 - scroll.panX,map.height/2);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrolldown[Constants.SOURCE]; x:StyleSheetScroll.scrolldown[Constants.X]; y:StyleSheetScroll.scrolldown[Constants.Y]; width:StyleSheetScroll.scrolldown[Constants.WIDTH]; height:StyleSheetScroll.scrolldown[Constants.HEIGHT];
-                    id:scrolldown; explode:false; next:scrollup; prev:scrollright;
+                    id:scrolldown;  next:scrollup; prev:scrollright;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 - scroll.panY);}
                 }
@@ -752,7 +792,6 @@ HMIMenu {
 
         Rectangle {
             color:"transparent"
-
             width: StyleSheetSimulation.navigation_app_browse_map_simulation_background[Constants.WIDTH]
             height: StyleSheetSimulation.navigation_app_browse_map_simulation_background[Constants.HEIGHT]
             x: StyleSheetMap.simulation_area[Constants.X]
@@ -780,7 +819,7 @@ HMIMenu {
                      }
                 StdButton {
                     source:StyleSheetSimulation.speed_down_popup[Constants.SOURCE]; x:StyleSheetSimulation.speed_down_popup[Constants.X]; y:StyleSheetSimulation.speed_down_popup[Constants.Y]; width:StyleSheetSimulation.speed_down_popup[Constants.WIDTH]; height:StyleSheetSimulation.speed_down_popup[Constants.HEIGHT];
-                    id:speed_down; explode:false; disabled:false; next:speed_up; prev:simu_mode;
+                    id:speed_down;  disabled:false; next:speed_up; prev:simu_mode;
                     onClicked:
                     {
                         if (speedValueSent > 0)
@@ -792,7 +831,7 @@ HMIMenu {
                 }
                 StdButton {
                     source:StyleSheetSimulation.speed_up_popup[Constants.SOURCE]; x:StyleSheetSimulation.speed_up_popup[Constants.X]; y:StyleSheetSimulation.speed_up_popup[Constants.Y]; width:StyleSheetSimulation.speed_up_popup[Constants.WIDTH]; height:StyleSheetSimulation.speed_up_popup[Constants.HEIGHT];
-                    id:speed_up; explode:false; disabled:false; next:on_off; prev:speed_down;
+                    id:speed_up;  disabled:false; next:on_off; prev:speed_down;
                     onClicked:
                     {
                         if (speedValueSent < 7)
@@ -804,7 +843,7 @@ HMIMenu {
                 }
                 StdButton {
                     x:StyleSheetSimulation.simulation_on_popup[Constants.X]; y:StyleSheetSimulation.simulation_on_popup[Constants.Y]; width:StyleSheetSimulation.simulation_on_popup[Constants.WIDTH]; height:StyleSheetSimulation.simulation_on_popup[Constants.HEIGHT];
-                    id:on_off; next:simu_mode; prev:speed_up; explode:false; disabled:false;
+                    id:on_off; next:simu_mode; prev:speed_up;  disabled:false;
                     property int status: 1; //by default simulation stopped
                     function setState(name)
                     {
@@ -836,7 +875,7 @@ HMIMenu {
                 }
                 StdButton {
                     x:StyleSheetSimulation.play_popup[Constants.X]; y:StyleSheetSimulation.play_popup[Constants.Y]; width:StyleSheetSimulation.play_popup[Constants.WIDTH]; height:StyleSheetSimulation.play_popup[Constants.HEIGHT];
-                    id:simu_mode; next:speed_down; prev:on_off; explode:false; disabled:false;
+                    id:simu_mode; next:speed_down; prev:on_off;  disabled:false;
                     property int status: 0;
                     function setState(name)
                     {
@@ -886,6 +925,45 @@ HMIMenu {
                 }
             }
         }
+
+        Rectangle {
+            color:"transparent"
+            width: StyleSheetManeuver.navigation_app_browse_map_maneuver_background[Constants.WIDTH]
+            height: StyleSheetManeuver.navigation_app_browse_map_maneuver_background[Constants.HEIGHT]
+            x: StyleSheetManeuver.maneuver_area[Constants.X]
+            y: StyleSheetManeuver.maneuver_area[Constants.Y]
+            HMIBgImage {
+                id: maneuver
+                opacity: 0.8
+                visible: (displayManeuvers)
+                image:StyleSheetManeuver.navigation_app_browse_map_maneuver_background[Constants.SOURCE];
+                anchors { fill: parent; topMargin: parent.headlineHeight}
+                StdButton {
+                    source:StyleSheetManeuver.exit[Constants.SOURCE]; x:StyleSheetManeuver.exit[StyleSheetManeuver.X]; y:StyleSheetManeuver.exit[StyleSheetManeuver.Y]; width:StyleSheetManeuver.exit[StyleSheetManeuver.WIDTH]; height:StyleSheetManeuver.exit[StyleSheetManeuver.HEIGHT];
+                    id:exit;  next:maneuverArea; prev:maneuverArea;
+                    onClicked: { hideManeuversList(); }
+                }
+                Component {
+                    id: maneuverDelegate
+                    Text {
+                        width:StyleSheetManeuver.maneuver_delegate[Constants.WIDTH]; height:StyleSheetManeuver.maneuver_delegate[Constants.HEIGHT];color:StyleSheetManeuver.maneuver_delegate[Constants.TEXTCOLOR];styleColor:StyleSheetManeuver.maneuver_delegate[Constants.STYLECOLOR]; font.pixelSize:StyleSheetManeuver.maneuver_delegate[Constants.PIXELSIZE];
+                        id:maneuverItem;
+                        text: name;
+                        style: Text.Sunken;
+                        smooth: true
+                    }
+                }
+                HMIList {
+                    property real selectedEntry
+                    x:StyleSheetManeuver.maneuver_area[Constants.X]; y:StyleSheetManeuver.maneuver_area[Constants.Y]; width:StyleSheetManeuver.maneuver_area[Constants.WIDTH]; height:StyleSheetManeuver.maneuver_area[Constants.HEIGHT];
+                    id:maneuverArea
+                    delegate: maneuverDelegate
+                    next:exit
+                    prev:exit
+                }
+            }
+        }
+
     }
 
     Component.onCompleted: {
diff --git a/src/hmi/qml/NavigationAppBrowseMapSettings.qml b/src/hmi/qml/NavigationAppBrowseMapSettings.qml
new file mode 100644
index 0000000..5a641cf
--- /dev/null
+++ b/src/hmi/qml/NavigationAppBrowseMapSettings.qml
@@ -0,0 +1,382 @@
+/**
+* @licence app begin@
+* SPDX-License-Identifier: MPL-2.0
+*
+* \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
+*
+* \file CameraSettings.qml
+*
+* \brief This file is part of the navigation hmi.
+*
+* \author Martin Schaller <martin.schaller@it-schaller.de>
+* \author Philippe Colliot <philippe.colliot@mpsa.com>
+*
+* \version 1.1
+*
+* This Source Code Form is subject to the terms of the
+* Mozilla Public License (MPL), v. 2.0.
+* If a copy of the MPL was not distributed with this file,
+* You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* For further information see http://www.genivi.org/.
+*
+* List of changes:
+* 2014-03-05, Philippe Colliot, migration to the new HMI design
+* <date>, <name>, <description of change>
+*
+* @licence end@
+*/
+import QtQuick 2.1 
+import "Core"
+import "Core/genivi.js" as Genivi;
+import "Core/style-sheets/style-constants.js" as Constants;
+import "Core/style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
+import "Core/style-sheets/NavigationAppBrowseMapSettings-css.js" as StyleSheetSettings;
+import lbs.plugin.dbusif 1.0
+
+HMIMenu {
+    id: menu
+    property string pagefile:"NavigationAppBrowseMapSettings"
+
+    DBusIf {
+        id:dbusIf
+    }
+
+    Timer {
+        id:move_timer
+        repeat:true
+        triggeredOnStart:false
+        property real lat;
+        property real lon;
+        property bool active;
+        onTriggered: {
+            if (active) {
+                var res=Genivi.mapviewer_GetTargetPoint(dbusIf);
+                var latitude=res[1][1]+lat;
+                var longitude=res[1][3]+lon;
+                var altitude=res[1][5];
+                Genivi.mapviewer_SetTargetPoint(dbusIf,latitude,longitude,altitude);
+                interval=50;
+                restart();
+            }
+        }
+    }
+
+    Timer {
+        id:camera_timer
+        repeat:true
+        triggeredOnStart:false
+        property bool active;
+        property string camera_value;
+        property real step;
+        property bool clamp;
+        property real clamp_value;
+        onTriggered: {
+            if (active) {
+                var res=Genivi.mapviewer_GetCameraValue(dbusIf,camera_value);
+                res[1]+=step;
+                if (clamp) {
+                    if (step > 0 && res[1] > clamp_value) {
+                        res[1]=clamp_value;
+                    }
+                    if (step < 0 && res[1] < clamp_value) {
+                        res[1]=clamp_value;
+                    }
+                }
+                Genivi.mapviewer_SetCameraValue(dbusIf,camera_value, res);
+                interval=50;
+                restart();
+            }
+        }
+    }
+
+    function move_start(lat, lon)
+    {
+        Genivi.mapviewer_SetFollowCarMode(dbusIf, false);
+        move_timer.lat=lat/10000;
+        move_timer.lon=lon/10000;
+        move_timer.active=true;
+        move_timer.triggered();
+    }
+
+    function move_stop()
+    {
+        move_timer.active=false;
+        move_timer.stop();
+    }
+
+    function camera_start(camera_value, step)
+    {
+        camera_timer.camera_value=camera_value;
+        camera_timer.step=step;
+        camera_timer.active=true;
+        camera_timer.triggered();
+    }
+
+    function camera_start_clamp(camera_value, step, clampvalue)
+    {
+        camera_timer.clamp=true;
+        camera_timer.clamp_value=clampvalue;
+        camera_start(camera_value, step);
+    }
+
+    function camera_stop()
+    {
+        camera_timer.active=false;
+        camera_timer.stop();
+        camera_timer.clamp=false;
+    }
+
+    function set_angle(angle)
+    {
+        Genivi.mapviewer_SetMapViewRotation(dbusIf,angle);
+    }
+
+    function updateMapViewer()
+    {
+        var res=Genivi.mapviewer_GetMapViewPerspective(dbusIf);
+        if (res[1] == Genivi.MAPVIEWER_2D) {
+            perspective.text=Genivi.gettext("CameraPerspective3d");
+        } else {
+            perspective.text=Genivi.gettext("CameraPerspective2d");
+        }
+        res=Genivi.mapviewer_GetDisplayedRoutes(dbusIf);
+        if (res[1] && res[1].length) {
+            split.disabled=false;
+        } else {
+            split.disabled=true;
+        }
+        if (Genivi.g_mapviewer_handle2) {
+            split.text=Genivi.gettext("Join");
+        } else {
+            split.text=Genivi.gettext("Split");
+        }
+    }
+
+    function toggleDayNight()
+    {
+        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf);
+        if (res[1] == Genivi.MAPVIEWER_THEME_1) {
+            Genivi.mapviewer_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_2);
+            if (Genivi.g_mapviewer_handle2) {
+                Genivi.mapviewer2_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_2);
+            }
+            daynight.text=Genivi.gettext("Day");
+        } else {
+            Genivi.mapviewer_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_1);
+            if (Genivi.g_mapviewer_handle2) {
+                Genivi.mapviewer2_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_1);
+            }
+            daynight.text=Genivi.gettext("Night");
+        }
+    }
+
+    function updateDayNight()
+    {
+        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf);
+        if (res[1] == Genivi.MAPVIEWER_THEME_1) {
+            daynight.text=Genivi.gettext("Night");
+        } else {
+            daynight.text=Genivi.gettext("Day");
+        }
+    }
+
+    function togglePerspective()
+    {
+        if (perspective.text == Genivi.gettext("CameraPerspective2d")) {
+            Genivi.mapviewer_SetMapViewPerspective(dbusIf,Genivi.MAPVIEWER_2D);
+        } else {
+            Genivi.mapviewer_SetMapViewPerspective(dbusIf,Genivi.MAPVIEWER_3D);
+        }
+        updateMapViewer();
+    }
+
+    function toggleSplit()
+    {
+        var displayedRoutes=Genivi.mapviewer_GetDisplayedRoutes(dbusIf);
+        var mapViewTheme=Genivi.mapviewer_GetMapViewTheme(dbusIf);
+        if (split.text == Genivi.gettext("Split")) {
+            Genivi.mapviewer_handle_clear(dbusIf);
+            Genivi.mapviewer_handle2(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP);
+            Genivi.mapviewer_handle(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP);
+            if (displayedRoutes[1] && displayedRoutes[1].length) {
+                var boundingBox=Genivi.routing_GetRouteBoundingBox(dbusIf,[]);
+                Genivi.mapviewer2_SetMapViewBoundingBox(dbusIf,boundingBox);
+            }
+            Genivi.mapviewer_SetMapViewTheme(dbusIf,mapViewTheme[1]);
+            Genivi.mapviewer2_SetMapViewTheme(dbusIf,mapViewTheme[1]);
+            Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
+        } else {
+            Genivi.mapviewer_handle_clear2(dbusIf);
+            Genivi.mapviewer_handle_clear(dbusIf);
+            Genivi.mapviewer_handle(dbusIf,map.width,map.height,Genivi.MAPVIEWER_MAIN_MAP);
+            Genivi.mapviewer_SetMapViewTheme(dbusIf,mapViewTheme[1]);
+            Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
+        }
+        if (displayedRoutes[1] && displayedRoutes[1].length) {
+            var route=[];
+            for (var i = 0 ; i < displayedRoutes[1].length ; i+=2) {
+                route=displayedRoutes[1][i+1][0];
+                route=route.concat(res[1][i+1][1]);
+                Genivi.mapviewer_DisplayRoute(dbusIf,route,res[1][i+1][3]);
+                if (split.text == Genivi.gettext("Split")) {
+                    Genivi.mapviewer2_DisplayRoute(dbusIf,route,res[1][i+1][3]);
+                }
+            }
+        }
+        updateMapViewer();
+    }
+
+    function disableSplit()
+    {
+        if (Genivi.g_mapviewer_handle2) {
+            toggleSplit();
+        }
+    }
+
+    Rectangle {
+        id:map
+        x:0
+        y:0
+        height:menu.height
+        width:menu.width
+        color:"transparent"
+        Rectangle {
+            opacity: 0.8
+            width: StyleSheetSettings.navigation_app_browse_map_settings_background[Constants.WIDTH]
+            height: StyleSheetSettings.navigation_app_browse_map_settings_background[Constants.HEIGHT]
+            x: StyleSheetMap.settings_area[Constants.X]
+            y: StyleSheetMap.settings_area[Constants.Y]
+            HMIBgImage {
+                id: content
+                image:StyleSheetSettings.navigation_app_browse_map_settings_background[Constants.SOURCE];
+                anchors { fill: parent; topMargin: parent.headlineHeight}
+
+
+                 Text {
+                     x:StyleSheetSettings.tiltText[StyleSheetSettings.X]; y:StyleSheetSettings.tiltText[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.tiltText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.tiltText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.tiltText[StyleSheetSettings.PIXELSIZE];
+                     id:tiltText;
+                     style: Text.Sunken;
+                     smooth: true
+                     text: Genivi.gettext("CameraTilt")
+                      }
+
+                 StdButton {source:StyleSheetSettings.tiltp[Constants.SOURCE]; x:StyleSheetSettings.tiltp[StyleSheetSettings.X]; y:StyleSheetSettings.tiltp[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltp[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltp[StyleSheetSettings.HEIGHT];
+                            id:tiltp;  next:tiltm; prev:daynight;
+                         onPressed: {camera_start_clamp("CameraTiltAngle",-10,0);}
+                         onReleased: {camera_stop();}
+                 }
+
+                 StdButton {
+                     source:StyleSheetSettings.tiltm[Constants.SOURCE]; x:StyleSheetSettings.tiltm[StyleSheetSettings.X]; y:StyleSheetSettings.tiltm[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltm[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltm[StyleSheetSettings.HEIGHT];
+                     id:tiltm;  next:heightp; prev:tiltp;
+                     onPressed: {camera_start_clamp("CameraTiltAngle",10,90);}
+                     onReleased: {camera_stop();}
+                 }
+
+                 Text {
+                     x:StyleSheetSettings.heightText[StyleSheetSettings.X]; y:StyleSheetSettings.heightText[StyleSheetSettings.Y]; width:StyleSheetSettings.heightText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.heightText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.heightText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.heightText[StyleSheetSettings.PIXELSIZE];
+                     id:heightText;
+                     style: Text.Sunken;
+                     smooth: true
+                     text: Genivi.gettext("CameraHeight")
+                      }
+
+                 StdButton {
+                     source:StyleSheetSettings.heightp[Constants.SOURCE]; x:StyleSheetSettings.heightp[StyleSheetSettings.X]; y:StyleSheetSettings.heightp[StyleSheetSettings.Y]; width:StyleSheetSettings.heightp[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightp[StyleSheetSettings.HEIGHT];
+                     id:heightp; next:heightm; prev:tiltm;
+                     onPressed: {camera_start("CameraHeight",10);}
+                     onReleased: {camera_stop();}
+                 }
+
+                 StdButton {
+                     source:StyleSheetSettings.heightm[Constants.SOURCE]; x:StyleSheetSettings.heightm[StyleSheetSettings.X]; y:StyleSheetSettings.heightm[StyleSheetSettings.Y]; width:StyleSheetSettings.heightm[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightm[StyleSheetSettings.HEIGHT];
+                     id:heightm;  next:distancep; prev:heightp;
+                     onPressed: {camera_start("CameraHeight",-10);}
+                     onReleased: {camera_stop();}
+                 }
+
+                 Text {
+                     x:StyleSheetSettings.distanceText[StyleSheetSettings.X]; y:StyleSheetSettings.distanceText[StyleSheetSettings.Y]; width:StyleSheetSettings.distanceText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distanceText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.distanceText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.distanceText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.distanceText[StyleSheetSettings.PIXELSIZE];
+                     id:distanceText;
+                     style: Text.Sunken;
+                     smooth: true
+                     text: Genivi.gettext("CameraDistance")
+                      }
+
+                 StdButton {source:StyleSheetSettings.distancep[Constants.SOURCE]; x:StyleSheetSettings.distancep[StyleSheetSettings.X]; y:StyleSheetSettings.distancep[StyleSheetSettings.Y]; width:StyleSheetSettings.distancep[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distancep[StyleSheetSettings.HEIGHT];
+                            id:distancep;  next:distancem; prev:heightm;
+                         onPressed: {camera_start("CameraDistanceFromTargetPoint",10);}
+                         onReleased: {camera_stop();}
+                 }
+
+                 StdButton {source:StyleSheetSettings.distancem[Constants.SOURCE]; x:StyleSheetSettings.distancem[StyleSheetSettings.X]; y:StyleSheetSettings.distancem[StyleSheetSettings.Y]; width:StyleSheetSettings.distancem[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distancem[StyleSheetSettings.HEIGHT];
+                            id:distancem;  next:exit; prev:distancep;
+                         onPressed: {camera_start("CameraDistanceFromTargetPoint",-10);}
+                         onReleased: {camera_stop();}
+                 }
+
+                 StdButton {source:StyleSheetSettings.north[Constants.SOURCE]; x:StyleSheetSettings.north[StyleSheetSettings.X]; y:StyleSheetSettings.north[StyleSheetSettings.Y]; width:StyleSheetSettings.north[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.north[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.northText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.northText[StyleSheetSettings.PIXELSIZE];
+                            id:north; text: Genivi.gettext("North");  next:south; prev:exit;
+                     onClicked: {
+                         set_angle(0);
+                     }
+                 }
+
+                 StdButton { source:StyleSheetSettings.south[Constants.SOURCE]; x:StyleSheetSettings.south[StyleSheetSettings.X]; y:StyleSheetSettings.south[StyleSheetSettings.Y]; width:StyleSheetSettings.south[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.south[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.southText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.southText[StyleSheetSettings.PIXELSIZE];
+                            id:south; text:Genivi.gettext("South");  next:east; prev:north;
+                     onClicked: {
+                         set_angle(180);
+                     }
+                 }
+
+                 StdButton {source:StyleSheetSettings.east[Constants.SOURCE]; x:StyleSheetSettings.east[StyleSheetSettings.X]; y:StyleSheetSettings.east[StyleSheetSettings.Y]; width:StyleSheetSettings.east[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.east[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.eastText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.eastText[StyleSheetSettings.PIXELSIZE];
+                            id:east; text:Genivi.gettext("East");  next:west; prev:south;
+                     onClicked: {
+                         set_angle(90);
+                     }
+                 }
+
+                 StdButton {source:StyleSheetSettings.west[Constants.SOURCE]; x:StyleSheetSettings.west[StyleSheetSettings.X]; y:StyleSheetSettings.west[StyleSheetSettings.Y]; width:StyleSheetSettings.west[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.west[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.westText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.westText[StyleSheetSettings.PIXELSIZE];
+                            id:west; text:Genivi.gettext("West");  next:split; prev:east;
+                     onClicked: {
+                         set_angle(270);
+                     }
+                 }
+
+                 StdButton {source:StyleSheetSettings.exit[Constants.SOURCE]; x:StyleSheetSettings.exit[StyleSheetSettings.X]; y:StyleSheetSettings.exit[StyleSheetSettings.Y]; width:StyleSheetSettings.exit[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.exit[StyleSheetSettings.HEIGHT];
+                            id:exit;  next:north; prev:west;
+                     onClicked: {
+                         Genivi.data['show_current_position']=true;
+                         move_stop();
+                         camera_stop();
+                         leaveMenu();
+                     }
+                 }
+
+                 StdButton {source:StyleSheetSettings.split[Constants.SOURCE]; x:StyleSheetSettings.split[StyleSheetSettings.X]; y:StyleSheetSettings.split[StyleSheetSettings.Y]; width:StyleSheetSettings.split[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.split[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.splitText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.splitText[StyleSheetSettings.PIXELSIZE];
+                            id:split; text:Genivi.gettext("Split");  next:perspective; prev:west;
+                         onClicked: {toggleSplit();}
+                 }
+
+                 StdButton {source:StyleSheetSettings.perspective[Constants.SOURCE]; x:StyleSheetSettings.perspective[StyleSheetSettings.X]; y:StyleSheetSettings.perspective[StyleSheetSettings.Y]; width:StyleSheetSettings.perspective[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.perspective[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.perspectiveText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.perspectiveText[StyleSheetSettings.PIXELSIZE];
+                            id:perspective; text:Genivi.gettext("CameraPerspective3d");  next:daynight; prev:split;
+                         onClicked: {togglePerspective();}
+                 }
+
+                 StdButton {source:StyleSheetSettings.daynight[Constants.SOURCE]; x:StyleSheetSettings.daynight[StyleSheetSettings.X]; y:StyleSheetSettings.daynight[StyleSheetSettings.Y]; width:StyleSheetSettings.daynight[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.daynight[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.daynightText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.daynightText[StyleSheetSettings.PIXELSIZE];
+                            id:daynight; text:Genivi.gettext("Day");  next:tiltp; prev:perspective;
+                     onClicked: {
+                         toggleDayNight();
+                     }
+                 }
+
+             }
+        }
+     }
+    Component.onCompleted: {
+        Genivi.mapviewer_handle(dbusIf,menu.width,menu.height,Genivi.MAPVIEWER_MAIN_MAP);
+        updateMapViewer();
+        updateDayNight();
+    }
+}
diff --git a/src/hmi/qml/NavigationAppMain.qml b/src/hmi/qml/NavigationAppMain.qml
index 976356e..cbdba53 100644
--- a/src/hmi/qml/NavigationAppMain.qml
+++ b/src/hmi/qml/NavigationAppMain.qml
@@ -55,7 +55,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_navigation[Constants.SOURCE]; x:StyleSheet.select_navigation[Constants.X]; y:StyleSheet.select_navigation[Constants.Y]; width:StyleSheet.select_navigation[Constants.WIDTH]; height:StyleSheet.select_navigation[Constants.HEIGHT];
-            id:navigation; explode:false; next:mapview; prev:quit; onClicked: {
+            id:navigation;  next:mapview; prev:quit; onClicked: {
                 Genivi.preloadMode=true;
                 Genivi.route_calculated = false;
                 entryMenu("NavigationAppSearch",menu);
@@ -72,7 +72,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_mapview[Constants.SOURCE]; x:StyleSheet.select_mapview[Constants.X]; y:StyleSheet.select_mapview[Constants.Y]; width:StyleSheet.select_mapview[Constants.WIDTH]; height:StyleSheet.select_mapview[Constants.HEIGHT];
-            id:mapview; explode:false; next:poi; prev:navigation; onClicked: {
+            id:mapview;  next:poi; prev:navigation; onClicked: {
 				Genivi.data["show_current_position"]=true;
                 entryMenu("NavigationAppBrowseMap",menu);
 			}
@@ -88,7 +88,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_poi[Constants.SOURCE]; x:StyleSheet.select_poi[Constants.X]; y:StyleSheet.select_poi[Constants.Y]; width:StyleSheet.select_poi[Constants.WIDTH]; height:StyleSheet.select_poi[Constants.HEIGHT];
-            id:poi; explode:false; next:trip; prev:mapview; onClicked: {
+            id:poi;  next:trip; prev:mapview; onClicked: {
                 entryMenu("NavigationAppPOI",menu);
             }
         }
@@ -103,14 +103,14 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_trip[Constants.SOURCE]; x:StyleSheet.select_trip[Constants.X]; y:StyleSheet.select_trip[Constants.Y]; width:StyleSheet.select_trip[Constants.WIDTH]; height:StyleSheet.select_trip[Constants.HEIGHT];
-            id:trip; explode:false; next:quit; prev:poi;onClicked: {
+            id:trip;  next:quit; prev:poi;onClicked: {
                 entryMenu("NavigationAppTripComputer",menu);
             }
         }
 
         StdButton {
             source:StyleSheet.quit[Constants.SOURCE]; x:StyleSheet.quit[Constants.X]; y:StyleSheet.quit[Constants.Y]; width:StyleSheet.quit[Constants.WIDTH]; height:StyleSheet.quit[Constants.HEIGHT];textColor:StyleSheet.quitText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.quitText[Constants.PIXELSIZE];
-            id:quit; text: Genivi.gettext("Quit"); explode:false; next:navigation; prev:trip; onClicked:{Qt.quit()}}
+            id:quit; text: Genivi.gettext("Quit");  next:navigation; prev:trip; onClicked:{Qt.quit()}}
 
     }
 
diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml
index 49f081d..180110d 100644
--- a/src/hmi/qml/NavigationAppPOI.qml
+++ b/src/hmi/qml/NavigationAppPOI.qml
@@ -106,7 +106,6 @@ NavigationAppHMIMenu {
 		StdButton { 
             source:StyleSheet.select_search_for_refill[Constants.SOURCE]; x:StyleSheet.select_search_for_refill[Constants.X]; y:StyleSheet.select_search_for_refill[Constants.Y]; width:StyleSheet.select_search_for_refill[Constants.WIDTH]; height:StyleSheet.select_search_for_refill[Constants.HEIGHT];
             id:select_search_for_refill
-			explode: false
 			onClicked: {
 				var model=view.model;
 				var ids=[];
@@ -179,7 +178,7 @@ NavigationAppHMIMenu {
 		StdButton { 
             source:StyleSheet.select_reroute[Constants.SOURCE]; x:StyleSheet.select_reroute[Constants.X]; y:StyleSheet.select_reroute[Constants.Y]; width:StyleSheet.select_reroute[Constants.WIDTH]; height:StyleSheet.select_reroute[Constants.HEIGHT];
             id:select_reroute;
-            explode:false;
+            
             disabled:true;
             next:select_display_on_map; prev:select_search_for_refill
 			onClicked: {
@@ -208,7 +207,7 @@ NavigationAppHMIMenu {
         StdButton {
             source:StyleSheet.select_display_on_map[Constants.SOURCE]; x:StyleSheet.select_display_on_map[Constants.X]; y:StyleSheet.select_display_on_map[Constants.Y]; width:StyleSheet.select_display_on_map[Constants.WIDTH]; height:StyleSheet.select_display_on_map[Constants.HEIGHT];
             id:select_display_on_map;
-            explode:false;
+            
 	    disabled:true;
             next:back; prev:select_reroute
 			onClicked: {
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index 03d7d24..6706171 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -44,78 +44,16 @@ NavigationAppHMIMenu {
     property string currentTextToSearch
     property real searchWindow: 10
     property bool destinationValid: false
+    property real routeListSegments: 1000
 
-    // Management of signals
-    property Item currentSelectionCriterionSignal;
-    property Item searchStatusSignal;
-    property Item searchResultListSignal;
-    property Item contentUpdatedSignal;
-    property Item mapmatchedpositionPositionUpdateSignal;
-    property Item routeCalculationSuccessfulSignal;
-    property Item routeCalculationFailedSignal;
-    property Item routeCalculationProgressUpdateSignal;
-    property Item spellResultSignal;
-
-    function mapmatchedpositionPositionUpdate(args)
-    {
-        Genivi.hookSignal("mapmatchedpositionPositionUpdate");
-        updateCurrentPosition();
-    }
-
-    function routeCalculationFailed(args)
-    {
-        Genivi.hookSignal("routeCalculationFailed");
-        //console.log("routeCalculationFailed:");
-        //Genivi.dump("",args);
-
-        statusValue.text=Genivi.gettext("CalculatedRouteFailed");
-        Genivi.route_calculated = false;
-        // Tell the FSA that there's no route available
-        Genivi.fuelstopadvisor_ReleaseRouteHandle(dbusIf,Genivi.g_routing_handle);
-    }
-
-    function routeCalculationProgressUpdate(args)
-    {
-        Genivi.hookSignal("routeCalculationProgressUpdate");
-        statusValue.text=Genivi.gettext("CalculatedRouteInProgress");
-        Genivi.route_calculated = false;
-    }
-
-    function routeCalculationSuccessful(args)
-    { //routeHandle 1, unfullfilledPreferences 3
-        Genivi.hookSignal("routeCalculationSuccessful");
-        statusValue.text=Genivi.gettext("CalculatedRouteSuccess");
-        Genivi.route_calculated = true;
-        var res=Genivi.routing_GetRouteOverviewTimeAndDistance(dbusIf);
-
-        var i, time = 0, distance = 0;
-        for (i=0;i<res[1].length;i+=4)
-        {
-            if (res[1][i+1] == Genivi.NAVIGATIONCORE_TOTAL_TIME)
-            {
-                time = res[1][i+3][3][1];
-            }
-            else
-            {
-                if (Genivi.NAVIGATIONCORE_TOTAL_DISTANCE)
-                {
-                    distance = res[1][i+3][3][1];
-                }
-            }
-        }
-
-        distanceValue.text =Genivi.distance(distance);
-        timeValue.text= Genivi.time(time);
-
-        // Give the route handle to the FSA
-        Genivi.fuelstopadvisor_SetRouteHandle(dbusIf,Genivi.g_routing_handle);
-        updateStartStop();
-
-        show_route_on_map.disabled=false;
-        show_route_in_list.disabled=false;
-        showRoute();
+    //------------------------------------------//
+    // Management of the DBus exchanges
+    //------------------------------------------//
+    DBusIf {
+        id: dbusIf
     }
 
+    property Item currentSelectionCriterionSignal;
     function currentSelectionCriterion(args)
     {// locationInputHandle 1, selectionCriterion 3
         Genivi.hookSignal("currentSelectionCriterion");
@@ -126,6 +64,7 @@ NavigationAppHMIMenu {
         }
     }
 
+    property Item searchStatusSignal;
     function searchStatus(args)
     { //locationInputHandle 1, statusValue 3
         var statusValue=args[3];
@@ -193,6 +132,7 @@ NavigationAppHMIMenu {
 
     }
 
+    property Item searchResultListSignal;
     function searchResultList(args)
     {
         if (keyboardActivated === true)
@@ -215,7 +155,7 @@ NavigationAppHMIMenu {
             if(numberOfItems===1) {
                 // Set value of corresponding field and hide keyboard and list eventually
                 Genivi.locationinput_SelectEntry(dbusIf,0);
-                manageKeyboard();
+                manageAddressItem();
             }
         }
         else
@@ -224,6 +164,7 @@ NavigationAppHMIMenu {
         }
     }
 
+    property Item contentUpdatedSignal;
     function contentUpdated(args)
     { //locationInputHandle 1, guidable 3, availableSelectionCriteria 5, address 7
         Genivi.hookSignal("contentUpdated");
@@ -287,6 +228,70 @@ NavigationAppHMIMenu {
         focus.takeFocus();
     }
 
+    property Item mapmatchedpositionPositionUpdateSignal;
+    function mapmatchedpositionPositionUpdate(args)
+    {
+        Genivi.hookSignal("mapmatchedpositionPositionUpdate");
+        updateCurrentPosition();
+    }
+
+    property Item routeCalculationSuccessfulSignal;
+    function routeCalculationSuccessful(args)
+    { //routeHandle 1, unfullfilledPreferences 3
+        Genivi.hookSignal("routeCalculationSuccessful");
+        statusValue.text=Genivi.gettext("CalculatedRouteSuccess");
+        Genivi.route_calculated = true;
+        var res=Genivi.routing_GetRouteOverviewTimeAndDistance(dbusIf);
+
+        var i, time = 0, distance = 0;
+        for (i=0;i<res[1].length;i+=4)
+        {
+            if (res[1][i+1] == Genivi.NAVIGATIONCORE_TOTAL_TIME)
+            {
+                time = res[1][i+3][3][1];
+            }
+            else
+            {
+                if (Genivi.NAVIGATIONCORE_TOTAL_DISTANCE)
+                {
+                    distance = res[1][i+3][3][1];
+                }
+            }
+        }
+
+        distanceValue.text =Genivi.distance(distance);
+        timeValue.text= Genivi.time(time);
+
+        // Give the route handle to the FSA
+        Genivi.fuelstopadvisor_SetRouteHandle(dbusIf,Genivi.g_routing_handle);
+        updateStartStop();
+
+        show_route_on_map.disabled=false;
+        showRoute();
+    }
+
+    property Item routeCalculationFailedSignal;
+    function routeCalculationFailed(args)
+    {
+        Genivi.hookSignal("routeCalculationFailed");
+        //console.log("routeCalculationFailed:");
+        //Genivi.dump("",args);
+
+        statusValue.text=Genivi.gettext("CalculatedRouteFailed");
+        Genivi.route_calculated = false;
+        // Tell the FSA that there's no route available
+        Genivi.fuelstopadvisor_ReleaseRouteHandle(dbusIf,Genivi.g_routing_handle);
+    }
+
+    property Item routeCalculationProgressUpdateSignal;
+    function routeCalculationProgressUpdate(args)
+    {
+        Genivi.hookSignal("routeCalculationProgressUpdate");
+        statusValue.text=Genivi.gettext("CalculatedRouteInProgress");
+        Genivi.route_calculated = false;
+    }
+
+    property Item spellResultSignal;
     function spellResult(args)
     {//locationInputHandle 1, uniqueString 3, validCharacters 5, fullMatch 7
         Genivi.hookSignal("spellResult");
@@ -325,28 +330,20 @@ NavigationAppHMIMenu {
         spellResultSignal.destroy();
     }
 
-    //
-    function updateStartStop()
+    function getRouteList()
     {
-        var res=Genivi.guidance_GetGuidanceStatus(dbusIf);
-        if (res[1] != Genivi.NAVIGATIONCORE_INACTIVE) {
-            showRoute();
-        } else {
-            hideRoute();
-        }
-    }
-
-    function loadWithCountry()
-    {
-        //load the field with saved values
-        if (Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY] !== "")
-        {//need to test empty string
-            countryValue.text=Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY];
-            accept(countryValue);
-            cityValue.disabled=false;
+        var res=Genivi.routing_GetRouteSegments(dbusIf,0,routeListSegments,0)
+        var array=res[3];
+        var model=routeArea.model;
+        for (var i = 0 ; i < array.length ; i+=2) {
+            var map=array[i+1];
+            var mapresult=Array;
+            for (var j = 0 ; j < map.length ; j+=4) {
+                mapresult[map[j+1]]=map[j+3][3][1];
+            }
+            var text=Genivi.distance(mapresult[Genivi.NAVIGATIONCORE_DISTANCE])+" "+Genivi.time(mapresult[Genivi.NAVIGATIONCORE_TIME])+" "+mapresult[Genivi.NAVIGATIONCORE_ROAD_NAME];
+            model.append({"name":text});
         }
-        else
-            Genivi.preloadMode=false; // because preload needs first a country to be launched
     }
 
     function updateCurrentPosition()
@@ -364,11 +361,18 @@ NavigationAppHMIMenu {
             }
         }
         if ((oklat == 1) && (oklong == 1)) {
-            if(destinationValid) {calculate_curr.disabled=false;calculate_curr.visible=true;}
-         } else {
-            calculate_curr.disabled=true;
-            calculate_curr.visible=false;
-         }
+            if(destinationValid) {calculate_curr.disabled=false;}
+         } else {calculate_curr.disabled=true;}
+    }
+
+    function updateStartStop()
+    {
+        var res=Genivi.guidance_GetGuidanceStatus(dbusIf);
+        if (res[1] != Genivi.NAVIGATIONCORE_INACTIVE) {
+            showRoute();
+        } else {
+            hideRoute();
+        }
     }
 
     function spell(input)
@@ -378,9 +382,39 @@ NavigationAppHMIMenu {
         Genivi.locationinput_Spell(dbusIf,input,10);
     }
 
+    //------------------------------------------//
+    // Management of entered location
+    //------------------------------------------//
+    function loadWithCountry()
+    { //load the field with saved values with test if it's guidable
+        if (Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY] !== "")
+        {//need to test empty string
+            countryValue.text=Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY];
+            accept(countryValue);
+            cityValue.disabled=false;
+        }
+        else
+            Genivi.preloadMode=false; // because preload needs first a country to be launched
+    }
+
+    function reloadWithCountry()
+    { // load the field with saved values
+        if (Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY] !== "")
+        {//need to test empty string
+            countryValue.text=Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY];
+            cityValue.text=Genivi.address[Genivi.NAVIGATIONCORE_CITY];
+            streetValue.text=Genivi.address[Genivi.NAVIGATIONCORE_STREET];
+            numberValue.text=Genivi.address[Genivi.NAVIGATIONCORE_HOUSENUMBER];
+        } else {
+            countryValue.text="";
+            cityValue.text="";
+            streetValue.text="";
+            numberValue.text="";
+        }
+    }
+
     function saveAddress()
-    {
-        //save address for next time
+    { //save address for next time
         Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY]=countryValue.text;
         Genivi.address[Genivi.NAVIGATIONCORE_CITY]=cityValue.text;
         Genivi.address[Genivi.NAVIGATIONCORE_STREET]=streetValue.text;
@@ -399,20 +433,36 @@ NavigationAppHMIMenu {
     }
 
     function accept(what)
-    {
+    { //load text to search (search will be launched after validation of criterion)
         Genivi.locationinput_SetSelectionCriterion(dbusIf,what.criterion);
-        currentTextToSearch = what.text; //load text to search (search will be launched afet validation of criterion
+        currentTextToSearch = what.text;
     }
 
-    function leave(toOtherMenu)
-    {
-        disconnectSignals();
-        if (toOtherMenu) {
-            Genivi.locationinput_handle_clear(dbusIf);
+    function manageAddressItem()
+    { //valid item and load another one if needed
+        if(keyboardArea.destination === countryValue) {
+            cityValue.callEntry();
+            streetValue.text=""
+            numberValue.text=""
+            initKeyboard();
+            showKeyboard();
+        } else {
+           if(keyboardArea.destination === cityValue) {
+               streetValue.callEntry();
+               numberValue.text=""
+               initKeyboard();
+               showKeyboard();
+           } else {
+               if(keyboardArea.destination === streetValue) {
+                   hideKeyboard();
+               }
+           }
         }
-        //Genivi.navigationcore_session_clear(dbusIf);
     }
 
+    //------------------------------------------//
+    // Management of "keyboard" configuration
+    //------------------------------------------//
     Keys.onPressed: {
         if (event.text) {
             if (event.text == '\b') {
@@ -428,6 +478,9 @@ NavigationAppHMIMenu {
 
     function initKeyboard()
     {
+        // when keyboard is activated, route is reset
+        Genivi.route_calculated=false;
+        hideRoute();
         listArea.forceActiveFocus();
         if (Genivi.entrycriterion) {
             criterion=Genivi.entrycriterion;
@@ -450,7 +503,6 @@ NavigationAppHMIMenu {
         keyboardArea.visible = true;
         listArea.visible = true;
         cancel.disabled = false;
-        cancel.visible = true;
     }
 
     function hideKeyboard()
@@ -459,31 +511,11 @@ NavigationAppHMIMenu {
         keyboardArea.visible = false;
         listArea.visible = false;
         cancel.disabled = true;
-        cancel.visible = false;
-    }
-
-    function manageKeyboard()
-    {
-        if(keyboardArea.destination === countryValue) {
-            cityValue.callEntry();
-            streetValue.text=""
-            numberValue.text=""
-            initKeyboard();
-            showKeyboard();
-        } else {
-           if(keyboardArea.destination === cityValue) {
-               streetValue.callEntry();
-               numberValue.text=""
-               initKeyboard();
-               showKeyboard();
-           } else {
-               if(keyboardArea.destination === streetValue) {
-                   hideKeyboard();
-               }
-           }
-        }
     }
 
+    //------------------------------------------//
+    // Management of "route" configuration
+    //------------------------------------------//
     function showRoute()
     {
         guidanceTitle.visible=true;
@@ -495,11 +527,12 @@ NavigationAppHMIMenu {
         statusTitle.visible=true;
         statusValue.visible=true;
         show_route_on_map.visible=true;
-        show_route_in_list.visible=true;
         guidance_start.visible=true;
-        guidance_stop.visible=true;
+        guidance_stop.visible=false;
         guidance_start.disabled=false;
         guidance_stop.disabled=true;
+        routeArea.visible=true;
+        getRouteList();
         Genivi.route_calculated=true;
     }
 
@@ -514,18 +547,30 @@ NavigationAppHMIMenu {
         statusTitle.visible=false;
         statusValue.visible=false;
         show_route_on_map.visible=false;
-        show_route_in_list.visible=false;
         guidance_start.visible=false;
         guidance_stop.visible=false;
         guidance_start.disabled=false;
         guidance_stop.disabled=true;
+        routeArea.visible=false;
         Genivi.route_calculated=false;
     }
 
-    DBusIf {
-        id: dbusIf
+
+    //------------------------------------------//
+    // Miscellaneous
+    //------------------------------------------//
+    function leave(toOtherMenu)
+    {
+        disconnectSignals();
+        if (toOtherMenu) {
+            Genivi.locationinput_handle_clear(dbusIf);
+        }
+        //Genivi.navigationcore_session_clear(dbusIf);
     }
 
+    //------------------------------------------//
+    // Menu elements
+    //------------------------------------------//
     NavigationAppHMIBgImage {
         image:StyleSheet.navigation_app_search_background[Constants.SOURCE];
         anchors { fill: parent; topMargin: parent.headlineHeight}
@@ -541,7 +586,7 @@ NavigationAppHMIMenu {
         }
         StdButton {
             source:StyleSheet.countryKeyboard[Constants.SOURCE]; x:StyleSheet.countryKeyboard[Constants.X]; y:StyleSheet.countryKeyboard[Constants.Y]; width:StyleSheet.countryKeyboard[Constants.WIDTH]; height:StyleSheet.countryKeyboard[Constants.HEIGHT];
-            id:countryKeyboard; disabled:false; next:cityKeyboard; prev:back; explode:false;
+            id:countryKeyboard; disabled:false; next:cityKeyboard; prev:back;
             onClicked: {
                 countryValue.callEntry();
                 cityValue.text=""
@@ -570,7 +615,7 @@ NavigationAppHMIMenu {
         }
         StdButton {
             source:StyleSheet.cityKeyboard[Constants.SOURCE]; x:StyleSheet.cityKeyboard[Constants.X]; y:StyleSheet.cityKeyboard[Constants.Y]; width:StyleSheet.cityKeyboard[Constants.WIDTH]; height:StyleSheet.cityKeyboard[Constants.HEIGHT];
-            id:cityKeyboard; disabled:false; next:streetKeyboard; prev:countryKeyboard; explode:false;
+            id:cityKeyboard; disabled:false; next:streetKeyboard; prev:countryKeyboard;
             onClicked: {
                 cityValue.callEntry();
                 streetValue.text=""
@@ -598,7 +643,7 @@ NavigationAppHMIMenu {
         }
         StdButton {
             source:StyleSheet.streetKeyboard[Constants.SOURCE]; x:StyleSheet.streetKeyboard[Constants.X]; y:StyleSheet.streetKeyboard[Constants.Y]; width:StyleSheet.streetKeyboard[Constants.WIDTH]; height:StyleSheet.streetKeyboard[Constants.HEIGHT];
-            id:streetKeyboard; disabled:false; next:numberKeyboard; prev:cityKeyboard; explode:false;
+            id:streetKeyboard; disabled:false; next:numberKeyboard; prev:cityKeyboard;
             onClicked: {
                 streetValue.callEntry();
                 numberValue.text=""
@@ -625,7 +670,7 @@ NavigationAppHMIMenu {
         }
         StdButton {
             source:StyleSheet.numberKeyboard[Constants.SOURCE]; x:StyleSheet.numberKeyboard[Constants.X]; y:StyleSheet.numberKeyboard[Constants.Y]; width:StyleSheet.numberKeyboard[Constants.WIDTH]; height:StyleSheet.numberKeyboard[Constants.HEIGHT];
-            id:numberKeyboard; disabled:false; next:back; prev:streetKeyboard; explode:false;
+            id:numberKeyboard; disabled:false; next:back; prev:streetKeyboard;
             onClicked: {
                 numberValue.callEntry();
                 initKeyboard();
@@ -705,7 +750,7 @@ NavigationAppHMIMenu {
         StdButton {
             source:StyleSheet.show_route_on_map[Constants.SOURCE]; x:StyleSheet.show_route_on_map[Constants.X]; y:StyleSheet.show_route_on_map[Constants.Y]; width:StyleSheet.show_route_on_map[Constants.WIDTH]; height:StyleSheet.show_route_on_map[Constants.HEIGHT];
             id: show_route_on_map
-            explode:false; disabled:true; next:show_route_in_list; prev:back
+             disabled:true; next:back; prev:back
             visible: false;
             onClicked: {
                 disconnectSignals();
@@ -716,17 +761,8 @@ NavigationAppHMIMenu {
             }
         }
         StdButton {
-            source:StyleSheet.show_route_in_list[Constants.SOURCE]; x:StyleSheet.show_route_in_list[Constants.X]; y:StyleSheet.show_route_in_list[Constants.Y]; width:StyleSheet.show_route_in_list[Constants.WIDTH]; height:StyleSheet.show_route_in_list[Constants.HEIGHT];
-            id:show_route_in_list;
-            explode:false; disabled:true; next:back; prev:show_route_on_map;
-            visible: false;
-            onClicked: {
-                entryMenu("NavigationRouteDescription",menu);
-            }
-        }
-        StdButton {
             source:StyleSheet.guidance_start[Constants.SOURCE]; x:StyleSheet.guidance_start[Constants.X]; y:StyleSheet.guidance_start[Constants.Y]; width:StyleSheet.guidance_start[Constants.WIDTH]; height:StyleSheet.guidance_start[Constants.HEIGHT];textColor:StyleSheet.startText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.startText[Constants.PIXELSIZE];
-            id:guidance_start; text: Genivi.gettext("On");explode:false; disabled:true; next:guidance_stop; prev:show_route_on_map
+            id:guidance_start; text: Genivi.gettext("On"); disabled:true; next:guidance_stop; prev:show_route_on_map
             visible: false;
             onClicked: {
                 disconnectSignals();
@@ -739,7 +775,7 @@ NavigationAppHMIMenu {
         }
         StdButton {
             source:StyleSheet.guidance_stop[Constants.SOURCE]; x:StyleSheet.guidance_stop[Constants.X]; y:StyleSheet.guidance_stop[Constants.Y]; width:StyleSheet.guidance_stop[Constants.WIDTH]; height:StyleSheet.guidance_stop[Constants.HEIGHT];textColor:StyleSheet.stopText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.stopText[Constants.PIXELSIZE];
-            id:guidance_stop;text: Genivi.gettext("Off");explode:false; disabled:true; next:show_route_on_map; prev:guidance_start
+            id:guidance_stop;text: Genivi.gettext("Off"); disabled:true; next:show_route_on_map; prev:guidance_start
             visible: false;
             onClicked: {
                 Genivi.guidance_StopGuidance(dbusIf);
@@ -762,6 +798,29 @@ NavigationAppHMIMenu {
             onKeypress: {  spell(what); }
         }
 
+        // route list
+        Component {
+            id: routeDelegate
+            Text {
+                property real index:number;
+                width:StyleSheet.route_delegate[Constants.WIDTH]; height:StyleSheet.route_delegate[Constants.HEIGHT];color:StyleSheet.route_delegate[Constants.TEXTCOLOR];styleColor:StyleSheet.route_delegate[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.route_delegate[Constants.PIXELSIZE];
+                id:routeItem;
+                text: name;
+                style: Text.Sunken;
+                smooth: true
+            }
+        }
+
+        HMIList {
+            property real selectedEntry
+            x:StyleSheet.routeArea[Constants.X]; y:StyleSheet.routeArea[Constants.Y]; width:StyleSheet.routeArea[Constants.WIDTH]; height:StyleSheet.routeArea[Constants.HEIGHT];
+            id:routeArea
+            visible: false;
+            delegate: routeDelegate
+            next:cancel
+            prev:keyboardArea
+        }
+
         // list of items
         Component {
             id: listDelegate
@@ -787,14 +846,14 @@ NavigationAppHMIMenu {
                 Genivi.entryselectedentry=what.index;
                 // Set value of corresponding field and hide keyboard and list
                 Genivi.locationinput_SelectEntry(dbusIf,Genivi.entryselectedentry-1);
-                manageKeyboard();
+                manageAddressItem();
             }
         }
 
         // bottom banner
         StdButton {
             source:StyleSheet.calculate_curr[Constants.SOURCE]; x:StyleSheet.calculate_curr[Constants.X]; y:StyleSheet.calculate_curr[Constants.Y]; width:StyleSheet.calculate_curr[Constants.WIDTH]; height:StyleSheet.calculate_curr[Constants.HEIGHT];textColor:StyleSheet.calculate_currText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.calculate_currText[Constants.PIXELSIZE];
-            id:calculate_curr; text: Genivi.gettext("GoTo"); explode:false;
+            id:calculate_curr; text: Genivi.gettext("GoTo");
             onClicked: {
                 var position,destination;
 
@@ -812,30 +871,35 @@ NavigationAppHMIMenu {
                 Genivi.routing_SetWaypoints(dbusIf,true,position,destination);
                 Genivi.routing_CalculateRoute(dbusIf);
             }
-            disabled:true;visible:false;
+            disabled:true;
             next:back; prev:numberKeyboard
         }
         StdButton {
             source:StyleSheet.cancel[Constants.SOURCE]; x:StyleSheet.cancel[Constants.X]; y:StyleSheet.cancel[Constants.Y]; width:StyleSheet.cancel[Constants.WIDTH]; height:StyleSheet.cancel[Constants.HEIGHT];textColor:StyleSheet.cancelText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.cancelText[Constants.PIXELSIZE];
             id:cancel; text: Genivi.gettext("Cancel");
             disabled:true;
-            visible:false;
             onClicked: {
                 Genivi.entrycancel=true;
                 Genivi.preloadMode=true;
                 hideKeyboard();
-                loadWithCountry();
+                reloadWithCountry();
             }
             next:settings; prev:calculate_curr;
         }
         StdButton {
             source:StyleSheet.settings[Constants.SOURCE]; x:StyleSheet.settings[Constants.X]; y:StyleSheet.settings[Constants.Y]; width:StyleSheet.settings[Constants.WIDTH]; height:StyleSheet.settings[Constants.HEIGHT];
-            id:settings; explode:false; next:back; prev:calculate_curr; onClicked: {
+            id:settings;  next:back; prev:calculate_curr; onClicked: {
                 Genivi.preloadMode=true; //for the next call of this menu
                 entryMenu("NavigationAppSettings",menu);
             }
         }
         StdButton {
+            source:StyleSheet.poi[Constants.SOURCE]; x:StyleSheet.poi[Constants.X]; y:StyleSheet.poi[Constants.Y]; width:StyleSheet.poi[Constants.WIDTH]; height:StyleSheet.poi[Constants.HEIGHT];
+            id:poi;  next:back; prev:calculate_curr; onClicked: {
+                entryMenu("NavigationAppPOI",menu);
+            }
+        }
+        StdButton {
             source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
             id:back; text: Genivi.gettext("Back");
             onClicked: {
@@ -846,6 +910,7 @@ NavigationAppHMIMenu {
         }
 
     }
+
     Component.onCompleted: {
         connectSignals();
 
diff --git a/src/hmi/qml/NavigationAppSettings.qml b/src/hmi/qml/NavigationAppSettings.qml
index 3e7a21d..c4597b1 100644
--- a/src/hmi/qml/NavigationAppSettings.qml
+++ b/src/hmi/qml/NavigationAppSettings.qml
@@ -257,7 +257,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.speed_down[Constants.SOURCE]; x:StyleSheet.speed_down[Constants.X]; y:StyleSheet.speed_down[Constants.Y]; width:StyleSheet.speed_down[Constants.WIDTH]; height:StyleSheet.speed_down[Constants.HEIGHT];
-            id:speed_down; explode:false; disabled:false; next:back; prev:back;
+            id:speed_down;  disabled:false; next:back; prev:back;
 			onClicked:
 			{
                 if (speedValueSent > 0)
@@ -270,7 +270,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.speed_up[Constants.SOURCE]; x:StyleSheet.speed_up[Constants.X]; y:StyleSheet.speed_up[Constants.Y]; width:StyleSheet.speed_up[Constants.WIDTH]; height:StyleSheet.speed_up[Constants.HEIGHT];
-            id:speed_up; explode:false; disabled:false; next:back; prev:back;
+            id:speed_up;  disabled:false; next:back; prev:back;
 			onClicked:
 			{
                 if (speedValueSent < 7)
@@ -299,7 +299,7 @@ HMIMenu {
 
         StdButton {
             x:StyleSheet.simulation_on[Constants.X]; y:StyleSheet.simulation_on[Constants.Y]; width:StyleSheet.simulation_on[Constants.WIDTH]; height:StyleSheet.simulation_on[Constants.HEIGHT];
-            id:on_off; next:back; prev:back; explode:false; disabled:false;
+            id:on_off; next:back; prev:back;  disabled:false;
 			property int status: 0;
 			function setState(name)
 			{
@@ -333,7 +333,7 @@ HMIMenu {
 
         StdButton {
             x:StyleSheet.play[Constants.X]; y:StyleSheet.play[Constants.Y]; width:StyleSheet.play[Constants.WIDTH]; height:StyleSheet.play[Constants.HEIGHT];
-            id:simu_mode; next:back; prev:back; explode:false; disabled:false;
+            id:simu_mode; next:back; prev:back;  disabled:false;
 			property int status: 0;
 			function setState(name)
 			{
@@ -406,7 +406,7 @@ HMIMenu {
 
         StdButton {
             x:StyleSheet.onmapview_enable[Constants.X]; y:StyleSheet.onmapview_enable[Constants.Y]; width:StyleSheet.onmapview_enable[Constants.WIDTH]; height:StyleSheet.onmapview_enable[Constants.HEIGHT];
-            id:onmapview_enable; next:back; prev:preferences; explode:false; disabled:false;
+            id:onmapview_enable; next:back; prev:preferences;  disabled:false;
             source:
             {
                 if (Genivi.simulationPanelOnMapview==true)
diff --git a/src/hmi/qml/NavigationAppSettingsLanguageAndUnits.qml b/src/hmi/qml/NavigationAppSettingsLanguageAndUnits.qml
index 01b912f..44ab207 100644
--- a/src/hmi/qml/NavigationAppSettingsLanguageAndUnits.qml
+++ b/src/hmi/qml/NavigationAppSettingsLanguageAndUnits.qml
@@ -149,16 +149,16 @@ HMIMenu {
              }
         StdButton { objectName:"fra_FRA";
             source:StyleSheet.french_flag[Constants.SOURCE]; x:StyleSheet.french_flag[Constants.X]; y:StyleSheet.french_flag[Constants.Y]; width:StyleSheet.french_flag[Constants.WIDTH]; height:StyleSheet.french_flag[Constants.HEIGHT];
-            id:fra_FRA; disabled:false; next:deu_DEU; prev:back; explode:false; onClicked: {setLocale("fra","FRA","Latn");}}
+            id:fra_FRA; disabled:false; next:deu_DEU; prev:back;  onClicked: {setLocale("fra","FRA","Latn");}}
         StdButton { objectName:"deu_DEU";
             source:StyleSheet.german_flag[Constants.SOURCE]; x:StyleSheet.german_flag[Constants.X]; y:StyleSheet.german_flag[Constants.Y]; width:StyleSheet.german_flag[Constants.WIDTH]; height:StyleSheet.german_flag[Constants.HEIGHT];
-             id:deu_DEU; disabled:false; next:eng_USA; prev:fra_FRA; explode:false; onClicked: {setLocale("deu","DEU","Latn");}}
+             id:deu_DEU; disabled:false; next:eng_USA; prev:fra_FRA;  onClicked: {setLocale("deu","DEU","Latn");}}
         StdButton { objectName:"eng_USA";
             source:StyleSheet.usa_flag[Constants.SOURCE]; x:StyleSheet.usa_flag[Constants.X]; y:StyleSheet.usa_flag[Constants.Y]; width:StyleSheet.usa_flag[Constants.WIDTH]; height:StyleSheet.usa_flag[Constants.HEIGHT];
-            id:eng_USA; disabled:false; next:jpn_JPN; prev:deu_DEU; explode:false; onClicked: {setLocale("eng","USA","Latn");}}
+            id:eng_USA; disabled:false; next:jpn_JPN; prev:deu_DEU;  onClicked: {setLocale("eng","USA","Latn");}}
         StdButton { objectName:"jpn_JPN";
             source:StyleSheet.japanese_flag[Constants.SOURCE]; x:StyleSheet.japanese_flag[Constants.X]; y:StyleSheet.japanese_flag[Constants.Y]; width:StyleSheet.japanese_flag[Constants.WIDTH]; height:StyleSheet.japanese_flag[Constants.HEIGHT];
-            id:jpn_JPN; disabled:false; next:back; prev:eng_USA; explode:false; onClicked: {setLocale("jpn","JPN","Hrkt");}}
+            id:jpn_JPN; disabled:false; next:back; prev:eng_USA;  onClicked: {setLocale("jpn","JPN","Hrkt");}}
 
 		Text {
             x:StyleSheet.unitsTitle[Constants.X]; y:StyleSheet.unitsTitle[Constants.Y]; width:StyleSheet.unitsTitle[Constants.WIDTH]; height:StyleSheet.unitsTitle[Constants.HEIGHT];color:StyleSheet.unitsTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.unitsTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.unitsTitle[Constants.PIXELSIZE];
@@ -168,12 +168,12 @@ HMIMenu {
             text: Genivi.gettext("Units")
              }
         StdButton { source:StyleSheet.unit_km[Constants.SOURCE]; x:StyleSheet.unit_km[Constants.X]; y:StyleSheet.unit_km[Constants.Y]; width:StyleSheet.unit_km[Constants.WIDTH]; height:StyleSheet.unit_km[Constants.HEIGHT];
-            id:unit_km; explode:false; disabled:false; next:back; prev:back;
+            id:unit_km;  disabled:false; next:back; prev:back;
 			onClicked: {
                 setUnitsLength(Genivi.NAVIGATIONCORE_KM,Genivi.MAPVIEWER_KM);}
 		}
         StdButton { source:StyleSheet.unit_mile[Constants.SOURCE]; x:StyleSheet.unit_mile[Constants.X]; y:StyleSheet.unit_mile[Constants.Y]; width:StyleSheet.unit_mile[Constants.WIDTH]; height:StyleSheet.unit_mile[Constants.HEIGHT];
-            id:unit_mile; explode:false; disabled:false; next:back; prev:back;
+            id:unit_mile;  disabled:false; next:back; prev:back;
 			onClicked: {
                 setUnitsLength(Genivi.NAVIGATIONCORE_MILE,Genivi.MAPVIEWER_MILE);}
 		}
diff --git a/src/hmi/qml/NavigationAppSettingsPreferences.qml b/src/hmi/qml/NavigationAppSettingsPreferences.qml
index 949d7dc..e66bde7 100644
--- a/src/hmi/qml/NavigationAppSettingsPreferences.qml
+++ b/src/hmi/qml/NavigationAppSettingsPreferences.qml
@@ -158,9 +158,9 @@ HMIMenu {
             text: Genivi.gettext("Ferries")
         }
         StdButton { source:StyleSheet.allow_ferries[Constants.SOURCE]; x:StyleSheet.allow_ferries[Constants.X]; y:StyleSheet.allow_ferries[Constants.Y]; width:StyleSheet.allow_ferries[Constants.WIDTH]; height:StyleSheet.allow_ferries[Constants.HEIGHT];
-            id:ferries_yes; next:back; prev:back; explode:false; onClicked:{use(Genivi.NAVIGATIONCORE_FERRY)}}
+            id:ferries_yes; next:back; prev:back;  onClicked:{use(Genivi.NAVIGATIONCORE_FERRY)}}
         StdButton { source:StyleSheet.avoid_ferries[Constants.SOURCE]; x:StyleSheet.avoid_ferries[Constants.X]; y:StyleSheet.avoid_ferries[Constants.Y]; width:StyleSheet.avoid_ferries[Constants.WIDTH]; height:StyleSheet.avoid_ferries[Constants.HEIGHT];
-            id:ferries_no; next:back; prev:back; explode:false; onClicked:{avoid(Genivi.NAVIGATIONCORE_FERRY)}}
+            id:ferries_no; next:back; prev:back;  onClicked:{avoid(Genivi.NAVIGATIONCORE_FERRY)}}
 
 		Text {
             x:StyleSheet.tollRoadsText[Constants.X]; y:StyleSheet.tollRoadsText[Constants.Y]; width:StyleSheet.tollRoadsText[Constants.WIDTH]; height:StyleSheet.tollRoadsText[Constants.HEIGHT];color:StyleSheet.tollRoadsText[Constants.TEXTCOLOR];styleColor:StyleSheet.tollRoadsText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.tollRoadsText[Constants.PIXELSIZE];
@@ -170,9 +170,9 @@ HMIMenu {
             text: Genivi.gettext("TollRoads")
         }
         StdButton { source:StyleSheet.allow_tollRoads[Constants.SOURCE]; x:StyleSheet.allow_tollRoads[Constants.X]; y:StyleSheet.allow_tollRoads[Constants.Y]; width:StyleSheet.allow_tollRoads[Constants.WIDTH]; height:StyleSheet.allow_tollRoads[Constants.HEIGHT];
-            id:toll_roads_yes; next:back; prev:back; explode:false; onClicked:{use(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
+            id:toll_roads_yes; next:back; prev:back;  onClicked:{use(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
         StdButton { source:StyleSheet.avoid_tollRoads[Constants.SOURCE]; x:StyleSheet.avoid_tollRoads[Constants.X]; y:StyleSheet.avoid_tollRoads[Constants.Y]; width:StyleSheet.avoid_tollRoads[Constants.WIDTH]; height:StyleSheet.avoid_tollRoads[Constants.HEIGHT];
-            id:toll_roads_no;  next:back; prev:back; explode:false; onClicked:{avoid(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
+            id:toll_roads_no;  next:back; prev:back;  onClicked:{avoid(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
 
 		Text {
             x:StyleSheet.motorWaysText[Constants.X]; y:StyleSheet.motorWaysText[Constants.Y]; width:StyleSheet.motorWaysText[Constants.WIDTH]; height:StyleSheet.motorWaysText[Constants.HEIGHT];color:StyleSheet.motorWaysText[Constants.TEXTCOLOR];styleColor:StyleSheet.motorWaysText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.motorWaysText[Constants.PIXELSIZE];
@@ -182,9 +182,9 @@ HMIMenu {
             text: Genivi.gettext("MotorWays")
         }
         StdButton { source:StyleSheet.allow_motorways[Constants.SOURCE]; x:StyleSheet.allow_motorways[Constants.X]; y:StyleSheet.allow_motorways[Constants.Y]; width:StyleSheet.allow_motorways[Constants.WIDTH]; height:StyleSheet.allow_motorways[Constants.HEIGHT];
-            id:motorways_yes; next:back; prev:back; explode:false; onClicked:{use(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
+            id:motorways_yes; next:back; prev:back;  onClicked:{use(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
         StdButton { source:StyleSheet.avoid_motorways[Constants.SOURCE]; x:StyleSheet.avoid_motorways[Constants.X]; y:StyleSheet.avoid_motorways[Constants.Y]; width:StyleSheet.avoid_motorways[Constants.WIDTH]; height:StyleSheet.avoid_motorways[Constants.HEIGHT];
-            id:motorways_no;  next:back; prev:back; explode:false; onClicked:{avoid(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
+            id:motorways_no;  next:back; prev:back;  onClicked:{avoid(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
 
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
             id:back; text: Genivi.gettext("Back"); disabled:false; next:back; prev:back; onClicked:{leaveMenu();}}
diff --git a/src/hmi/qml/NavigationAppTripComputer.qml b/src/hmi/qml/NavigationAppTripComputer.qml
index 6f33a21..b6add7b 100644
--- a/src/hmi/qml/NavigationAppTripComputer.qml
+++ b/src/hmi/qml/NavigationAppTripComputer.qml
@@ -390,7 +390,7 @@ HMIMenu {
 
         StdButton { source:StyleSheet.reset[Constants.SOURCE]; x:StyleSheet.reset[Constants.X]; y:StyleSheet.reset[Constants.Y]; width:StyleSheet.reset[Constants.WIDTH]; height:StyleSheet.reset[Constants.HEIGHT];textColor:StyleSheet.resetText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.resetText[Constants.PIXELSIZE];
             visible: false;
-            id:reset; text: Genivi.gettext("Reset"); explode:false; disabled:false; next:select_trip1; prev:back;
+            id:reset; text: Genivi.gettext("Reset");  disabled:false; next:select_trip1; prev:back;
             onClicked:{
 		if (Genivi.tripMode == "TRIP_NUMBER1") {
             Genivi.fuelstopadvisor_ResetTripData(dbusIf,0);
@@ -403,7 +403,7 @@ HMIMenu {
         }
         StdButton { source:StyleSheet.select_trip1[Constants.SOURCE]; x:StyleSheet.select_trip1[Constants.X]; y:StyleSheet.select_trip1[Constants.Y]; width:StyleSheet.select_trip1[Constants.WIDTH]; height:StyleSheet.select_trip1[Constants.HEIGHT];
             visible: false;
-            id:select_trip1; explode:false; disabled:false; next:select_trip2; prev:reset;
+            id:select_trip1;  disabled:false; next:select_trip2; prev:reset;
             onClicked:{
                 Genivi.tripMode="TRIP_NUMBER1";
                 updateTripMode();
@@ -411,7 +411,7 @@ HMIMenu {
         }
         StdButton { source:StyleSheet.select_trip2[Constants.SOURCE]; x:StyleSheet.select_trip2[Constants.X]; y:StyleSheet.select_trip2[Constants.Y]; width:StyleSheet.select_trip2[Constants.WIDTH]; height:StyleSheet.select_trip2[Constants.HEIGHT];
             visible: false;
-            id:select_trip2; explode:false; disabled:false; next:select_instant; prev:select_trip1;
+            id:select_trip2;  disabled:false; next:select_instant; prev:select_trip1;
             onClicked:{
                 Genivi.tripMode="TRIP_NUMBER2";
                 updateTripMode();
@@ -419,14 +419,14 @@ HMIMenu {
         }
         StdButton { source:StyleSheet.select_instant[Constants.SOURCE]; x:StyleSheet.select_instant[Constants.X]; y:StyleSheet.select_instant[Constants.Y]; width:StyleSheet.select_instant[Constants.WIDTH]; height:StyleSheet.select_instant[Constants.HEIGHT];
             visible: false;
-            id:select_instant; explode:false; disabled:false; next:back; prev:select_trip2;
+            id:select_instant;  disabled:false; next:back; prev:select_trip2;
             onClicked:{
                 Genivi.tripMode="TRIP_INSTANT";
                 updateTripMode();
             }
         }
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); explode:false; disabled:false; next:reset; prev:select_instant;
+            id:back; text: Genivi.gettext("Back");  disabled:false; next:reset; prev:select_instant;
             onClicked:{leave(); leaveMenu();}
         }
     }
diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml
index 05682ba..4069c14 100644
--- a/src/hmi/qml/NavigationBrowseMap.qml
+++ b/src/hmi/qml/NavigationBrowseMap.qml
@@ -506,7 +506,7 @@ HMIMenu {
 
                 StdButton {
                     x:StyleSheetBottom.directiondestination[Constants.X]; y:StyleSheetBottom.directiondestination[Constants.Y]; width:StyleSheetBottom.directiondestination[Constants.WIDTH]; height:StyleSheetBottom.directiondestination[Constants.HEIGHT];
-                    id:orientation; next:zoomin; prev:menub; explode:false; disabled:false;
+                    id:orientation; next:zoomin; prev:menub;  disabled:false;
                     source:StyleSheetBottom.directiondestination[Constants.SOURCE]; //todo call get status
                     property int status: 0;
                     function setState(name)
@@ -537,7 +537,7 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetBottom.zoomin[Constants.SOURCE]; x:StyleSheetBottom.zoomin[Constants.X]; y:StyleSheetBottom.zoomin[Constants.Y]; width:StyleSheetBottom.zoomin[Constants.WIDTH]; height:StyleSheetBottom.zoomin[Constants.HEIGHT];
-                    id:zoomin; explode:false; next:zoomout; prev:orientation;
+                    id:zoomin;  next:zoomout; prev:orientation;
                     onClicked: {
                         Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,1);
                         showZoom();
@@ -555,7 +555,7 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetBottom.zoomout[Constants.SOURCE]; x:StyleSheetBottom.zoomout[Constants.X]; y:StyleSheetBottom.zoomout[Constants.Y]; width:StyleSheetBottom.zoomout[Constants.WIDTH]; height:StyleSheetBottom.zoomout[Constants.HEIGHT];
-                    id:zoomout; explode:false; next:settings; prev:zoomin;
+                    id:zoomout;  next:settings; prev:zoomin;
                     onClicked: {
                         Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,-1);
                         showZoom();
@@ -564,7 +564,7 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetBottom.settings[Constants.SOURCE]; x:StyleSheetBottom.settings[Constants.X]; y:StyleSheetBottom.settings[Constants.Y]; width:StyleSheetBottom.settings[Constants.WIDTH]; height:StyleSheetBottom.settings[Constants.HEIGHT];
-                    id:settings; explode:false; next:menub; prev:zoomout;
+                    id:settings;  next:menub; prev:zoomout;
                     onClicked: {
                         disconnectSignals();
                         entryMenu("CameraSettings",menu);
@@ -573,7 +573,7 @@ HMIMenu {
 
                 StdButton {
                     x:StyleSheetBottom.guidanceon[Constants.X]; y:StyleSheetBottom.guidanceon[Constants.Y]; width:StyleSheetBottom.guidanceon[Constants.WIDTH]; height:StyleSheetBottom.guidanceon[Constants.HEIGHT];
-                    id:guidanceStatus; next:zoomin; prev:menub; explode:false; disabled:false;
+                    id:guidanceStatus; next:zoomin; prev:menub;  disabled:false;
                     source:StyleSheetBottom.guidanceoff[Constants.SOURCE]; //todo call get status
                     property int status: 1;
                     function setState(name)
@@ -721,28 +721,28 @@ HMIMenu {
 
                 StdButton {
                     source:StyleSheetScroll.scrollup[Constants.SOURCE]; x:StyleSheetScroll.scrollup[Constants.X]; y:StyleSheetScroll.scrollup[Constants.Y]; width:StyleSheetScroll.scrollup[Constants.WIDTH]; height:StyleSheetScroll.scrollup[Constants.HEIGHT];
-                    id:scrollup; explode:false; next:scrollleft; prev:scrolldown;
+                    id:scrollup;  next:scrollleft; prev:scrolldown;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 + scroll.panY);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollleft[Constants.SOURCE]; x:StyleSheetScroll.scrollleft[Constants.X]; y:StyleSheetScroll.scrollleft[Constants.Y]; width:StyleSheetScroll.scrollleft[Constants.WIDTH]; height:StyleSheetScroll.scrollleft[Constants.HEIGHT];
-                    id:scrollleft; explode:false; next:scrollright; prev:scrollup;
+                    id:scrollleft;  next:scrollright; prev:scrollup;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 + scroll.panX,map.height/2);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollright[Constants.SOURCE]; x:StyleSheetScroll.scrollright[Constants.X]; y:StyleSheetScroll.scrollright[Constants.Y]; width:StyleSheetScroll.scrollright[Constants.WIDTH]; height:StyleSheetScroll.scrollright[Constants.HEIGHT];
-                    id:scrollright; explode:false; next:scrolldown; prev:scrollleft;
+                    id:scrollright;  next:scrolldown; prev:scrollleft;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 - scroll.panX,map.height/2);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrolldown[Constants.SOURCE]; x:StyleSheetScroll.scrolldown[Constants.X]; y:StyleSheetScroll.scrolldown[Constants.Y]; width:StyleSheetScroll.scrolldown[Constants.WIDTH]; height:StyleSheetScroll.scrolldown[Constants.HEIGHT];
-                    id:scrolldown; explode:false; next:scrollup; prev:scrollright;
+                    id:scrolldown;  next:scrollup; prev:scrollright;
                     onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
                     onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 - scroll.panY);}
                 }
@@ -779,7 +779,7 @@ HMIMenu {
                      }
                 StdButton {
                     source:StyleSheetSimulation.speed_down_popup[Constants.SOURCE]; x:StyleSheetSimulation.speed_down_popup[Constants.X]; y:StyleSheetSimulation.speed_down_popup[Constants.Y]; width:StyleSheetSimulation.speed_down_popup[Constants.WIDTH]; height:StyleSheetSimulation.speed_down_popup[Constants.HEIGHT];
-                    id:speed_down; explode:false; disabled:false; next:speed_up; prev:simu_mode;
+                    id:speed_down;  disabled:false; next:speed_up; prev:simu_mode;
                     onClicked:
                     {
                         if (speedValueSent > 0)
@@ -791,7 +791,7 @@ HMIMenu {
                 }
                 StdButton {
                     source:StyleSheetSimulation.speed_up_popup[Constants.SOURCE]; x:StyleSheetSimulation.speed_up_popup[Constants.X]; y:StyleSheetSimulation.speed_up_popup[Constants.Y]; width:StyleSheetSimulation.speed_up_popup[Constants.WIDTH]; height:StyleSheetSimulation.speed_up_popup[Constants.HEIGHT];
-                    id:speed_up; explode:false; disabled:false; next:on_off; prev:speed_down;
+                    id:speed_up;  disabled:false; next:on_off; prev:speed_down;
                     onClicked:
                     {
                         if (speedValueSent < 7)
@@ -803,7 +803,7 @@ HMIMenu {
                 }
                 StdButton {
                     x:StyleSheetSimulation.simulation_on_popup[Constants.X]; y:StyleSheetSimulation.simulation_on_popup[Constants.Y]; width:StyleSheetSimulation.simulation_on_popup[Constants.WIDTH]; height:StyleSheetSimulation.simulation_on_popup[Constants.HEIGHT];
-                    id:on_off; next:simu_mode; prev:speed_up; explode:false; disabled:false;
+                    id:on_off; next:simu_mode; prev:speed_up;  disabled:false;
                     property int status: 1; //by default simulation stopped
                     function setState(name)
                     {
@@ -835,7 +835,7 @@ HMIMenu {
                 }
                 StdButton {
                     x:StyleSheetSimulation.play_popup[Constants.X]; y:StyleSheetSimulation.play_popup[Constants.Y]; width:StyleSheetSimulation.play_popup[Constants.WIDTH]; height:StyleSheetSimulation.play_popup[Constants.HEIGHT];
-                    id:simu_mode; next:speed_down; prev:on_off; explode:false; disabled:false;
+                    id:simu_mode; next:speed_down; prev:on_off;  disabled:false;
                     property int status: 0;
                     function setState(name)
                     {
diff --git a/src/hmi/qml/NavigationCalculatedRoute.qml b/src/hmi/qml/NavigationCalculatedRoute.qml
index d222588..4c31af1 100644
--- a/src/hmi/qml/NavigationCalculatedRoute.qml
+++ b/src/hmi/qml/NavigationCalculatedRoute.qml
@@ -192,7 +192,7 @@ HMIMenu {
         StdButton {
             source:StyleSheet.show_route_on_map[Constants.SOURCE]; x:StyleSheet.show_route_on_map[Constants.X]; y:StyleSheet.show_route_on_map[Constants.Y]; width:StyleSheet.show_route_on_map[Constants.WIDTH]; height:StyleSheet.show_route_on_map[Constants.HEIGHT];
             id: show_route_on_map
-            explode:false; disabled:true; next:show_route_in_list; prev:back
+             disabled:true; next:show_route_in_list; prev:back
             onClicked: {
                 disconnectSignals();
                 Genivi.data["mapback"]="NavigationCalculatedRoute";
@@ -204,7 +204,7 @@ HMIMenu {
         StdButton {
             source:StyleSheet.show_route_in_list[Constants.SOURCE]; x:StyleSheet.show_route_in_list[Constants.X]; y:StyleSheet.show_route_in_list[Constants.Y]; width:StyleSheet.show_route_in_list[Constants.WIDTH]; height:StyleSheet.show_route_in_list[Constants.HEIGHT];
             id:show_route_in_list;
-            explode:false; disabled:true; next:back; prev:show_route_on_map;
+             disabled:true; next:back; prev:show_route_on_map;
             onClicked: {
                 entryMenu("NavigationRouteDescription",menu);
             }
@@ -212,7 +212,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.guidance_start[Constants.SOURCE]; x:StyleSheet.guidance_start[Constants.X]; y:StyleSheet.guidance_start[Constants.Y]; width:StyleSheet.guidance_start[Constants.WIDTH]; height:StyleSheet.guidance_start[Constants.HEIGHT];textColor:StyleSheet.startText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.startText[Constants.PIXELSIZE];
-            id:guidance_start; text: Genivi.gettext("On");explode:false; disabled:true; next:guidance_stop; prev:show_route_on_map
+            id:guidance_start; text: Genivi.gettext("On"); disabled:true; next:guidance_stop; prev:show_route_on_map
             onClicked: {
                 disconnectSignals();
                 Genivi.guidance_StartGuidance(dbusIf,Genivi.routing_handle(dbusIf));
@@ -224,7 +224,7 @@ HMIMenu {
         }
         StdButton {
             source:StyleSheet.guidance_stop[Constants.SOURCE]; x:StyleSheet.guidance_stop[Constants.X]; y:StyleSheet.guidance_stop[Constants.Y]; width:StyleSheet.guidance_stop[Constants.WIDTH]; height:StyleSheet.guidance_stop[Constants.HEIGHT];textColor:StyleSheet.stopText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.stopText[Constants.PIXELSIZE];
-            id:guidance_stop;text: Genivi.gettext("Off");explode:false; disabled:true; next:show_route_on_map; prev:guidance_start
+            id:guidance_stop;text: Genivi.gettext("Off"); disabled:true; next:show_route_on_map; prev:guidance_start
             onClicked: {
                 Genivi.guidance_StopGuidance(dbusIf);
                 guidance_start.disabled=false;
diff --git a/src/hmi/qml/NavigationRoute.qml b/src/hmi/qml/NavigationRoute.qml
index aeb36f4..e43b809 100644
--- a/src/hmi/qml/NavigationRoute.qml
+++ b/src/hmi/qml/NavigationRoute.qml
@@ -134,7 +134,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.show_location_on_map[Constants.SOURCE]; x:StyleSheet.show_location_on_map[Constants.X]; y:StyleSheet.show_location_on_map[Constants.Y]; width:StyleSheet.show_location_on_map[Constants.WIDTH]; height:StyleSheet.show_location_on_map[Constants.HEIGHT];
-            id:show; disabled:false; next:destination; prev:back; explode:false;
+            id:show; disabled:false; next:destination; prev:back; 
             onClicked: {
                 Genivi.data['show_position']=new Array;
                 Genivi.data['show_position']['lat']=Genivi.data['lat'];
@@ -147,7 +147,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.set_as_position[Constants.SOURCE]; x:StyleSheet.set_as_position[Constants.X]; y:StyleSheet.set_as_position[Constants.Y]; width:StyleSheet.set_as_position[Constants.WIDTH]; height:StyleSheet.set_as_position[Constants.HEIGHT];
-            id:position; disabled:false; next:calculate; prev:destination; explode:false;
+            id:position; disabled:false; next:calculate; prev:destination; 
             onClicked: {
                 Genivi.data['position']=new Array;
                 Genivi.data['position']['lat']=Genivi.data['lat'];
@@ -161,7 +161,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.set_as_destination[Constants.SOURCE]; x:StyleSheet.set_as_destination[Constants.X]; y:StyleSheet.set_as_destination[Constants.Y]; width:StyleSheet.set_as_destination[Constants.WIDTH]; height:StyleSheet.set_as_destination[Constants.HEIGHT];
-            id:destination; disabled:false; next:position; prev:show; explode:false;
+            id:destination; disabled:false; next:position; prev:show; 
              onClicked: {
                 Genivi.data['destination']=new Array;
                 Genivi.data['destination']['lat']=Genivi.data['lat'];
@@ -176,7 +176,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.route[Constants.SOURCE]; x:StyleSheet.route[Constants.X]; y:StyleSheet.route[Constants.Y]; width:StyleSheet.route[Constants.WIDTH]; height:StyleSheet.route[Constants.HEIGHT];textColor:StyleSheet.routeText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.routeText[Constants.PIXELSIZE];
-            id:calculate; text: Genivi.gettext("Route"); explode:false;
+            id:calculate; text: Genivi.gettext("Route"); 
             onClicked: {
                 var position,destination;
                 position=Genivi.latlon_to_map(Genivi.data['position']);
@@ -193,7 +193,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.calculate_curr[Constants.SOURCE]; x:StyleSheet.calculate_curr[Constants.X]; y:StyleSheet.calculate_curr[Constants.Y]; width:StyleSheet.calculate_curr[Constants.WIDTH]; height:StyleSheet.calculate_curr[Constants.HEIGHT];textColor:StyleSheet.calculate_currText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.calculate_currText[Constants.PIXELSIZE];
-            id:calculate_curr; text: Genivi.gettext("GoTo"); explode:false;
+            id:calculate_curr; text: Genivi.gettext("GoTo"); 
             onClicked: {
                 var position,destination;
                 destination=Genivi.latlon_to_map(Genivi.data['destination']);
diff --git a/src/hmi/qml/NavigationSearch.qml b/src/hmi/qml/NavigationSearch.qml
index 16eacd7..26b1a63 100644
--- a/src/hmi/qml/NavigationSearch.qml
+++ b/src/hmi/qml/NavigationSearch.qml
@@ -55,39 +55,39 @@ HMIMenu {
         }
 
         StdButton { source:StyleSheet.search_by_address[Constants.SOURCE]; x:StyleSheet.search_by_address[Constants.X]; y:StyleSheet.search_by_address[Constants.Y]; width:StyleSheet.search_by_address[Constants.WIDTH]; height:StyleSheet.search_by_address[Constants.HEIGHT];
-            id:search_by_address;  explode:false; next:search_by_coordinates; prev:back;
+            id:search_by_address;   next:search_by_coordinates; prev:back;
             onClicked: {
                 Genivi.preloadMode=true;
                 entryMenu("NavigationSearchAddress",menu);
             }
         }
         StdButton { source:StyleSheet.search_by_coordinates[Constants.SOURCE]; x:StyleSheet.search_by_coordinates[Constants.X]; y:StyleSheet.search_by_coordinates[Constants.Y]; width:StyleSheet.search_by_coordinates[Constants.WIDTH]; height:StyleSheet.search_by_coordinates[Constants.HEIGHT];
-            id:search_by_coordinates; explode:false; next:search_by_poi; prev:search_by_address;
+            id:search_by_coordinates;  next:search_by_poi; prev:search_by_address;
             onClicked: {
                 entryMenu("NavigationSearchCoordinates",menu);
             }
         }
         StdButton { source:StyleSheet.search_by_poi[Constants.SOURCE]; x:StyleSheet.search_by_poi[Constants.X]; y:StyleSheet.search_by_poi[Constants.Y]; width:StyleSheet.search_by_poi[Constants.WIDTH]; height:StyleSheet.search_by_poi[Constants.HEIGHT];
-            id:search_by_poi; explode:false; next:search_by_freetext; prev:search_by_coordinates;
+            id:search_by_poi;  next:search_by_freetext; prev:search_by_coordinates;
             onClicked: {
                 entryMenu("POI",menu);
             }
         }
         StdButton { source:StyleSheet.search_by_freetext[Constants.SOURCE]; x:StyleSheet.search_by_freetext[Constants.X]; y:StyleSheet.search_by_freetext[Constants.Y]; width:StyleSheet.search_by_freetext[Constants.WIDTH]; height:StyleSheet.search_by_freetext[Constants.HEIGHT];
-            id:search_by_freetext; explode:false; next:history; prev:search_by_poi;
+            id:search_by_freetext;  next:history; prev:search_by_poi;
             onClicked: {
                 entryMenu("NavigationSearchFreeText",menu);
             }
         }
         StdButton { source:StyleSheet.history[Constants.SOURCE]; x:StyleSheet.history[Constants.X]; y:StyleSheet.history[Constants.Y]; width:StyleSheet.history[Constants.WIDTH]; height:StyleSheet.history[Constants.HEIGHT];textColor:StyleSheet.historyText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.historyText[Constants.PIXELSIZE];
-            id:history; text: Genivi.gettext("History"); disabled:false; explode:false; next:back; prev:search_by_freetext;
+            id:history; text: Genivi.gettext("History"); disabled:false;  next:back; prev:search_by_freetext;
             onClicked: {
                 entryMenu("NavigationSearchHistory",menu);
             }
         }
 
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); explode:false; next:search_by_address; prev:search_by_freetext;
+            id:back; text: Genivi.gettext("Back");  next:search_by_address; prev:search_by_freetext;
             onClicked: {
                 leaveMenu();
             }
diff --git a/src/hmi/qml/NavigationSearchAddress.qml b/src/hmi/qml/NavigationSearchAddress.qml
index df19ac3..475007e 100644
--- a/src/hmi/qml/NavigationSearchAddress.qml
+++ b/src/hmi/qml/NavigationSearchAddress.qml
@@ -319,7 +319,7 @@ HMIMenu {
         }
 
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); explode:false; next:countryValue; prev:ok;
+            id:back; text: Genivi.gettext("Back");  next:countryValue; prev:ok;
             onClicked:{leave(1); leaveMenu();}
         }
 	}
diff --git a/src/hmi/qml/NavigationSearchCoordinates.qml b/src/hmi/qml/NavigationSearchCoordinates.qml
index 2fc51b0..8ac3b90 100644
--- a/src/hmi/qml/NavigationSearchCoordinates.qml
+++ b/src/hmi/qml/NavigationSearchCoordinates.qml
@@ -102,7 +102,7 @@ HMIMenu {
         }
         StdButton {
             source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); explode:false; next:latitudeValue; prev:ok;
+            id:back; text: Genivi.gettext("Back");  next:latitudeValue; prev:ok;
             onClicked:{
                 Genivi.data['lat']='';
                 Genivi.data['lon']='';
diff --git a/src/hmi/qml/NavigationSearchFreeText.qml b/src/hmi/qml/NavigationSearchFreeText.qml
index 7fbe821..7904e33 100644
--- a/src/hmi/qml/NavigationSearchFreeText.qml
+++ b/src/hmi/qml/NavigationSearchFreeText.qml
@@ -176,7 +176,7 @@ HMIMenu {
         }
         StdButton {
             source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); explode:false; next:textValue; prev:ok;
+            id:back; text: Genivi.gettext("Back");  next:textValue; prev:ok;
             onClicked:{leave(1); leaveMenu();}
         }
     }
diff --git a/src/hmi/qml/NavigationSettings.qml b/src/hmi/qml/NavigationSettings.qml
index 57b0213..4bd30c3 100644
--- a/src/hmi/qml/NavigationSettings.qml
+++ b/src/hmi/qml/NavigationSettings.qml
@@ -257,7 +257,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.speed_down[Constants.SOURCE]; x:StyleSheet.speed_down[Constants.X]; y:StyleSheet.speed_down[Constants.Y]; width:StyleSheet.speed_down[Constants.WIDTH]; height:StyleSheet.speed_down[Constants.HEIGHT];
-            id:speed_down; explode:false; disabled:false; next:back; prev:back;
+            id:speed_down;  disabled:false; next:back; prev:back;
 			onClicked:
 			{
                 if (speedValueSent > 0)
@@ -270,7 +270,7 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.speed_up[Constants.SOURCE]; x:StyleSheet.speed_up[Constants.X]; y:StyleSheet.speed_up[Constants.Y]; width:StyleSheet.speed_up[Constants.WIDTH]; height:StyleSheet.speed_up[Constants.HEIGHT];
-            id:speed_up; explode:false; disabled:false; next:back; prev:back;
+            id:speed_up;  disabled:false; next:back; prev:back;
 			onClicked:
 			{
                 if (speedValueSent < 7)
@@ -299,7 +299,7 @@ HMIMenu {
 
         StdButton {
             x:StyleSheet.simulation_on[Constants.X]; y:StyleSheet.simulation_on[Constants.Y]; width:StyleSheet.simulation_on[Constants.WIDTH]; height:StyleSheet.simulation_on[Constants.HEIGHT];
-            id:on_off; next:back; prev:back; explode:false; disabled:false;
+            id:on_off; next:back; prev:back;  disabled:false;
 			property int status: 0;
 			function setState(name)
 			{
@@ -333,7 +333,7 @@ HMIMenu {
 
         StdButton {
             x:StyleSheet.play[Constants.X]; y:StyleSheet.play[Constants.Y]; width:StyleSheet.play[Constants.WIDTH]; height:StyleSheet.play[Constants.HEIGHT];
-            id:simu_mode; next:back; prev:back; explode:false; disabled:false;
+            id:simu_mode; next:back; prev:back;  disabled:false;
 			property int status: 0;
 			function setState(name)
 			{
@@ -406,7 +406,7 @@ HMIMenu {
 
         StdButton {
             x:StyleSheet.onmapview_enable[Constants.X]; y:StyleSheet.onmapview_enable[Constants.Y]; width:StyleSheet.onmapview_enable[Constants.WIDTH]; height:StyleSheet.onmapview_enable[Constants.HEIGHT];
-            id:onmapview_enable; next:back; prev:preferences; explode:false; disabled:false;
+            id:onmapview_enable; next:back; prev:preferences;  disabled:false;
             source:
             {
                 if (Genivi.simulationPanelOnMapview==true)
diff --git a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
index 4ce0c97..117e954 100644
--- a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
+++ b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
@@ -149,16 +149,16 @@ HMIMenu {
              }
         StdButton { objectName:"fra_FRA";
             source:StyleSheet.french_flag[Constants.SOURCE]; x:StyleSheet.french_flag[Constants.X]; y:StyleSheet.french_flag[Constants.Y]; width:StyleSheet.french_flag[Constants.WIDTH]; height:StyleSheet.french_flag[Constants.HEIGHT];
-            id:fra_FRA; disabled:false; next:deu_DEU; prev:back; explode:false; onClicked: {setLocale("fra","FRA","Latn");}}
+            id:fra_FRA; disabled:false; next:deu_DEU; prev:back;  onClicked: {setLocale("fra","FRA","Latn");}}
         StdButton { objectName:"deu_DEU";
             source:StyleSheet.german_flag[Constants.SOURCE]; x:StyleSheet.german_flag[Constants.X]; y:StyleSheet.german_flag[Constants.Y]; width:StyleSheet.german_flag[Constants.WIDTH]; height:StyleSheet.german_flag[Constants.HEIGHT];
-             id:deu_DEU; disabled:false; next:eng_USA; prev:fra_FRA; explode:false; onClicked: {setLocale("deu","DEU","Latn");}}
+             id:deu_DEU; disabled:false; next:eng_USA; prev:fra_FRA;  onClicked: {setLocale("deu","DEU","Latn");}}
         StdButton { objectName:"eng_USA";
             source:StyleSheet.usa_flag[Constants.SOURCE]; x:StyleSheet.usa_flag[Constants.X]; y:StyleSheet.usa_flag[Constants.Y]; width:StyleSheet.usa_flag[Constants.WIDTH]; height:StyleSheet.usa_flag[Constants.HEIGHT];
-            id:eng_USA; disabled:false; next:jpn_JPN; prev:deu_DEU; explode:false; onClicked: {setLocale("eng","USA","Latn");}}
+            id:eng_USA; disabled:false; next:jpn_JPN; prev:deu_DEU;  onClicked: {setLocale("eng","USA","Latn");}}
         StdButton { objectName:"jpn_JPN";
             source:StyleSheet.japanese_flag[Constants.SOURCE]; x:StyleSheet.japanese_flag[Constants.X]; y:StyleSheet.japanese_flag[Constants.Y]; width:StyleSheet.japanese_flag[Constants.WIDTH]; height:StyleSheet.japanese_flag[Constants.HEIGHT];
-            id:jpn_JPN; disabled:false; next:back; prev:eng_USA; explode:false; onClicked: {setLocale("jpn","JPN","Hrkt");}}
+            id:jpn_JPN; disabled:false; next:back; prev:eng_USA;  onClicked: {setLocale("jpn","JPN","Hrkt");}}
 
 		Text {
             x:StyleSheet.unitsTitle[Constants.X]; y:StyleSheet.unitsTitle[Constants.Y]; width:StyleSheet.unitsTitle[Constants.WIDTH]; height:StyleSheet.unitsTitle[Constants.HEIGHT];color:StyleSheet.unitsTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.unitsTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.unitsTitle[Constants.PIXELSIZE];
@@ -168,12 +168,12 @@ HMIMenu {
             text: Genivi.gettext("Units")
              }
         StdButton { source:StyleSheet.unit_km[Constants.SOURCE]; x:StyleSheet.unit_km[Constants.X]; y:StyleSheet.unit_km[Constants.Y]; width:StyleSheet.unit_km[Constants.WIDTH]; height:StyleSheet.unit_km[Constants.HEIGHT];
-            id:unit_km; explode:false; disabled:false; next:back; prev:back;
+            id:unit_km;  disabled:false; next:back; prev:back;
 			onClicked: {
                 setUnitsLength(Genivi.NAVIGATIONCORE_KM,Genivi.MAPVIEWER_KM);}
 		}
         StdButton { source:StyleSheet.unit_mile[Constants.SOURCE]; x:StyleSheet.unit_mile[Constants.X]; y:StyleSheet.unit_mile[Constants.Y]; width:StyleSheet.unit_mile[Constants.WIDTH]; height:StyleSheet.unit_mile[Constants.HEIGHT];
-            id:unit_mile; explode:false; disabled:false; next:back; prev:back;
+            id:unit_mile;  disabled:false; next:back; prev:back;
 			onClicked: {
                 setUnitsLength(Genivi.NAVIGATIONCORE_MILE,Genivi.MAPVIEWER_MILE);}
 		}
diff --git a/src/hmi/qml/NavigationSettingsPreferences.qml b/src/hmi/qml/NavigationSettingsPreferences.qml
index 7cb7b79..6e0758b 100644
--- a/src/hmi/qml/NavigationSettingsPreferences.qml
+++ b/src/hmi/qml/NavigationSettingsPreferences.qml
@@ -158,9 +158,9 @@ HMIMenu {
             text: Genivi.gettext("Ferries")
         }
         StdButton { source:StyleSheet.allow_ferries[Constants.SOURCE]; x:StyleSheet.allow_ferries[Constants.X]; y:StyleSheet.allow_ferries[Constants.Y]; width:StyleSheet.allow_ferries[Constants.WIDTH]; height:StyleSheet.allow_ferries[Constants.HEIGHT];
-            id:ferries_yes; next:back; prev:back; explode:false; onClicked:{use(Genivi.NAVIGATIONCORE_FERRY)}}
+            id:ferries_yes; next:back; prev:back;  onClicked:{use(Genivi.NAVIGATIONCORE_FERRY)}}
         StdButton { source:StyleSheet.avoid_ferries[Constants.SOURCE]; x:StyleSheet.avoid_ferries[Constants.X]; y:StyleSheet.avoid_ferries[Constants.Y]; width:StyleSheet.avoid_ferries[Constants.WIDTH]; height:StyleSheet.avoid_ferries[Constants.HEIGHT];
-            id:ferries_no; next:back; prev:back; explode:false; onClicked:{avoid(Genivi.NAVIGATIONCORE_FERRY)}}
+            id:ferries_no; next:back; prev:back;  onClicked:{avoid(Genivi.NAVIGATIONCORE_FERRY)}}
 
 		Text {
             x:StyleSheet.tollRoadsText[Constants.X]; y:StyleSheet.tollRoadsText[Constants.Y]; width:StyleSheet.tollRoadsText[Constants.WIDTH]; height:StyleSheet.tollRoadsText[Constants.HEIGHT];color:StyleSheet.tollRoadsText[Constants.TEXTCOLOR];styleColor:StyleSheet.tollRoadsText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.tollRoadsText[Constants.PIXELSIZE];
@@ -170,9 +170,9 @@ HMIMenu {
             text: Genivi.gettext("TollRoads")
         }
         StdButton { source:StyleSheet.allow_tollRoads[Constants.SOURCE]; x:StyleSheet.allow_tollRoads[Constants.X]; y:StyleSheet.allow_tollRoads[Constants.Y]; width:StyleSheet.allow_tollRoads[Constants.WIDTH]; height:StyleSheet.allow_tollRoads[Constants.HEIGHT];
-            id:toll_roads_yes; next:back; prev:back; explode:false; onClicked:{use(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
+            id:toll_roads_yes; next:back; prev:back;  onClicked:{use(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
         StdButton { source:StyleSheet.avoid_tollRoads[Constants.SOURCE]; x:StyleSheet.avoid_tollRoads[Constants.X]; y:StyleSheet.avoid_tollRoads[Constants.Y]; width:StyleSheet.avoid_tollRoads[Constants.WIDTH]; height:StyleSheet.avoid_tollRoads[Constants.HEIGHT];
-            id:toll_roads_no;  next:back; prev:back; explode:false; onClicked:{avoid(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
+            id:toll_roads_no;  next:back; prev:back;  onClicked:{avoid(Genivi.NAVIGATIONCORE_TOLL_ROADS)}}
 
 		Text {
             x:StyleSheet.motorWaysText[Constants.X]; y:StyleSheet.motorWaysText[Constants.Y]; width:StyleSheet.motorWaysText[Constants.WIDTH]; height:StyleSheet.motorWaysText[Constants.HEIGHT];color:StyleSheet.motorWaysText[Constants.TEXTCOLOR];styleColor:StyleSheet.motorWaysText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.motorWaysText[Constants.PIXELSIZE];
@@ -182,9 +182,9 @@ HMIMenu {
             text: Genivi.gettext("MotorWays")
         }
         StdButton { source:StyleSheet.allow_motorways[Constants.SOURCE]; x:StyleSheet.allow_motorways[Constants.X]; y:StyleSheet.allow_motorways[Constants.Y]; width:StyleSheet.allow_motorways[Constants.WIDTH]; height:StyleSheet.allow_motorways[Constants.HEIGHT];
-            id:motorways_yes; next:back; prev:back; explode:false; onClicked:{use(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
+            id:motorways_yes; next:back; prev:back;  onClicked:{use(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
         StdButton { source:StyleSheet.avoid_motorways[Constants.SOURCE]; x:StyleSheet.avoid_motorways[Constants.X]; y:StyleSheet.avoid_motorways[Constants.Y]; width:StyleSheet.avoid_motorways[Constants.WIDTH]; height:StyleSheet.avoid_motorways[Constants.HEIGHT];
-            id:motorways_no;  next:back; prev:back; explode:false; onClicked:{avoid(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
+            id:motorways_no;  next:back; prev:back;  onClicked:{avoid(Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
 
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
             id:back; text: Genivi.gettext("Back"); disabled:false; next:back; prev:back; onClicked:{leaveMenu();}}
diff --git a/src/hmi/qml/POI.qml b/src/hmi/qml/POI.qml
index 06c0147..8cc7e4a 100644
--- a/src/hmi/qml/POI.qml
+++ b/src/hmi/qml/POI.qml
@@ -179,7 +179,7 @@ HMIMenu {
 		StdButton { 
             source:StyleSheet.select_reroute[Constants.SOURCE]; x:StyleSheet.select_reroute[Constants.X]; y:StyleSheet.select_reroute[Constants.Y]; width:StyleSheet.select_reroute[Constants.WIDTH]; height:StyleSheet.select_reroute[Constants.HEIGHT];
             id:select_reroute;
-            explode:false;
+            
             disabled:true;
             next:select_display_on_map; prev:select_search_for_refill
 			onClicked: {
@@ -208,7 +208,7 @@ HMIMenu {
         StdButton {
             source:StyleSheet.select_display_on_map[Constants.SOURCE]; x:StyleSheet.select_display_on_map[Constants.X]; y:StyleSheet.select_display_on_map[Constants.Y]; width:StyleSheet.select_display_on_map[Constants.WIDTH]; height:StyleSheet.select_display_on_map[Constants.HEIGHT];
             id:select_display_on_map;
-            explode:false;
+            
 	    disabled:true;
             next:back; prev:select_reroute
 			onClicked: {
diff --git a/src/hmi/qml/TripComputer.qml b/src/hmi/qml/TripComputer.qml
index 10aa16b..68f5295 100644
--- a/src/hmi/qml/TripComputer.qml
+++ b/src/hmi/qml/TripComputer.qml
@@ -392,7 +392,7 @@ HMIMenu {
 
         StdButton { source:StyleSheet.reset[Constants.SOURCE]; x:StyleSheet.reset[Constants.X]; y:StyleSheet.reset[Constants.Y]; width:StyleSheet.reset[Constants.WIDTH]; height:StyleSheet.reset[Constants.HEIGHT];textColor:StyleSheet.resetText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.resetText[Constants.PIXELSIZE];
             visible: false;
-            id:reset; text: Genivi.gettext("Reset"); explode:false; disabled:false; next:select_trip1; prev:back;
+            id:reset; text: Genivi.gettext("Reset");  disabled:false; next:select_trip1; prev:back;
             onClicked:{
 		if (Genivi.tripMode == "TRIP_NUMBER1") {
             Genivi.fuelstopadvisor_ResetTripData(dbusIf,0);
@@ -405,7 +405,7 @@ HMIMenu {
         }
         StdButton { source:StyleSheet.select_trip1[Constants.SOURCE]; x:StyleSheet.select_trip1[Constants.X]; y:StyleSheet.select_trip1[Constants.Y]; width:StyleSheet.select_trip1[Constants.WIDTH]; height:StyleSheet.select_trip1[Constants.HEIGHT];
             visible: false;
-            id:select_trip1; explode:false; disabled:false; next:select_trip2; prev:reset;
+            id:select_trip1;  disabled:false; next:select_trip2; prev:reset;
             onClicked:{
                 Genivi.tripMode="TRIP_NUMBER1";
                 updateTripMode();
@@ -413,7 +413,7 @@ HMIMenu {
         }
         StdButton { source:StyleSheet.select_trip2[Constants.SOURCE]; x:StyleSheet.select_trip2[Constants.X]; y:StyleSheet.select_trip2[Constants.Y]; width:StyleSheet.select_trip2[Constants.WIDTH]; height:StyleSheet.select_trip2[Constants.HEIGHT];
             visible: false;
-            id:select_trip2; explode:false; disabled:false; next:select_instant; prev:select_trip1;
+            id:select_trip2;  disabled:false; next:select_instant; prev:select_trip1;
             onClicked:{
                 Genivi.tripMode="TRIP_NUMBER2";
                 updateTripMode();
@@ -421,14 +421,14 @@ HMIMenu {
         }
         StdButton { source:StyleSheet.select_instant[Constants.SOURCE]; x:StyleSheet.select_instant[Constants.X]; y:StyleSheet.select_instant[Constants.Y]; width:StyleSheet.select_instant[Constants.WIDTH]; height:StyleSheet.select_instant[Constants.HEIGHT];
             visible: false;
-            id:select_instant; explode:false; disabled:false; next:back; prev:select_trip2;
+            id:select_instant;  disabled:false; next:back; prev:select_trip2;
             onClicked:{
                 Genivi.tripMode="TRIP_INSTANT";
                 updateTripMode();
             }
         }
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); explode:false; disabled:false; next:reset; prev:select_instant;
+            id:back; text: Genivi.gettext("Back");  disabled:false; next:reset; prev:select_instant;
             onClicked:{leave(); leaveMenu();}
         }
     }