Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r94fbba1616771adac1f5b7107d264ac84fe7c3a3
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 712f4c8a1b2382919300895b4422b831471044a3)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 94fbba1616771adac1f5b7107d264ac84fe7c3a3)
@@ -36,6 +36,7 @@
             emit eventSpy(vEvent);
             return QQuickView::event(vEvent);
         }
+
         signals:
             void eventSpy(QEvent* vEvent);
     };
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r94fbba1616771adac1f5b7107d264ac84fe7c3a3
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 712f4c8a1b2382919300895b4422b831471044a3)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 94fbba1616771adac1f5b7107d264ac84fe7c3a3)
@@ -263,7 +263,9 @@
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
-    SettingsStack { id: _settingsStack }
+    SettingsStack { id: _settingsStack 
+        anchors.top : _headerBar.bottom
+    }
     // 1 - 2
     ManagerStack  { id: _managerStack  }
     // 1 - 3
@@ -299,6 +301,7 @@
 
     // 9 - Others
     Rectangle { //TODO:@LEAHI: make this the statusbar/headerbar component.
+        id: _headerBar 
         anchors.top: parent.top
         width   : Variables.applicationWidth
         height  : Variables.notificationHeight
Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -r92267164482ab434f6f53c4a5e48042df34f009a -r94fbba1616771adac1f5b7107d264ac84fe7c3a3
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 92267164482ab434f6f53c4a5e48042df34f009a)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 94fbba1616771adac1f5b7107d264ac84fe7c3a3)
@@ -159,7 +159,8 @@
             // therefore in manufacturing or update mode we are still running scripts as root.
             return QCoreApplication::applicationDirPath() + ( ( gEnableManufacturing || gEnableUpdating )? "/scripts/" : "/scripts/");
         #else
-            return "/home/denali/Projects/application/scripts/";
+            return QStringLiteral("%1%2")   .arg(CURRENT_DIR)
+                                            .arg("/scripts/scripts/");;
         #endif
     }
 
@@ -181,6 +182,8 @@
 
     // WiFi Settings
     const char  *Scripts_Wifi_Scan                      = "wifi_scan.sh";
+    const char  *Scripts_Wifi_Info                      = "wifi_info.sh";
+    const char  *Scripts_Wifi_Connect                   = "wifi_connect.sh";
     const char  *Scripts_Wifi_Disconnect                = "wifi_disconnect.sh";
     const char  *Scripts_Wifi_Active_Info               = "wifi_active_info.sh";
     const char  *Scripts_Wifi_Connect_Dhcp              = "wifi_connect_dhcp.sh";