diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f56d70..8b26a60 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.IDry.MidnightMadness">
-        <!-- //Launcher activity-->
+
+        <!-- Launcher activity-->
         <activity
             android:name="activity.MainActivity"
             android:exported="true">
@@ -19,21 +20,11 @@
             </intent-filter>
         </activity>
 
-
-<!--        -SETTINGS-->
-<!--        <activity-->
-<!--        android:name="activity.Settings"-->
-<!--        android:exported="true">-->
-<!--        <intent-filter>-->
-<!--            <action android:name="android.intent.action.MAIN" />-->
-<!--            <category android:name="android.intent.category.LAUNCHER" />-->
-<!--        </intent-filter>-->
-<!--    </activity>-->
-
         <activity
             android:name="activity.Settings"
             android:exported="false" />
-         Filter guide activities
+
+        <!-- Filter guide activities -->
         <activity
             android:name="activity.FilterGuideFirstActivity"
             android:exported="false" />
diff --git a/app/src/main/java/activity/FunctionButtonsFragment.java b/app/src/main/java/activity/FunctionButtonsFragment.java
index 4eb0d13..37bc6b3 100644
--- a/app/src/main/java/activity/FunctionButtonsFragment.java
+++ b/app/src/main/java/activity/FunctionButtonsFragment.java
@@ -57,13 +57,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         // Settings button
         ImageButton settingsBtn = view.findViewById(R.id.settingsBtn);
         settingsBtn.setOnClickListener(v -> {
-            // TODO: Navigate to the settings activity
-                startActivity(new Intent( getActivity(), Settings.class));
+            // Navigate to the settings activity
+            startActivity(new Intent( getActivity(), Settings.class));
         });
 
-
-
-
         // Door unlock button
         doorUnlockBtn.setOnClickListener(v -> {
             // Open the door and hide this button
diff --git a/app/src/main/java/activity/Settings.java b/app/src/main/java/activity/Settings.java
index e883c79..72668aa 100644
--- a/app/src/main/java/activity/Settings.java
+++ b/app/src/main/java/activity/Settings.java
@@ -78,13 +78,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         /* returnn button */
         returnn.setOnClickListener(view -> {
-           //go in the previus page
-            Button gobackbutton= view.findViewById(R.id.returnfromsettings);
-            gobackbutton.setOnClickListener(v -> {
-                // TODO: Navigate to the settings activity
-//                finish();
-                onBackPressed();
-            });
+            // go in the previous page
+            finish();
         });
     }