diff --git a/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java b/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java
index 365e6ad..e2d99dd 100644
--- a/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java
+++ b/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java
@@ -38,7 +38,7 @@ public class SettingsFragmentTest {
     @Test
     public void clickBackButton() throws Exception{
         mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new SettingsFragment()).commit();
-        onView(withId(R.id.settingsBackButton)).perform(click());
+        onView(withId(R.id.settings_back_button)).perform(click());
         onView(withId(R.id.homeFragment)).check(matches(isDisplayed()));
     }
 
@@ -56,7 +56,7 @@ public class SettingsFragmentTest {
         mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new SettingsFragment()).commit();
         onView(withId(R.id.settingsImperialButton)).check(matches(isClickable()));
         onView(withId(R.id.settingsOldButton)).check(matches(isClickable()));
-        onView(withId(R.id.settingsEyeButton)).check(matches(isClickable()));
+        onView(withId(R.id.settingsEyesButton)).check(matches(isClickable()));
 
         onView(withId(R.id.settingsImperialButton)).perform(click());
         onView(withId(R.id.settingsImperialButton)).check(matches(isChecked()));
@@ -64,7 +64,7 @@ public class SettingsFragmentTest {
         onView(withId(R.id.settingsOldButton)).perform(click());
         onView(withId(R.id.settingsOldButton)).check(matches(isChecked()));
 
-        onView(withId(R.id.settingsEyeButton)).perform(click());
-        onView(withId(R.id.settingsEyeButton)).check(matches(isChecked()));
+        onView(withId(R.id.settingsEyesButton)).perform(click());
+        onView(withId(R.id.settingsEyesButton)).check(matches(isChecked()));
     }
 }
diff --git a/app/src/androidTest/java/com/a1/nextlocation/StatisticFragmentTest.java b/app/src/androidTest/java/com/a1/nextlocation/StatisticFragmentTest.java
index f13909b..e04ac58 100644
--- a/app/src/androidTest/java/com/a1/nextlocation/StatisticFragmentTest.java
+++ b/app/src/androidTest/java/com/a1/nextlocation/StatisticFragmentTest.java
@@ -27,7 +27,7 @@ public class StatisticFragmentTest {
     public void checkText() throws Exception{
         mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new StatisticFragment()).commit();
         onView(withId(R.id.textView)).check(matches(isDisplayed()));
-        onView(withId(R.id.Box1)).check(matches(isDisplayed()));
+        onView(withId(R.id.name_box)).check(matches(isDisplayed()));
         onView(withId(R.id.Box2)).check(matches(isDisplayed()));
         onView(withId(R.id.Box3)).check(matches(isDisplayed()));
         onView(withId(R.id.Box4)).check(matches(isDisplayed()));
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index bafe6f4..5510e08 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -115,6 +115,7 @@
             app:layout_constraintVertical_bias="0.0" />
 
         <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/settingsImperialButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -159,6 +160,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/settingsOldButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -205,6 +207,7 @@
             />
 
         <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/settingsEyesButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"