diff --git a/src/ui/DeviceContext.qml b/src/ui/DeviceContext.qml
index 45fdc17..d3a9199 100644
--- a/src/ui/DeviceContext.qml
+++ b/src/ui/DeviceContext.qml
@@ -14,7 +14,7 @@ QtObject {
     property string currentDeviceUdid : ""
     // default to info section
     property int currentSection : 0 
-
+    property int currentTab: 0
     property bool showWelcomePage : true
 
     signal device_removed(string udid)
diff --git a/src/ui/StatusBar.qml b/src/ui/StatusBar.qml
index 091001c..864b3c7 100644
--- a/src/ui/StatusBar.qml
+++ b/src/ui/StatusBar.qml
@@ -6,16 +6,24 @@ import "." as App
 Item {
     Layout.fillWidth: true
     Layout.preferredHeight: 28
+
+    Layout.leftMargin: 10
+    Layout.rightMargin: 10
+    Layout.topMargin: 5
+    Layout.bottomMargin: 5
     
     RowLayout {
         anchors.fill: parent
-        spacing: 12
+        spacing: Qt.platform.os === "windows" ? 2 : 5
         Label {
             text : qsTr("iDescriptor: %1 device(s) connected").arg(App.DeviceContext.devices.count)
-            color: "red"
         }
         Button {
+            visible: App.DeviceContext.currentTab === 0
             icon.source: "qrc:/resources/icons/lets-icons_horizontal-down-left-main-light.svg"
+            HoverHandler {
+                cursorShape: Qt.PointingHandCursor
+            }
             onClicked: {
                 App.DeviceContext.showWelcomePage = !App.DeviceContext.showWelcomePage
             }
@@ -25,6 +33,9 @@ Item {
         }
         Button {
             id: myButton
+            HoverHandler {
+                cursorShape: Qt.PointingHandCursor
+            }
             icon.source: "qrc:/resources/icons/uim_process.svg"
             onClicked: {
                 var globalPos = myButton.mapToGlobal(0, 0)
diff --git a/src/ui/wIndows/Index.qml b/src/ui/wIndows/Index.qml
index 7788a50..87c4bd2 100644
--- a/src/ui/wIndows/Index.qml
+++ b/src/ui/wIndows/Index.qml
@@ -14,7 +14,6 @@ FluWindow {
     minimumHeight: 320
     launchMode: FluWindowType.SingleTask
     fitsAppBarWindows: true
-    property int currentIndex: 0
 
     appBar: FluAppBar {
         height: 28
@@ -24,37 +23,46 @@ FluWindow {
         RowLayout{
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.top: parent.top
+            anchors.top: parent.top 
             anchors.topMargin: 10
             spacing: 0
             TabButton {
                 text: qsTr("iDevice")
-                onClicked: currentIndex = 0
-                active: currentIndex == 0
+                onClicked: DeviceContext.currentTab = 0
+                active: DeviceContext.currentTab == 0
             }
 
             TabButton {
                 text: qsTr("Apps")
-                onClicked: currentIndex = 1
-                active: currentIndex == 1
+                onClicked: DeviceContext.currentTab = 1
+                active:  DeviceContext.currentTab == 1
             }
             TabButton {
                 text: qsTr("Toolbox")
-                onClicked: currentIndex = 2
-                active: currentIndex == 2
+                onClicked:  DeviceContext.currentTab = 2
+                active:  DeviceContext.currentTab == 2
             }
             TabButton {
                 text: qsTr("Jailbroken")
-                onClicked: currentIndex = 3
-                active: currentIndex == 3
+                onClicked:  DeviceContext.currentTab = 3
+                active:  DeviceContext.currentTab == 3
             }
         }
     }
 
-
-    Tabs {
-        currentIndex: window.currentIndex
+    ColumnLayout {
         anchors.fill: parent
-        anchors.topMargin: appBar.height + 25
+        anchors.topMargin: appBar.height + 55
+        Tabs {
+            Layout.fillWidth : true
+            Layout.fillHeight : true
+            
+            currentIndex: DeviceContext.currentTab
+        }
+
+        StatusBar {
+            
+        }
     }
+
 }