some evolutions of the HMI (not stable yet)

22 files changed, 460 insertions, 361 deletions

diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
index 74a299b..a082fc5 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
index d830b38..321f956 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf
index a9467d6..6870123 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
index 10c042b..1ce32fc 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
index 2278a6b..589b9e0 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppMain.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppMain.xcf
index 2f1e14f..fb9e453 100755
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppMain.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppMain.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
index 9b1267a..86ee759 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
index a8bb9bd..ad9c936 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
diff --git a/src/hmi/qml/Core/NavigationAppHMIMenu.qml b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
index 935555e..7fc3777 100644
--- a/src/hmi/qml/Core/NavigationAppHMIMenu.qml
+++ b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
@@ -141,25 +141,27 @@ Rectangle {
         	}
 	}
 
-    function entryMenu(inmenu,outmenu)
+    function entryMenu(dltInterface,inmenu,outmenu)
     {
         Genivi.entrybackheapsize += 1;
+        Genivi.hookMessage(dltInterface,"Menu level",Genivi.entrybackheapsize);
         Genivi.entryback[Genivi.entrybackheapsize] = outmenu.pagefile;
         outmenu.state = "hidden";
         container.load(inmenu);
     }
 
-    function leaveMenu()
+    function leaveMenu(dltInterface)
     {
         var outmenu=Genivi.entryback[Genivi.entrybackheapsize];
         Genivi.entrybackheapsize -= 1;
+        Genivi.hookMessage(dltInterface,"Menu level",Genivi.entrybackheapsize);
         menu.state="hidden";
         container.load(outmenu);
     }
 
-	function pageOpen(command) {
+    function pageOpen(dltInterface,page) {
         menu.state="hidden";
-        container.load(command);
+        container.load(page);
 	}
 
     states: State {
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index 03bc63d..713c7f9 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -63,40 +63,58 @@ var radius; //radius in m around the vehicle to search for the refill stations
 var maxResultListSize; //max size of elements to return as a result
 var g_default_category_name;
 
-var guidance_activated=false;
-var route_calculated=false;
-var reroute_requested=false;
-var location_input_activated=true;
+var guidance_activated;
+var route_calculated;
+var reroute_requested;
+var location_input_activated;
+var vehicle_located;
+var destination_defined;
 
-function setRouteCalculated(arg)
+function setDestinationDefined(dltInterface,arg)
+{
+    destination_defined=arg;
+    if(verbose===true){
+        hookMessage(dltInterface,"Destination defined",destination_defined);
+    }
+}
+
+function setVehicleLocated(dltInterface,arg)
+{
+    vehicle_located=arg;
+    if(verbose===true){
+        hookMessage(dltInterface,"Vehicle located",vehicle_located);
+    }
+}
+
+function setRouteCalculated(dltInterface,arg)
 {
     route_calculated=arg;
     if(verbose===true){
-        console.log("Routing: ",route_calculated);
+        hookMessage(dltInterface,"Route calculated",route_calculated);
     }
 }
 
-function setGuidanceActivated(arg)
+function setGuidanceActivated(dltInterface,arg)
 {
     guidance_activated=arg;
     if(verbose===true){
-        console.log(" Guidance: ",guidance_activated);
+        hookMessage(dltInterface,"Guidance activated",guidance_activated);
     }
 }
 
-function setLocationInputActivated(arg)
+function setLocationInputActivated(dltInterface,arg)
 {
     location_input_activated=arg;
     if(verbose===true){
-        console.log("Location input: ",location_input_activated);
+        hookMessage(dltInterface,"Location input activated",location_input_activated);
     }
 }
 
-function setRerouteRequested(arg)
+function setRerouteRequested(dltInterface,arg)
 {
     reroute_requested=arg;
     if(verbose===true){
-        console.log("Rerouting: ",reroute_requested);
+        hookMessage(dltInterface,"Reroute requested",reroute_requested);
     }
 }
 
@@ -413,6 +431,14 @@ function gettext(arg)
     }
 }
 
+function hookMessage(dltInterface,subject,arg)
+{
+    if(dlt===true)
+        dltInterface.log_info_msg(subject+": "+arg);
+    else
+        console.log(subject+": "+arg);
+}
+
 //----------------- Management of the DBus messages -----------------
 
 function hookMethod(dltInterface,arg)
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index e50551c..7af9301 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -63,40 +63,58 @@ var radius=5000; //radius in m around the vehicle to search for the refill stati
 var maxResultListSize=50; //max size of elements to return as a result
 var default_category_name;
 
-var guidance_activated=false;
-var route_calculated=false;
-var reroute_requested=false;
-var location_input_activated=true;
+var guidance_activated;
+var route_calculated;
+var reroute_requested;
+var location_input_activated;
+var vehicle_located;
+var destination_defined;
 
-function setRouteCalculated(arg)
+function setDestinationDefined(dltInterface,arg)
+{
+    destination_defined=arg;
+    if(verbose===true){
+        hookMessage(dltInterface,"Destination defined",destination_defined);
+    }
+}
+
+function setVehicleLocated(dltInterface,arg)
+{
+    vehicle_located=arg;
+    if(verbose===true){
+        hookMessage(dltInterface,"Vehicle located",vehicle_located);
+    }
+}
+
+function setRouteCalculated(dltInterface,arg)
 {
     route_calculated=arg;
     if(verbose===true){
-        console.log("Routing: ",route_calculated);
+        hookMessage(dltInterface,"Route calculated",route_calculated);
     }
 }
 
-function setGuidanceActivated(arg)
+function setGuidanceActivated(dltInterface,arg)
 {
     guidance_activated=arg;
     if(verbose===true){
-        console.log(" Guidance: ",guidance_activated);
+        hookMessage(dltInterface,"Guidance activated",guidance_activated);
     }
 }
 
-function setLocationInputActivated(arg)
+function setLocationInputActivated(dltInterface,arg)
 {
     location_input_activated=arg;
     if(verbose===true){
-        console.log("Location input: ",location_input_activated);
+        hookMessage(dltInterface,"Location input activated",location_input_activated);
     }
 }
 
-function setRerouteRequested(arg)
+function setRerouteRequested(dltInterface,arg)
 {
     reroute_requested=arg;
     if(verbose===true){
-        console.log("Rerouting: ",reroute_requested);
+        hookMessage(dltInterface,"Reroute requested",reroute_requested);
     }
 }
 
@@ -412,6 +430,14 @@ function gettext(arg)
     }
 }
 
+function hookMessage(dltInterface,subject,arg)
+{
+    if(dlt===true)
+        dltInterface.log_info_msg(subject+": "+arg);
+    else
+        console.log(subject+": "+arg);
+}
+
 //----------------- Management of the DBus messages -----------------
 
 function hookMethod(dltInterface,arg)
diff --git a/src/hmi/qml/NavigationApp.qml b/src/hmi/qml/NavigationApp.qml
index dbb976b..d62c962 100644
--- a/src/hmi/qml/NavigationApp.qml
+++ b/src/hmi/qml/NavigationApp.qml
@@ -84,7 +84,8 @@ ApplicationWindow {
         //NB: settings are stored as strings, so it may need some rework for persistent data that are not strings (to be improved ?)
         Genivi.setlang(Settings.getValue("Locale/language"),Settings.getValue("Locale/country"),Settings.getValue("Locale/script"));
         Genivi.setDefaultPosition(Settings.getValue("DefaultPosition/latitude"),Settings.getValue("DefaultPosition/longitude"),Settings.getValue("DefaultPosition/altitude"));
-        Genivi.setDefaultAddress(Settings.getValue("DefaultAddress/country"),Settings.getValue("DefaultAddress/city"),Settings.getValue("DefaultAddress/street"),Settings.getValue("DefaultAddress/number"));
+        Genivi.setDefaultAddress(Settings.getValue("DefaultAddress/country"),Settings.getValue("DefaultAddress/city"),Settings.getValue("DefaultAddress/street"),Settings.getValue("DefaultAddress/number"));        
+        Genivi.preloadMode=true; //default address loaded
         Genivi.radius=Settings.getValue("Settings/radius");
         Genivi.maxResultListSize=Settings.getValue("Settings/maxResultListSize");
         Genivi.default_category_name=Settings.getValue("Settings/defaultCategoryName")
@@ -125,8 +126,16 @@ ApplicationWindow {
         var res2=Genivi.routing_CreateRoute(dbusIf,dltIf);
         Genivi.g_routing_handle[1]=res2[3];
 
+        //default settings
+        Genivi.setGuidanceActivated(dltIf,false);
+        Genivi.setRouteCalculated(dltIf,false);
+        Genivi.setRerouteRequested(dltIf,false);
+        Genivi.setVehicleLocated(dltIf,false);
+        Genivi.setDestinationDefined(dltIf,false);
+
         //launch the HMI
-        load("NavigationAppMain");
+        Genivi.hookMessage(dltIf,"Menu level",Genivi.entrybackheapsize);
+        load("NavigationAppBrowseMap");
 	}
 
     Component.onDestruction:  {
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index 6ef681b..7c63d39 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -36,10 +36,10 @@ import "../style-sheets/NavigationAppBrowseMapScroll-css.js" as StyleSheetScroll
 import "../style-sheets/NavigationAppBrowseMapSimulation-css.js" as StyleSheetSimulation
 import "../style-sheets/NavigationAppBrowseMapTop-css.js" as StyleSheetTop
 import "../style-sheets/NavigationAppBrowseMapManeuver-css.js" as StyleSheetManeuver
-import "../style-sheets/NavigationAppBrowseMapSettings-css.js" as StyleSheetSettings;
 import "../style-sheets/NavigationAppBrowseMapScale-css.js" as StyleSheetScale;
 import "../style-sheets/NavigationAppBrowseMapZoom-css.js" as StyleSheetZoom;
 import "../style-sheets/NavigationAppBrowseMapCompass-css.js" as StyleSheetCompass;
+import "../style-sheets/NavigationAppBrowseMapSettings-css.js" as StyleSheetSettings;
 
 
 import lbs.plugin.dbusif 1.0
@@ -50,7 +50,7 @@ NavigationAppHMIMenu {
     property string pagefile:"NavigationAppBrowseMap"
     next: scrollup
 	prev: menub
-	property bool north:false;
+    property int angle:0;
     property int speedValueSent: 0;
     property bool displayManeuvers:false; 
     property int currentZoomId;
@@ -74,7 +74,7 @@ NavigationAppHMIMenu {
         Genivi.hookSignal(dltIf,"guidanceStatusChanged");
         if(args[1]===Genivi.NAVIGATIONCORE_ACTIVE)
         {
-            Genivi.setGuidanceActivated(true);
+            Genivi.setGuidanceActivated(dltIf,true);
             showGuidance();
             showRoute();
             if (Genivi.simulationMode===true)
@@ -99,7 +99,7 @@ NavigationAppHMIMenu {
             else {
                 visible=false; //no route calculated
             }
-            Genivi.setGuidanceActivated(false);
+            Genivi.setGuidanceActivated(dltIf,false);
             //Guidance inactive, so inform the trip computer
             Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,0,0);
             maneuverIcon.source=StyleSheetGuidance.maneuverIcon[Constants.SOURCE]; //no icon by default
@@ -327,6 +327,42 @@ NavigationAppHMIMenu {
     // Map settings
     //------------------------------------------//
     Timer {
+        id:rotation_timer
+        repeat:true
+        triggeredOnStart: false
+        property bool clockwize;
+        property int increment:10;
+        property bool active;
+        onTriggered: {
+            if (active) {
+                if(clockwize)
+                {
+                    if(angle>=350) angle=0; else angle+=increment;
+                }else{
+                    if(angle<=0) angle=350; else angle-=increment;
+                }
+                set_angle(angle);
+                interval=50;
+                restart();
+                console.log(angle)
+            }
+        }
+    }
+
+    function rotation_start(clockwize)
+    {
+        rotation_timer.clockwize=clockwize;
+        rotation_timer.active=true;
+        rotation_timer.triggered();
+    }
+
+    function rotation_stop()
+    {
+        rotation_timer.active=false;
+        rotation_timer.stop();
+    }
+
+    Timer {
         id:camera_timer
         repeat:true
         triggeredOnStart:false
@@ -381,31 +417,9 @@ NavigationAppHMIMenu {
         Genivi.mapviewer_SetMapViewRotation(dbusIf,dltIf,angle);
     }
 
-    function toggleDayNight()
+    function showThreeDSettings()
     {
-        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf,dltIf);
-        if (res[1] == Genivi.MAPVIEWER_THEME_1) {
-            Genivi.mapviewer_SetMapViewTheme(dbusIf,dltIf,Genivi.MAPVIEWER_THEME_2);
-            daynight.text=Genivi.gettext("Day");
-        } else {
-            Genivi.mapviewer_SetMapViewTheme(dbusIf,dltIf,Genivi.MAPVIEWER_THEME_1);
-            daynight.text=Genivi.gettext("Night");
-        }
-    }
-
-    function updateDayNight()
-    {
-        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf,dltIf);
-        if (res[1] == Genivi.MAPVIEWER_THEME_1) {
-            daynight.text=Genivi.gettext("Night");
-        } else {
-            daynight.text=Genivi.gettext("Day");
-        }
-    }
-
-    function showMapSettings()
-    {
-        mapSettings.visible=true;
+        threeDSettings.visible=true;
         tiltText.visible=true;
         tiltp.visible=true;
         tiltp.disabled=false;
@@ -421,23 +435,12 @@ NavigationAppHMIMenu {
         distancep.disabled=false;
         distancem.visible=true;
         distancem.disabled=false;
-        north.visible=true;
-        north.disabled=false;
-        south.visible=true;
-        south.disabled=false;
-        east.visible=true;
-        east.disabled=false;
-        west.visible=true;
-        west.disabled=false;
-        exitSettings.visible=true;
-        exitSettings.disabled=false;
-        daynight.visible=true;
-        daynight.disabled=false;
     }
 
-    function hideMapSettings()
+    function hideThreeDSettings()
     {
-        mapSettings.visible=false;
+        camera_stop();
+        threeDSettings.visible=false;
         tiltText.visible=false;
         tiltp.visible=false;
         tiltp.disabled=true;
@@ -453,18 +456,6 @@ NavigationAppHMIMenu {
         distancep.disabled=true;
         distancem.visible=false;
         distancem.disabled=true;
-        north.visible=false;
-        north.disabled=true;
-        south.visible=false;
-        south.disabled=true;
-        east.visible=false;
-        east.disabled=true;
-        west.visible=false;
-        west.disabled=true;
-        exitSettings.visible=false;
-        exitSettings.disabled=true;
-        daynight.visible=false;
-        daynight.disabled=true;
     }
 
     //------------------------------------------//
@@ -625,9 +616,11 @@ NavigationAppHMIMenu {
                 Genivi.mapviewer_SetCameraHeadingTrackUp(dbusIf,dltIf);
                 Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_3D);
                 orientation.setState("B");
+                showThreeDSettings();
             } else{
                 Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_2D);
                 orientation.setState("N");
+                hideThreeDSettings();
             }
 		}
 	}
@@ -637,7 +630,6 @@ NavigationAppHMIMenu {
         if (exploration.status==0) {
             Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf, false);
             showScroll();
-            showSettings();
             exploration.setState("E");
         } else {
             if (exploration.status==1) {
@@ -651,8 +643,6 @@ NavigationAppHMIMenu {
                     }
                 }
                 hideScroll();
-                hideSettings();
-                hideMapSettings(); //in case of this panel has been launched by the user
                 exploration.setState("C");
             }
         }
@@ -829,6 +819,7 @@ NavigationAppHMIMenu {
 
     function showScroll()
     {
+        scroll.visible=true;
         scrollup.visible=true;
         scrollup.disabled=false;
         scrollleft.visible=true;
@@ -845,6 +836,7 @@ NavigationAppHMIMenu {
 
     function hideScroll()
     {
+        scroll.visible=false;
         scrollup.visible=false;
         scrollup.disabled=true;
         scrollleft.visible=false;
@@ -859,18 +851,41 @@ NavigationAppHMIMenu {
         rotateAntiClockwize.disabled=true;
     }
 
-    function showSettings()
+    function showMapSettings()
     {
-        settings.visible=true;
-        settings.disabled=false;
+        mapSettings.visible=true;
+        restartText.visible=true;
+        restartGuidance.visible=true;
+        restartGuidance.disabled=false;
+        cancelText.visible=true;
+        cancel.visible=true;
+        cancel.disabled=false;
+        exitSettings.visible=true;
+        exitSettings.disabled=false;
+        location_input.visible=true;
+        location_input.disabled=false;
+        poi.visible=true;
+        poi.disabled=false;
     }
 
-    function hideSettings()
+    function hideMapSettings()
     {
-        settings.visible=false;
-        settings.disabled=true;
+        mapSettings.visible=false;
+        restartText.visible=false;
+        restartGuidance.visible=false;
+        restartGuidance.disabled=true;
+        cancelText.visible=false;
+        cancel.visible=false;
+        cancel.disabled=true;
+        exitSettings.visible=false;
+        exitSettings.disabled=true;
+        location_input.visible=false;
+        location_input.disabled=true;
+        poi.visible=false;
+        poi.disabled=true;
     }
 
+
     //------------------------------------------//
     // Menu elements
     //------------------------------------------//
@@ -911,7 +926,7 @@ NavigationAppHMIMenu {
                     visible:false
                     onClicked: {
                         disconnectSignals();
-                        entryMenu("NavigationAppPOI",menu);
+                        entryMenu(dltIf,"NavigationAppPOI",menu);
                                 }
                         }
 
@@ -950,8 +965,10 @@ NavigationAppHMIMenu {
                     id:menub; text:Genivi.gettext("Back"); next:orientation; prev:settings;
                     onClicked: {
                         disconnectSignals();
-                        Genivi.preloadMode=true;
-                        leaveMenu();
+                        if(Genivi.entrybackheapsize)
+                            leaveMenu(dltIf);
+                        else
+                            pageOpen(dltIf,"NavigationAppMain");
                     }
                 }
 
@@ -963,14 +980,11 @@ NavigationAppHMIMenu {
                 }
 
                 StdButton {
-                    source:StyleSheetBottom.mapsettings[Constants.SOURCE]; x:StyleSheetBottom.mapsettings[Constants.X]; y:StyleSheetBottom.mapsettings[Constants.Y]; width:StyleSheetBottom.mapsettings[Constants.WIDTH]; height:StyleSheetBottom.mapsettings[Constants.HEIGHT];
-                    id:settings;  next:menub; prev:zoomout;
+                    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;
                     onClicked: {
-                        if(mapSettings.visible===true) {
-                            hideMapSettings();
-                        } else {
-                            showMapSettings();
-                        }
+                        disconnectSignals();
+                        entryMenu(dltIf,"NavigationAppSettings",menu);
                     }
                 }
 
@@ -978,11 +992,28 @@ NavigationAppHMIMenu {
                     source:StyleSheetBottom.calculate_curr[Constants.SOURCE]; x:StyleSheetBottom.calculate_curr[Constants.X]; y:StyleSheetBottom.calculate_curr[Constants.Y]; width:StyleSheetBottom.calculate_curr[Constants.WIDTH]; height:StyleSheetBottom.calculate_curr[Constants.HEIGHT];
                     id:calculate_curr;
                     onClicked: {
-                        //todo something here
+                        if(Genivi.data['display_on_map']==='show_route')
+                        {
+                            // launch the guidance now !
+                            Genivi.guidance_StartGuidance(dbusIf,dltIf,Genivi.routing_handle());
+
+                        }else{
+                            if(Genivi.data['display_on_map']==='show_position')
+                            {
+                              // launch a route calculation now !
+                                disconnectSignals();
+                                Genivi.data['destination']=Genivi.data['position'];
+                                Genivi.setRerouteRequested(dltIf,true);
+                                Genivi.guidance_StopGuidance(dbusIf,dltIf);
+                                entryMenu(dltIf,"NavigationAppSearch",menu);
+                            }
+                            else{
+                                if(mapSettings.visible===true)
+                                    hideMapSettings();
+                                else showMapSettings();
+                            }
+                        }
                     }
-                    disabled:!(Genivi.route_calculated && !Genivi.guidance_activated);
-                    visible:(Genivi.route_calculated && !Genivi.guidance_activated);
-                    next:menub; prev:settings
                 }
 
                 StdButton {
@@ -991,18 +1022,18 @@ NavigationAppHMIMenu {
                     source:StyleSheetBottom.gobackCurrent[Constants.SOURCE]; //todo call get status
                     property int status: 0;
                     function setState(name)
-                    { //the icon displayed is the one of the next state
+                    { //the icon displayed is the one of the current state
                         if (name=="E")
                         {
                             status=1;
-                            source=StyleSheetBottom.gobackCurrent[Constants.SOURCE];
+                            source=StyleSheetBottom.mapExploration[Constants.SOURCE];
                         }
                         else
                         {
                             if (name=="C")
                             {
                                 status=0;
-                                source=StyleSheetBottom.mapExploration[Constants.SOURCE];
+                                source=StyleSheetBottom.gobackCurrent[Constants.SOURCE];
                             }
                         }
                     }
@@ -1033,7 +1064,6 @@ NavigationAppHMIMenu {
                         if(Genivi.guidance_activated)
                             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];
@@ -1166,15 +1196,83 @@ NavigationAppHMIMenu {
                 StdButton {
                     source:StyleSheetScroll.rotateClockwize[Constants.SOURCE]; x:StyleSheetScroll.rotateClockwize[Constants.X]; y:StyleSheetScroll.rotateClockwize[Constants.Y]; width:StyleSheetScroll.rotateClockwize[Constants.WIDTH]; height:StyleSheetScroll.rotateClockwize[Constants.HEIGHT];
                     id:rotateClockwize;
-                    onClicked: {}
+                    onPressed: {rotation_start(false);}
+                    onReleased: {rotation_stop();}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.rotateAntiClockwize[Constants.SOURCE]; x:StyleSheetScroll.rotateAntiClockwize[Constants.X]; y:StyleSheetScroll.rotateAntiClockwize[Constants.Y]; width:StyleSheetScroll.rotateAntiClockwize[Constants.WIDTH]; height:StyleSheetScroll.rotateAntiClockwize[Constants.HEIGHT];
                     id:rotateAntiClockwize;
-                    onClicked: {}
+                    onPressed: {rotation_start(true);}
+                    onReleased: {rotation_stop();}
+                }
+
+                BorderImage {
+                    id: threeDSettings
+                    source:StyleSheetScroll.threeDSettings[Constants.SOURCE]; x:StyleSheetScroll.threeDSettings[Constants.X]; y:StyleSheetScroll.threeDSettings[Constants.Y]; width:StyleSheetScroll.threeDSettings[Constants.WIDTH]; height:StyleSheetScroll.threeDSettings[Constants.HEIGHT];
+                    border.left: 0; border.top: 0
+                    border.right: 0; border.bottom: 0
+                }
+
+                Text {
+                    x:StyleSheetScroll.tiltText[StyleSheetScroll.X]; y:StyleSheetScroll.tiltText[StyleSheetScroll.Y]; width:StyleSheetScroll.tiltText[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.tiltText[StyleSheetScroll.HEIGHT];color:StyleSheetScroll.tiltText[StyleSheetScroll.TEXTCOLOR];styleColor:StyleSheetScroll.tiltText[StyleSheetScroll.STYLECOLOR]; font.pixelSize:StyleSheetScroll.tiltText[StyleSheetScroll.PIXELSIZE];
+                    id:tiltText;
+                    style: Text.Sunken;
+                    smooth: true
+                    text: Genivi.gettext("CameraTilt")
+                     }
+                StdButton {
+                    source:StyleSheetScroll.tiltp[Constants.SOURCE]; x:StyleSheetScroll.tiltp[StyleSheetScroll.X]; y:StyleSheetScroll.tiltp[StyleSheetScroll.Y]; width:StyleSheetScroll.tiltp[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.tiltp[StyleSheetScroll.HEIGHT];
+                           id:tiltp;
+                        onPressed: {camera_start_clamp("CameraTiltAngle",-10,0);}
+                        onReleased: {camera_stop();}
+                }
+                StdButton {
+                    source:StyleSheetScroll.tiltm[Constants.SOURCE]; x:StyleSheetScroll.tiltm[StyleSheetScroll.X]; y:StyleSheetScroll.tiltm[StyleSheetScroll.Y]; width:StyleSheetScroll.tiltm[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.tiltm[StyleSheetScroll.HEIGHT];
+                    id:tiltm;  next:heightp; prev:tiltp;
+                    onPressed: {camera_start_clamp("CameraTiltAngle",10,90);}
+                    onReleased: {camera_stop();}
+                }
+
+                Text {
+                    x:StyleSheetScroll.heightText[StyleSheetScroll.X]; y:StyleSheetScroll.heightText[StyleSheetScroll.Y]; width:StyleSheetScroll.heightText[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.heightText[StyleSheetScroll.HEIGHT];color:StyleSheetScroll.heightText[StyleSheetScroll.TEXTCOLOR];styleColor:StyleSheetScroll.heightText[StyleSheetScroll.STYLECOLOR]; font.pixelSize:StyleSheetScroll.heightText[StyleSheetScroll.PIXELSIZE];
+                    id:heightText;
+                    style: Text.Sunken;
+                    smooth: true
+                    text: Genivi.gettext("CameraHeight")
+                     }
+                StdButton {
+                    source:StyleSheetScroll.heightp[Constants.SOURCE]; x:StyleSheetScroll.heightp[StyleSheetScroll.X]; y:StyleSheetScroll.heightp[StyleSheetScroll.Y]; width:StyleSheetScroll.heightp[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.heightp[StyleSheetScroll.HEIGHT];
+                    id:heightp; next:heightm; prev:tiltm;
+                    onPressed: {camera_start("CameraHeight",10);}
+                    onReleased: {camera_stop();}
+                }
+                StdButton {
+                    source:StyleSheetScroll.heightm[Constants.SOURCE]; x:StyleSheetScroll.heightm[StyleSheetScroll.X]; y:StyleSheetScroll.heightm[StyleSheetScroll.Y]; width:StyleSheetScroll.heightm[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.heightm[StyleSheetScroll.HEIGHT];
+                    id:heightm;  next:distancep; prev:heightp;
+                    onPressed: {camera_start("CameraHeight",-10);}
+                    onReleased: {camera_stop();}
                 }
 
+                Text {
+                    x:StyleSheetScroll.distanceText[StyleSheetScroll.X]; y:StyleSheetScroll.distanceText[StyleSheetScroll.Y]; width:StyleSheetScroll.distanceText[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.distanceText[StyleSheetScroll.HEIGHT];color:StyleSheetScroll.distanceText[StyleSheetScroll.TEXTCOLOR];styleColor:StyleSheetScroll.distanceText[StyleSheetScroll.STYLECOLOR]; font.pixelSize:StyleSheetScroll.distanceText[StyleSheetScroll.PIXELSIZE];
+                    id:distanceText;
+                    style: Text.Sunken;
+                    smooth: true
+                    text: Genivi.gettext("CameraDistance")
+                     }
+                StdButton {
+                    source:StyleSheetScroll.distancep[Constants.SOURCE]; x:StyleSheetScroll.distancep[StyleSheetScroll.X]; y:StyleSheetScroll.distancep[StyleSheetScroll.Y]; width:StyleSheetScroll.distancep[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.distancep[StyleSheetScroll.HEIGHT];
+                    id:distancep;  next:distancem; prev:heightm;
+                    onPressed: {camera_start("CameraDistanceFromTargetPoint",10);}
+                    onReleased: {camera_stop();}
+                }
+                StdButton {
+                    source:StyleSheetScroll.distancem[Constants.SOURCE]; x:StyleSheetScroll.distancem[StyleSheetScroll.X]; y:StyleSheetScroll.distancem[StyleSheetScroll.Y]; width:StyleSheetScroll.distancem[StyleSheetScroll.WIDTH]; height:StyleSheetScroll.distancem[StyleSheetScroll.HEIGHT];
+                           id:distancem;
+                        onPressed: {camera_start("CameraDistanceFromTargetPoint",-10);}
+                        onReleased: {camera_stop();}
+                }
             }
         }
 
@@ -1371,8 +1469,8 @@ NavigationAppHMIMenu {
             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]
+            x: StyleSheetMap.maneuver_area[Constants.X]
+            y: StyleSheetMap.maneuver_area[Constants.Y]
             NavigationAppHMIBgImage {
                 id: maneuver
                 opacity: 0.8
@@ -1381,7 +1479,7 @@ NavigationAppHMIMenu {
                 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;
+                    id:exit;
                     onClicked: { hideManeuversList(); }
                 }
                 Component {
@@ -1399,128 +1497,12 @@ NavigationAppHMIMenu {
                     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
                 }
             }
         }
 
         Rectangle {
             color:"transparent"
-            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]
-            NavigationAppHMIBgImage {
-                id: mapSettings
-                opacity: 0.8
-                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");
-                     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:exitSettings;  next:north; prev:west;
-                     onClicked: {
-                         camera_stop();
-                         hideMapSettings();
-                     }
-                 }
-                 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");
-                     onClicked: {
-                         toggleDayNight();
-                     }
-                 }
-             }
-        }
-
-        Rectangle {
-            color:"transparent"
             width: StyleSheetScale.navigation_app_browse_map_scale_background[Constants.WIDTH]
             height: StyleSheetScale.navigation_app_browse_map_scale_background[Constants.HEIGHT]
             x: StyleSheetMap.scale_area[Constants.X]
@@ -1562,11 +1544,80 @@ NavigationAppHMIMenu {
             }
         }
 
+        Rectangle {
+            color:"transparent"
+            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]
+            NavigationAppHMIBgImage {
+                id: mapSettings
+                opacity: 0.8
+                image:StyleSheetSettings.navigation_app_browse_map_settings_background[Constants.SOURCE];
+                anchors { fill: parent; topMargin: parent.headlineHeight}
+                 Text {
+                     x:StyleSheetSettings.restartText[StyleSheetSettings.X]; y:StyleSheetSettings.restartText[StyleSheetSettings.Y]; width:StyleSheetSettings.restartText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.restartText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.restartText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.restartText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.restartText[StyleSheetSettings.PIXELSIZE];
+                     id:restartText;
+                     style: Text.Sunken;
+                     smooth: true
+                     text: Genivi.gettext("Restart")
+                      }
+                 StdButton {
+                     source:StyleSheetSettings.restart[Constants.SOURCE]; x:StyleSheetSettings.restart[StyleSheetSettings.X]; y:StyleSheetSettings.restart[StyleSheetSettings.Y]; width:StyleSheetSettings.restart[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.restart[StyleSheetSettings.HEIGHT];
+                     id:restartGuidance;
+                     disabled: (Genivi.guidance_activated || !Genivi.route_calculated)
+                     onPressed: {
+                         //restart guidance
+                         Genivi.guidance_StartGuidance(dbusIf,dltIf,Genivi.routing_handle());
+                     }
+                 }
+                 Text {
+                     x:StyleSheetSettings.cancelText[StyleSheetSettings.X]; y:StyleSheetSettings.cancelText[StyleSheetSettings.Y]; width:StyleSheetSettings.cancelText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.cancelText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.cancelText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.cancelText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.cancelText[StyleSheetSettings.PIXELSIZE];
+                     id:cancelText;
+                     style: Text.Sunken;
+                     smooth: true
+                     text: Genivi.gettext("Cancel")
+                      }
+                 StdButton {
+                     source:StyleSheetSettings.cancel[Constants.SOURCE]; x:StyleSheetSettings.cancel[StyleSheetSettings.X]; y:StyleSheetSettings.cancel[StyleSheetSettings.Y]; width:StyleSheetSettings.cancel[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.cancel[StyleSheetSettings.HEIGHT];
+                     id:cancel;
+                     disabled: !(Genivi.guidance_activated);
+                     onPressed: {
+                        //stop guidance
+                         Genivi.guidance_StopGuidance(dbusIf,dltIf);
+                     }
+                 }
+                 StdButton {
+                     source:StyleSheetSettings.location_input[Constants.SOURCE]; x:StyleSheetSettings.location_input[StyleSheetSettings.X]; y:StyleSheetSettings.location_input[StyleSheetSettings.Y]; width:StyleSheetSettings.location_input[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.location_input[StyleSheetSettings.HEIGHT];
+                     id:location_input;
+                     onPressed: {
+                         disconnectSignals();
+                         Genivi.setLocationInputActivated(dltIf,true);
+                         entryMenu(dltIf,"NavigationAppSearch",menu);
+                     }
+                 }
+                 StdButton {
+                     source:StyleSheetSettings.poi[Constants.SOURCE]; x:StyleSheetSettings.poi[StyleSheetSettings.X]; y:StyleSheetSettings.poi[StyleSheetSettings.Y]; width:StyleSheetSettings.poi[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.poi[StyleSheetSettings.HEIGHT];
+                     id:poi;
+                     onPressed: {
+                         disconnectSignals();
+                         Genivi.setLocationInputActivated(dltIf,false);
+                         entryMenu(dltIf,"NavigationAppPOI",menu);
+                     }
+                 }
+                 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:exitSettings;
+                     onPressed: {
+                        hideMapSettings();
+                     }
+                 }
+            }
+        }
     }
 
     Component.onCompleted: {
         connectSignals();
-        hideMapSettings();
 
         if (Genivi.data['display_on_map']==='show_route') {
             //display the route when it has been calculated
@@ -1629,10 +1680,10 @@ NavigationAppHMIMenu {
             }
         }
 
+        hideMapSettings();
         hideScroll();
-        hideSettings();
+        hideThreeDSettings();
         exploration.setState("C");
         showZoom();
-        updateDayNight();
 	}
 }
diff --git a/src/hmi/qml/NavigationAppMain.qml b/src/hmi/qml/NavigationAppMain.qml
index 35bc2cb..5fb8fc5 100644
--- a/src/hmi/qml/NavigationAppMain.qml
+++ b/src/hmi/qml/NavigationAppMain.qml
@@ -35,10 +35,7 @@ import lbs.plugin.dltif 1.0
 NavigationAppHMIMenu {
 	id: menu
     property string pagefile:"NavigationAppMain"
-    property bool vehicleLocated: false
     pageBack: Genivi.entryback[Genivi.entrybackheapsize]
-    next: navigation
-    prev: quit
 
     DLTIf {
         id:dltIf;
@@ -89,8 +86,8 @@ NavigationAppHMIMenu {
                 }
             }
         }
-        if ((oklat == 1) && (oklong == 1)) {vehicleLocated=true;}
-        else {vehicleLocated=false;}
+        if ((oklat == 1) && (oklong == 1)) {Genivi.setVehicleLocated(dltIf,true);}
+        else {Genivi.setVehicleLocated(dltIf,false);}
         mapview.update();
     }
 
@@ -109,13 +106,28 @@ NavigationAppHMIMenu {
             smooth: true
             text: Genivi.gettext("Navigation")
              }
-
         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;  next:mapview; prev:quit; onClicked: {
-                Genivi.preloadMode=true;
-                Genivi.setRouteCalculated(false);
-                entryMenu("NavigationAppSearch",menu);
+            id:navigation;
+            onClicked: {
+                Genivi.setLocationInputActivated(dltIf,true);
+                entryMenu(dltIf,"NavigationAppSearch",menu);
+            }
+        }
+
+        Text {
+            x:StyleSheet.poiText[Constants.X]; y:StyleSheet.poiText[Constants.Y]; width:StyleSheet.poiText[Constants.WIDTH]; height:StyleSheet.poiText[Constants.HEIGHT];color:StyleSheet.poiText[Constants.TEXTCOLOR];styleColor:StyleSheet.poiText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.poiText[Constants.PIXELSIZE];
+            id:poiText;
+            style: Text.Sunken;
+            smooth: true
+            text: Genivi.gettext("Poi")
+             }
+        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;
+            onClicked: {
+                Genivi.setLocationInputActivated(dltIf,false);
+                entryMenu(dltIf,"NavigationAppPOI",menu);
             }
         }
 
@@ -126,44 +138,29 @@ NavigationAppHMIMenu {
             smooth: true
             text: Genivi.gettext("Mapview")
              }
-
         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;  next:poi; prev:navigation;
-            disabled: !(vehicleLocated|Genivi.showroom)
+            id:mapview;
+            disabled: !(Genivi.vehicle_located |Genivi.showroom)
             onClicked: {
                 Genivi.data['display_on_map']='show_current_position';
-                entryMenu("NavigationAppBrowseMap",menu);
+                Genivi.hookMessage(dltIf,'display_on_map',Genivi.data['display_on_map']);
+                entryMenu(dltIf,"NavigationAppBrowseMap",menu);
 			}
 		}
 
         Text {
-            x:StyleSheet.poiText[Constants.X]; y:StyleSheet.poiText[Constants.Y]; width:StyleSheet.poiText[Constants.WIDTH]; height:StyleSheet.poiText[Constants.HEIGHT];color:StyleSheet.poiText[Constants.TEXTCOLOR];styleColor:StyleSheet.poiText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.poiText[Constants.PIXELSIZE];
-            id:poiText;
-            style: Text.Sunken;
-            smooth: true
-            text: Genivi.gettext("Poi")
-             }
-
-        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;  next:trip; prev:mapview; onClicked: {
-                entryMenu("NavigationAppPOI",menu);
-            }
-        }
-
-        Text {
             x:StyleSheet.tripText[Constants.X]; y:StyleSheet.tripText[Constants.Y]; width:StyleSheet.tripText[Constants.WIDTH]; height:StyleSheet.tripText[Constants.HEIGHT];color:StyleSheet.tripText[Constants.TEXTCOLOR];styleColor:StyleSheet.tripText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.tripText[Constants.PIXELSIZE];
             id:tripText;
             style: Text.Sunken;
             smooth: true
             text: Genivi.gettext("Trip")
              }
-
         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;  next:settings; prev:poi;onClicked: {
-                entryMenu("NavigationAppTripComputer",menu);
+            id:trip;
+            onClicked: {
+                entryMenu(dltIf,"NavigationAppTripComputer",menu);
             }
         }
 
@@ -174,20 +171,18 @@ NavigationAppHMIMenu {
             smooth: true
             text: Genivi.gettext("Configuration")
              }
-
         StdButton {
             source:StyleSheet.select_settings[Constants.SOURCE]; x:StyleSheet.select_settings[Constants.X]; y:StyleSheet.select_settings[Constants.Y]; width:StyleSheet.select_settings[Constants.WIDTH]; height:StyleSheet.select_settings[Constants.HEIGHT];
-            id:settings;  next:quit; prev:trip;
+            id:settings;
             onClicked: {
                 disconnectSignals();
-                Genivi.preloadMode=true; //for the next call of this menu
-                entryMenu("NavigationAppSettings",menu);
+                entryMenu(dltIf,"NavigationAppSettings",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");  next:navigation; prev:trip;
+            id:quit; text: Genivi.gettext("Quit");
             onClicked:{
                 disconnectSignals();
                 Qt.quit(); //for the time being quit
@@ -209,6 +204,9 @@ NavigationAppHMIMenu {
         }
 
         updateCurrentPosition();
+
+        //log status
+        Genivi.hookMessage(dltIf,'display_on_map',Genivi.data['display_on_map']);
     }
 
 }
diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml
index e05ec99..471342a 100644
--- a/src/hmi/qml/NavigationAppPOI.qml
+++ b/src/hmi/qml/NavigationAppPOI.qml
@@ -94,7 +94,6 @@ NavigationAppHMIMenu {
         }
         if ((oklat == 1) && (oklong == 1)) {vehicleLocated=true;}
         else {vehicleLocated=false;}
-        select_search.update();
     }
 
     function displayCategoryList()
@@ -115,6 +114,8 @@ NavigationAppHMIMenu {
         var latitude=0;
         var longitude=0;
 
+        Genivi.setDestinationDefined(dltIf,false);
+
         if(Genivi.showroom) {
             latitude=Genivi.data['default_position']['lat'];
             longitude=Genivi.data['default_position']['lon'];
@@ -147,6 +148,7 @@ NavigationAppHMIMenu {
         searchResultNumber.visible=true;
         if(res[3]<Genivi.maxResultListSize)
             searchResultNumber.text=res[3];
+        else searchResultNumber.text=">"+Genivi.maxResultListSize;
         model.clear();
         if(res[3]===0)
         {
@@ -179,8 +181,10 @@ NavigationAppHMIMenu {
                 model.append({"name":poi_data.name,"number":id});
             }
         }
-        if(res[3]===1)
+        if(res[3]===1){
+            Genivi.setDestinationDefined(dltIf,true);
             selectPoi(0);
+        }
     }
 
     function selectPoi(index)
@@ -261,13 +265,11 @@ NavigationAppHMIMenu {
             id: categoryValue
             globaldata: 'categoryValue'
             textfocus: true
-            next: select_search
-            prev: back
             onLeave:{}
         }
         StdButton {
             source:StyleSheet.poiKeyboard[Constants.SOURCE]; x:StyleSheet.poiKeyboard[Constants.X]; y:StyleSheet.poiKeyboard[Constants.Y]; width:StyleSheet.poiKeyboard[Constants.WIDTH]; height:StyleSheet.poiKeyboard[Constants.HEIGHT];
-            id:poiKeyboard; disabled:false; next:select_search; prev:back;
+            id:poiKeyboard; disabled:false;
             onClicked: {
                 keyboardArea.destination=poiValue;
                 poiValue.text="";
@@ -287,8 +289,6 @@ NavigationAppHMIMenu {
             id: poiValue
             globaldata: 'poiValue'
             textfocus: true
-            next: select_search
-            prev: back
             onLeave:{}
         }
 
@@ -340,14 +340,14 @@ NavigationAppHMIMenu {
 			property real selectedEntry
 			id:view
             delegate: searchResultList
-            next:select_search
-			prev:back
 			onSelected:{
                 if(keyboardArea.destination===poiValue)
                 {
                     if (what) {
+                        Genivi.setDestinationDefined(dltIf,true);
                         selectPoi(what.index);
                     } else {
+                        Genivi.setDestinationDefined(dltIf,false);
                         Genivi.poi_id=null;
                         poiName.visible=false;
                         selectedValue.text="Lat:\nLon:\nDist:\n";
@@ -368,6 +368,7 @@ NavigationAppHMIMenu {
                        poiFrame.visible=true;
                        categoryFrame.visible=false;
                        view.model.clear();
+                       searchPois();
                    } else {
                        keyboardArea.destination.text=""
                    }
@@ -383,8 +384,6 @@ NavigationAppHMIMenu {
             destination: poiValue;
             firstLayout: Genivi.kbdFirstLayout;
             secondLayout: Genivi.kbdSecondLayout;
-            next: select_search;
-            prev: poiKeyboard;
             onKeypress: {
                 clearSearch();
                 searchPois();
@@ -392,40 +391,38 @@ NavigationAppHMIMenu {
         }
 
         StdButton {
-            source:StyleSheet.select_search[Constants.SOURCE]; x:StyleSheet.select_search[Constants.X]; y:StyleSheet.select_search[Constants.Y]; width:StyleSheet.select_search[Constants.WIDTH]; height:StyleSheet.select_search[Constants.HEIGHT];
-            id:select_search
-            disabled:!(vehicleLocated || Genivi.showroom );
+            source:StyleSheet.location_input[Constants.SOURCE]; x:StyleSheet.location_input[Constants.X]; y:StyleSheet.location_input[Constants.Y]; width:StyleSheet.location_input[Constants.WIDTH]; height:StyleSheet.location_input[Constants.HEIGHT];
+            id:location_input;
             onClicked: {
-                clearSearch();
-                searchPois();
-			}
-		}
+                disconnectSignals();
+                Genivi.setLocationInputActivated(dltIf,true);
+                pageOpen(dltIf,"NavigationAppSearch");
+            }
+        }
 		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;            
             disabled:true;
-            next:select_display_on_map; prev:select_search
 			onClicked: {
                 disconnectSignals();
                 Genivi.data['destination']=Genivi.poi_data[Genivi.poi_id];
-                Genivi.setLocationInputActivated(false);
-                Genivi.setRerouteRequested(true);
+                Genivi.setRerouteRequested(dltIf,true);
                 Genivi.guidance_StopGuidance(dbusIf,dltIf);
-                pageOpen("NavigationAppSearch");
+                pageOpen(dltIf,"NavigationAppSearch");
 			}
 		}
         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;           
-            disabled:true;
-            next:back; prev:select_reroute
+            disabled:(!(Genivi.destination_defined) || (Genivi.route_calculated));
 			onClicked: {
                 disconnectSignals();
                 var poi_data=Genivi.poi_data[Genivi.poi_id];
                 Genivi.data['position']['lat']=poi_data.lat;
                 Genivi.data['position']['lon']=poi_data.lon;
                 Genivi.data['display_on_map']='show_position';
-                entryMenu("NavigationAppBrowseMap",menu);
+                Genivi.hookMessage(dltIf,'display_on_map',Genivi.data['display_on_map']);
+                entryMenu(dltIf,"NavigationAppBrowseMap",menu);
             }
 		}
         StdButton {
@@ -434,19 +431,17 @@ NavigationAppHMIMenu {
             disabled: false;
             onClicked: {
                 disconnectSignals();
-                entryMenu("NavigationAppSettings",menu);
+                entryMenu(dltIf,"NavigationAppSettings",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"); 
-			disabled:false; 
-            next:select_search; prev:select_display_on_map;
             onClicked: {
                 disconnectSignals();
-                Genivi.preloadMode=true;
-                leaveMenu();
+                Genivi.guidance_StopGuidance(dbusIf,dltIf);
+                leaveMenu(dltIf);
             }
 		}	
 	}
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index 5e840cc..8171103 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -80,7 +80,7 @@ NavigationAppHMIMenu {
         Genivi.hookSignal(dltIf,"guidanceStatusChanged");
         if(args[1]===Genivi.NAVIGATIONCORE_ACTIVE)
         {
-            Genivi.setGuidanceActivated(true);
+            Genivi.setGuidanceActivated(dltIf,true);
             guidanceActive();
             //Guidance active, so inform the trip computer (refresh)
             Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,1,50);
@@ -88,8 +88,9 @@ NavigationAppHMIMenu {
                 //Enter the map browser menu
                 disconnectSignals();
                 Genivi.data['display_on_map']='show_current_position';
+                Genivi.hookMessage(dltIf,'display_on_map',Genivi.data['display_on_map']);
                 Genivi.data["show_route_handle"]=Genivi.routing_handle();
-                entryMenu("NavigationAppBrowseMap",menu);
+                entryMenu(dltIf,"NavigationAppBrowseMap",menu);
             }else{
                 showGuidance();
                 delay(delayToGetManeuverList, function() {
@@ -98,7 +99,7 @@ NavigationAppHMIMenu {
             }
 
         } else {
-            Genivi.setGuidanceActivated(false);
+            Genivi.setGuidanceActivated(dltIf,false);
             guidanceInactive();
             hideGuidance();
             //Guidance inactive, so inform the trip computer
@@ -175,7 +176,7 @@ NavigationAppHMIMenu {
                             else
                             {
                                 Genivi.preloadMode=false;
-                                console.log("Error when load a preloaded address");
+                                Genivi.hookMessage(dltIf,"Error","Error when load a preloaded address");
                             }
                             Genivi.locationinput_DeleteLocationInput(dbusIf,dltIf); //clear the handle
                             Genivi.g_locationinput_handle[1]=0;
@@ -315,7 +316,7 @@ NavigationAppHMIMenu {
     { //routeHandle 1, unfullfilledPreferences 3
         Genivi.hookSignal(dltIf,"routeCalculationSuccessful");
 
-        Genivi.setRouteCalculated(true);
+        Genivi.setRouteCalculated(dltIf,true);
         getRouteOverview();
 
         // Give the route handle to the FSA
@@ -335,7 +336,7 @@ NavigationAppHMIMenu {
         Genivi.hookSignal(dltIf,"routeCalculationFailed");
 
         statusValue.text=Genivi.gettext("CalculatedRouteFailed");
-        Genivi.setRouteCalculated(false);
+        Genivi.setRouteCalculated(dltIf,false);
         // Tell the FSA that there's no route available
         Genivi.fuelstopadvisor_ReleaseRouteHandle(dbusIf,dltIf,Genivi.g_routing_handle);
     }
@@ -345,7 +346,7 @@ NavigationAppHMIMenu {
     {
         Genivi.hookSignal(dltIf,"routeCalculationProgressUpdate");
         statusValue.text=Genivi.gettext("CalculatedRouteInProgress");
-        Genivi.setRouteCalculated(false);
+        Genivi.setRouteCalculated(dltIf,false);
     }
 
     property Item spellResultSignal;
@@ -635,7 +636,7 @@ NavigationAppHMIMenu {
     function initKeyboard()
     {
         // when keyboard is activated, route is reset
-        Genivi.setRouteCalculated(false);
+        Genivi.setRouteCalculated(dltIf,false);
         hideRoute();
         hideGuidance();
         listArea.forceActiveFocus();
@@ -809,7 +810,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;
+            id:countryKeyboard; disabled:false;
             onClicked: {
                 countryValue.callEntry();
                 cityValue.text=""
@@ -825,8 +826,6 @@ NavigationAppHMIMenu {
             criterion: Genivi.NAVIGATIONCORE_COUNTRY
             globaldata: 'countryValue'
             textfocus: true
-            next: cityValue
-            prev: back
             onLeave:{}
         }
         Text {
@@ -838,7 +837,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;
+            id:cityKeyboard; disabled:false;
             onClicked: {
                 cityValue.callEntry();
                 streetValue.text=""
@@ -852,8 +851,6 @@ NavigationAppHMIMenu {
             id:cityValue
             criterion: Genivi.NAVIGATIONCORE_CITY
             globaldata: 'cityValue'
-            next:streetValue
-            prev:countryValue
             disabled: true
             onLeave:{}
         }
@@ -866,7 +863,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;
+            id:streetKeyboard; disabled:false;
             onClicked: {
                 streetValue.callEntry();
                 numberValue.text=""
@@ -879,8 +876,6 @@ NavigationAppHMIMenu {
             id:streetValue
             criterion: Genivi.NAVIGATIONCORE_STREET
             globaldata: 'streetValue'
-            next: numberValue
-            prev: cityValue
             disabled: true
             onLeave:{}
         }
@@ -893,7 +888,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;
+            id:numberKeyboard; disabled:false;
             onClicked: {
                 numberValue.callEntry();
                 initKeyboard();
@@ -905,8 +900,6 @@ NavigationAppHMIMenu {
             id:numberValue
             criterion: Genivi.NAVIGATIONCORE_HOUSENUMBER
             globaldata: 'numberValue'
-            next: countryValue
-            prev: streetValue
             disabled: true
             onLeave:{}
         }
@@ -973,24 +966,26 @@ 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
-            disabled:true; next:back; prev:back
+            disabled:true;
             visible: false;
             onClicked: {
                 disconnectSignals();
                 if(Genivi.guidance_activated){
                     Genivi.data['display_on_map']='show_current_position';
+                    Genivi.hookMessage(dltIf,'display_on_map','show_current_position');
                     Genivi.data["show_route_handle"]=Genivi.routing_handle();
                 }else{
                     Genivi.data['display_on_map']='show_route';
+                    Genivi.hookMessage(dltIf,'display_on_map',Genivi.data['display_on_map']);
                     Genivi.data['show_route_handle']=Genivi.routing_handle();
                     Genivi.data['zoom_route_handle']=Genivi.routing_handle();
                 }
-                entryMenu("NavigationAppBrowseMap",menu);
+                entryMenu(dltIf,"NavigationAppBrowseMap",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"); disabled:true; next:guidance_stop; prev:show_route_on_map
+            id:guidance_start; text: Genivi.gettext("On"); disabled:true;
             visible: false;
             onClicked: {
                 Genivi.guidance_StartGuidance(dbusIf,dltIf,Genivi.routing_handle());
@@ -998,7 +993,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"); disabled:true; next:show_route_on_map; prev:guidance_start
+            id:guidance_stop;text: Genivi.gettext("Off"); disabled:true;
             visible: false;
             onClicked: {
                 Genivi.guidance_StopGuidance(dbusIf,dltIf);
@@ -1034,8 +1029,6 @@ NavigationAppHMIMenu {
             firstLayout: Genivi.kbdFirstLayout;
             secondLayout: Genivi.kbdSecondLayout;
             shiftlevel: Genivi.kbdFirstLayout;
-            next: listArea;
-            prev: numberKeyboard;
             onKeypress: {  spell(what); }
         }
         // list of items
@@ -1056,8 +1049,6 @@ NavigationAppHMIMenu {
             id:listArea
             visible: false;
             delegate: listDelegate
-            next:cancel
-            prev:keyboardArea
             onSelected:{
                 Genivi.entryselectedentry=what.index;
                 // Set value of corresponding field and hide keyboard and list
@@ -1084,8 +1075,6 @@ NavigationAppHMIMenu {
             id:maneuverArea
             visible: false;
             delegate: maneuverDelegate
-            next:cancel
-            prev:keyboardArea
         }
 
         // bottom banner
@@ -1094,11 +1083,24 @@ NavigationAppHMIMenu {
             id:calculate_curr;
             onClicked: {
                 setAddress();
-                Genivi.setGuidanceActivated(false);
+                Genivi.setGuidanceActivated(dltIf,false);
                 launchRouteCalculation();
             }
             disabled:!((vehicleLocated || Genivi.showroom ) && destinationValid && !(keyboardActivated));
-            next:back; prev:numberKeyboard
+        }
+        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;
+            disabled:!(Genivi.destination_defined);
+            onClicked: {
+                disconnectSignals();
+                setAddress(); //to allow launching guidance directly in the map view
+                Genivi.data['position']['lat']=Genivi.data['destination']['lat'];
+                Genivi.data['position']['lon']=Genivi.data['destination']['lon'];
+                Genivi.data['display_on_map']='show_position';
+                Genivi.hookMessage(dltIf,'display_on_map',Genivi.data['display_on_map']);
+                entryMenu(dltIf,"NavigationAppBrowseMap",menu);
+            }
         }
         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];
@@ -1111,51 +1113,37 @@ NavigationAppHMIMenu {
                 hideKeyboard();
                 initAddress();
             }
-            next:settings; prev:calculate_curr;
-        }
-        StdButton {
-            source:StyleSheet.location_input[Constants.SOURCE]; x:StyleSheet.location_input[Constants.X]; y:StyleSheet.location_input[Constants.Y]; width:StyleSheet.location_input[Constants.WIDTH]; height:StyleSheet.location_input[Constants.HEIGHT];
-            id:location_input;  next:back; prev:calculate_curr;
-            disabled: false;
-            onClicked: {
-                if(!Genivi.location_input_activated){
-                    Genivi.setLocationInputActivated(true);
-                    Genivi.setGuidanceActivated(false);
-                    Genivi.setRouteCalculated(false);
-                    Genivi.preloadMode=true;
-                    pageOpen(menu.pagefile); //reload page
-                }
-            }
         }
         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;
+            id:poi;
             disabled: keyboardActivated;
             onClicked: {
                 disconnectSignals();
-                entryMenu("NavigationAppPOI",menu);
+                Genivi.setLocationInputActivated(dltIf,false);
+                pageOpen(dltIf,"NavigationAppPOI");
             }
         }
         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;  next:back; prev:calculate_curr;
+            id:settings;
             disabled: keyboardActivated;
             onClicked: {
                 disconnectSignals();
-                Genivi.preloadMode=true; //for the next call of this menu
-                entryMenu("NavigationAppSettings",menu);
+                Genivi.preloadMode=true;
+                entryMenu(dltIf,"NavigationAppSettings",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");
-            disabled: keyboardActivated; next:streetValue; prev:calculate_curr;
+            disabled: keyboardActivated;
             onClicked: {
                 disconnectSignals();
                 Genivi.guidance_StopGuidance(dbusIf,dltIf);
                 Genivi.locationinput_DeleteLocationInput(dbusIf,dltIf); //clear the handle
                 Genivi.g_locationinput_handle[1]=0;
-                leaveMenu();
+                leaveMenu(dltIf);
             }
         }
 
@@ -1170,7 +1158,7 @@ NavigationAppHMIMenu {
         maneuverArea.model.clear();
 
         if (Genivi.reroute_requested){
-            Genivi.setRerouteRequested(false);
+            Genivi.setRerouteRequested(dltIf,false);
             launchRouteCalculation(); //launch route calculation
             if(Genivi.location_input_activated){
                 showLocationInput();
diff --git a/src/hmi/qml/NavigationAppSettings.qml b/src/hmi/qml/NavigationAppSettings.qml
index 5d23d1c..b5eb0f5 100644
--- a/src/hmi/qml/NavigationAppSettings.qml
+++ b/src/hmi/qml/NavigationAppSettings.qml
@@ -141,7 +141,7 @@ NavigationAppHMIMenu {
         Genivi.navigationcore_configuration_SetLocale(dbusIf,dltIf,language,country,script);
         Genivi.mapviewer_configuration_SetLocale(dbusIf,dltIf,language,country,script);
         Genivi.setlang(language,country,script);
-        pageOpen(menu.pagefile); //reload page because of texts...
+        pageOpen(dltIf,menu.pagefile); //reload page because of texts...
     }
 
     function setUnitsLength(units1,units2)
@@ -480,7 +480,7 @@ NavigationAppHMIMenu {
             onClicked:{
                 disconnectSignals();
                 saveSettings();
-                leaveMenu();
+                leaveMenu(dltIf);
             }
         }
 
@@ -511,7 +511,7 @@ NavigationAppHMIMenu {
             button.clicked.connect(
                 function(what) {
                     Genivi.routing_SetCostModel(dbusIf,dltIf,what.userdata);
-                    pageOpen(menu.pagefile); //reload the page
+                    pageOpen(dltIf,menu.pagefile); //reload the page
                 }
             );
         }
diff --git a/src/hmi/qml/NavigationAppTripComputer.qml b/src/hmi/qml/NavigationAppTripComputer.qml
index 9c9118c..f032d21 100644
--- a/src/hmi/qml/NavigationAppTripComputer.qml
+++ b/src/hmi/qml/NavigationAppTripComputer.qml
@@ -433,7 +433,7 @@ NavigationAppHMIMenu {
         }
         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:reset; prev:select_instant;
-            onClicked:{leave(); leaveMenu();}
+            onClicked:{leave(); leaveMenu(dltIf);}
         }
     }
     Component.onCompleted: {
diff --git a/src/hmi/translations/deu_DEU.js b/src/hmi/translations/deu_DEU.js
index 56674fc..91f4c1f 100644
--- a/src/hmi/translations/deu_DEU.js
+++ b/src/hmi/translations/deu_DEU.js
@@ -87,6 +87,7 @@ translations["PredictiveTankDistance"]="PREDICTIVE\nTANK DISTANCE";
 translations["Reset"]="RESET";
 
 translations["Selected"]="SELECTED";
+translations["Restart"]="RESTART";
 
 translations["On"]="ON";
 translations["Off"]="OFF";
diff --git a/src/hmi/translations/eng_USA.js b/src/hmi/translations/eng_USA.js
index 643bba5..b91f74b 100644
--- a/src/hmi/translations/eng_USA.js
+++ b/src/hmi/translations/eng_USA.js
@@ -87,6 +87,7 @@ translations["PredictiveTankDistance"]="PREDICTIVE\nTANK DISTANCE";
 translations["Reset"]="RESET";
 
 translations["Selected"]="SELECTED";
+translations["Restart"]="RESTART";
 
 translations["On"]="ON";
 translations["Off"]="OFF";
diff --git a/src/hmi/translations/fra_FRA.js b/src/hmi/translations/fra_FRA.js
index 480da8c..a92faa9 100644
--- a/src/hmi/translations/fra_FRA.js
+++ b/src/hmi/translations/fra_FRA.js
@@ -87,6 +87,7 @@ translations["PredictiveTankDistance"]="AUTONOMIE\nPREDICTIVE";
 translations["Reset"]="RAZ";
 
 translations["Selected"]="SELECTION";
+translations["Restart"]="REPRENDRE";
 
 translations["On"]="ON";
 translations["Off"]="OFF";
diff --git a/src/hmi/translations/jpn_JPN.js b/src/hmi/translations/jpn_JPN.js
index ed3ed63..e4ca23d 100644
--- a/src/hmi/translations/jpn_JPN.js
+++ b/src/hmi/translations/jpn_JPN.js
@@ -87,6 +87,7 @@ translations["PredictiveTankDistance"]="予報した\n走行距離";
 translations["Reset"]="リセット";
 
 translations["Selected"]="選ばれた";
+translations["Restart"]="再スタート";
 
 translations["On"]="ON";
 translations["Off"]="OFF";