diff --git a/ui/src/main/java/com/wireguard/android/repository/DataRepository.java b/ui/src/main/java/com/wireguard/android/repository/DataRepository.java
index be28c33..beacfdf 100644
--- a/ui/src/main/java/com/wireguard/android/repository/DataRepository.java
+++ b/ui/src/main/java/com/wireguard/android/repository/DataRepository.java
@@ -18,6 +18,7 @@ import retrofit2.Response;
 public class DataRepository {
     private static volatile DataRepository instance;
     private ClientApi clientApi;
+
     public static final String NO_INTERNET_CONNECTION = "no_internet_connection";
 
     private DataRepository()
@@ -47,7 +48,7 @@ public class DataRepository {
                     @Override public void onResponse(final Call<User> call, final Response<User> response) {
                         if(response.isSuccessful()) {
                             String token = response.body().getToken();
-                            UserStore.getInstance(context).setUserResponse(token);
+                            UserStore.getInstance(context).setUserData(token);
                             setMutableLiveData(StatusResource.success());
                         }
                         else {
@@ -75,7 +76,7 @@ public class DataRepository {
 
     public boolean isUserLogin(Context context)
     {
-        return !UserStore.USER_TOKEN_DEFAULT_VALUE.equals(UserStore.getInstance(context).getUserResponse());
+        return !UserStore.USER_TOKEN_DEFAULT_VALUE.equals(UserStore.getInstance(context).getUserData());
     }
 
 }
diff --git a/ui/src/main/java/com/wireguard/android/util/UserStore.java b/ui/src/main/java/com/wireguard/android/util/UserStore.java
index 4e08ffb..e84fa1b 100644
--- a/ui/src/main/java/com/wireguard/android/util/UserStore.java
+++ b/ui/src/main/java/com/wireguard/android/util/UserStore.java
@@ -6,9 +6,10 @@ import android.content.SharedPreferences;
 public class UserStore {
     private static UserStore instance;
     private SharedPreferences sharedPreferences;
+
     private static final String USER_SHARED_PREF = "com.wireguard.android.util.bubbleUserSharedPref";
-    private static final String USER_RESPONSE = "com.wireguard.android.util.bubbleUserResponse";
-    public  static final String USER_TOKEN_DEFAULT_VALUE = "-1";
+    private static final String USER_DATA_KEY = "com.wireguard.android.util.bubbleUserResponse";
+    public  static final String USER_TOKEN_DEFAULT_VALUE = "";
 
     public static UserStore getInstance(Context context) {
         if (instance == null) {
@@ -26,12 +27,12 @@ public class UserStore {
         sharedPreferences = context.getSharedPreferences(USER_SHARED_PREF, Context.MODE_PRIVATE);
     }
 
-    public void setUserResponse(String response) {
-        sharedPreferences.edit().putString(USER_RESPONSE, response).apply();
+    public void setUserData(String response) {
+        sharedPreferences.edit().putString(USER_DATA_KEY, response).apply();
     }
 
-    public String getUserResponse() {
-        return sharedPreferences.getString(USER_RESPONSE, USER_TOKEN_DEFAULT_VALUE);
+    public String getUserData() {
+        return sharedPreferences.getString(USER_DATA_KEY, USER_TOKEN_DEFAULT_VALUE);
     }
 
 }
diff --git a/ui/src/main/res/layout/activity_main.xml b/ui/src/main/res/layout/activity_main.xml
index 079b1ea..d837519 100644
--- a/ui/src/main/res/layout/activity_main.xml
+++ b/ui/src/main/res/layout/activity_main.xml
@@ -8,6 +8,7 @@
     tools:context="com.wireguard.android.activity.MainActivity">
 
     <TextView
+        android:id="@+id/myBubbleTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/my_bubble"
@@ -20,7 +21,7 @@
         app:layout_constraintVertical_bias="0.085" />
 
     <TextView
-        android:id="@+id/textView2"
+        android:id="@+id/bubbleStatusTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/bubble_status"
@@ -33,7 +34,7 @@
         app:layout_constraintVertical_bias="0.183" />
 
     <TextView
-        android:id="@+id/bubble_status"
+        android:id="@+id/bubbleStatus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/running"
@@ -46,6 +47,7 @@
         app:layout_constraintVertical_bias="0.183" />
 
     <TextView
+        android:id="@+id/deviceStatusTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/this_device_status"
@@ -58,7 +60,7 @@
         app:layout_constraintVertical_bias="0.255" />
 
     <TextView
-        android:id="@+id/device_status"
+        android:id="@+id/deviceStatus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/not_connected"
@@ -71,7 +73,7 @@
         app:layout_constraintVertical_bias="0.254" />
 
     <Button
-        android:id="@+id/connect_button"
+        android:id="@+id/connectButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="264dp"
@@ -81,14 +83,5 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/disable_apps_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="328dp"
-        android:text="@string/disable_apps"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 63d9a32..89e9738 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -226,6 +226,7 @@
     <string name="biometric_prompt_private_key_title">Authenticate to view private key</string>
     <string name="biometric_auth_error">Authentication failure</string>
     <string name="biometric_auth_error_reason">Authentication failure: %s</string>
+    <!--Bubble constants-->
     <string name="bubble_name">Bubble Name</string>
     <string name="user_name">User Name:</string>
     <string name="password">Password:</string>