diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java
index 804c66b..bfbf4a4 100644
--- a/app/src/main/java/com/utsmm/kbz/MainActivity.java
+++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java
@@ -442,7 +442,8 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     public void onStop(){
         super.onStop();
-        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+//        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
     }
 
     @Override
@@ -565,7 +566,8 @@ public class MainActivity extends AppCompatActivity implements
         // Reset screen mode
         // Disconnect ECR
         ECRHelper.INSTANCE.disconnect();
-        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+//        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
     }
 
     // Navigation drawer interaction listeners
@@ -579,7 +581,8 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     public void onPause(){
         super.onPause();
-        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+//        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
     }
 
     @Override
diff --git a/app/src/main/res/layout/navi_main_layout.xml b/app/src/main/res/layout/navi_main_layout.xml
index 0e926bf..4c6552d 100644
--- a/app/src/main/res/layout/navi_main_layout.xml
+++ b/app/src/main/res/layout/navi_main_layout.xml
@@ -358,78 +358,78 @@
 
                     </androidx.cardview.widget.CardView>
 
-<!--                    <androidx.cardview.widget.CardView-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_marginBottom="12dp"-->
-<!--                        android:clickable="true"-->
-<!--                        android:foreground="?android:attr/selectableItemBackground"-->
-<!--                        android:onClick="@{()->click.onClickWifi()}"-->
-<!--                        app:cardBackgroundColor="@color/white"-->
-<!--                        app:cardCornerRadius="16dp"-->
-<!--                        app:cardElevation="2dp">-->
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="12dp"
+                        android:clickable="true"
+                        android:foreground="?android:attr/selectableItemBackground"
+                        android:onClick="@{()->click.onClickWifi()}"
+                        app:cardBackgroundColor="@color/white"
+                        app:cardCornerRadius="16dp"
+                        app:cardElevation="2dp">
 
-<!--                        <LinearLayout-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:gravity="center_vertical"-->
-<!--                            android:orientation="horizontal"-->
-<!--                            android:padding="20dp">-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:padding="20dp">
 
-<!--                            <androidx.cardview.widget.CardView-->
-<!--                                android:layout_width="48dp"-->
-<!--                                android:layout_height="48dp"-->
-<!--                                android:layout_marginEnd="16dp"-->
-<!--                                app:cardBackgroundColor="@color/colorPrimary"-->
-<!--                                app:cardCornerRadius="24dp"-->
-<!--                                app:cardElevation="0dp">-->
+                            <androidx.cardview.widget.CardView
+                                android:layout_width="48dp"
+                                android:layout_height="48dp"
+                                android:layout_marginEnd="16dp"
+                                app:cardBackgroundColor="@color/colorPrimary"
+                                app:cardCornerRadius="24dp"
+                                app:cardElevation="0dp">
 
-<!--                                <ImageView-->
-<!--                                    android:layout_width="24dp"-->
-<!--                                    android:layout_height="24dp"-->
-<!--                                    android:layout_gravity="center"-->
-<!--                                    android:src="@drawable/ic_wifi"-->
-<!--                                    app:tint="@color/white" />-->
+                                <ImageView
+                                    android:layout_width="24dp"
+                                    android:layout_height="24dp"
+                                    android:layout_gravity="center"
+                                    android:src="@drawable/ic_wifi"
+                                    app:tint="@color/white" />
 
-<!--                            </androidx.cardview.widget.CardView>-->
+                            </androidx.cardview.widget.CardView>
 
-<!--                            <LinearLayout-->
-<!--                                android:layout_width="0dp"-->
-<!--                                android:layout_height="wrap_content"-->
-<!--                                android:layout_weight="1"-->
-<!--                                android:orientation="vertical">-->
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
 
-<!--                                <TextView-->
-<!--                                    android:layout_width="wrap_content"-->
-<!--                                    android:layout_height="wrap_content"-->
-<!--                                    android:fontFamily="@font/rubik_medium"-->
-<!--                                    android:text="@string/title_wifi"-->
-<!--                                    android:textColor="@color/colorTextTitle"-->
-<!--                                    android:textSize="18sp"-->
-<!--                                    android:textStyle="bold"-->
-<!--                                    tools:fontFamily="sans-serif-medium" />-->
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:fontFamily="@font/rubik_medium"
+                                    android:text="@string/title_wifi"
+                                    android:textColor="@color/colorTextTitle"
+                                    android:textSize="18sp"
+                                    android:textStyle="bold"
+                                    tools:fontFamily="sans-serif-medium" />
 
-<!--                                <TextView-->
-<!--                                    android:layout_width="wrap_content"-->
-<!--                                    android:layout_height="wrap_content"-->
-<!--                                    android:layout_marginTop="2dp"-->
-<!--                                    android:fontFamily="@font/rubik_regular"-->
-<!--                                    android:text="Go to Wifi setting"-->
-<!--                                    android:textColor="@color/colorTextContent"-->
-<!--                                    android:textSize="14sp"-->
-<!--                                    tools:fontFamily="sans-serif" />-->
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="2dp"
+                                    android:fontFamily="@font/rubik_regular"
+                                    android:text="Go to Wifi setting"
+                                    android:textColor="@color/colorTextContent"
+                                    android:textSize="14sp"
+                                    tools:fontFamily="sans-serif" />
 
-<!--                            </LinearLayout>-->
+                            </LinearLayout>
 
-<!--                            <ImageView-->
-<!--                                android:layout_width="20dp"-->
-<!--                                android:layout_height="20dp"-->
-<!--                                android:src="@drawable/ic_right_arrow"-->
-<!--                                app:tint="@color/colorPrimary" />-->
+                            <ImageView
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:src="@drawable/ic_right_arrow"
+                                app:tint="@color/colorPrimary" />
 
-<!--                        </LinearLayout>-->
+                        </LinearLayout>
 
-<!--                    </androidx.cardview.widget.CardView>-->
+                    </androidx.cardview.widget.CardView>
 
                 </LinearLayout>