diff --git a/app/src/main/res/layout/dialog_app_info.xml b/app/src/main/res/layout/dialog_app_info.xml
index 7e2f10b8..d7c5cd1b 100644
--- a/app/src/main/res/layout/dialog_app_info.xml
+++ b/app/src/main/res/layout/dialog_app_info.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:context=".dialog.InfoDialog">
 
     <TextView
         android:id="@+id/settings_app_info"
diff --git a/app/src/main/res/layout/dialog_confirm.xml b/app/src/main/res/layout/dialog_confirm.xml
index 9701208e..4b892f08 100644
--- a/app/src/main/res/layout/dialog_confirm.xml
+++ b/app/src/main/res/layout/dialog_confirm.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/confirm_rootview"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:context=".dialog.ConfirmDialog">
 
     <TextView
         android:id="@+id/confirm_title"
diff --git a/app/src/main/res/layout/dialog_licenses.xml b/app/src/main/res/layout/dialog_licenses.xml
index 27f49b87..037b910e 100644
--- a/app/src/main/res/layout/dialog_licenses.xml
+++ b/app/src/main/res/layout/dialog_licenses.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.larswerkman.licenseview.LicenseView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/license_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</com.larswerkman.licenseview.LicenseView>
\ No newline at end of file
+    android:layout_height="match_parent"
+    tools:context=".dialog.LicenseDialog" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml
index 4fd1c642..0a54ae15 100644
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ b/app/src/main/res/layout/dialog_link_preview.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/dialog_linkpreview_padding">
+    android:padding="@dimen/dialog_linkpreview_padding"
+    tools:context=".dialog.LinkDialog">
 
     <ImageView
         android:id="@+id/link_preview_image"
diff --git a/app/src/main/res/layout/page_editprofile.xml b/app/src/main/res/layout/page_editprofile.xml
index a72df9d8..fdf50c5b 100644
--- a/app/src/main/res/layout/page_editprofile.xml
+++ b/app/src/main/res/layout/page_editprofile.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginBottom="@dimen/editprofile_layout_margin"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    tools:context=".activity.ProfileEditor">
 
     <ImageView
         android:id="@+id/edit_banner"
@@ -21,7 +22,6 @@
 
     <Button
         android:id="@+id/edit_add_banner"
-        style="@style/FeedbackButton"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/editprofile_button_height"
         android:paddingLeft="@dimen/editprofile_button_padding"
@@ -31,7 +31,8 @@
         app:layout_constraintStart_toStartOf="@id/edit_banner"
         app:layout_constraintTop_toBottomOf="@id/editprofile_toolbar_background"
         app:layout_constraintBottom_toBottomOf="@id/edit_banner"
-        app:layout_constraintEnd_toEndOf="@id/edit_banner" />
+        app:layout_constraintEnd_toEndOf="@id/edit_banner"
+        style="@style/FeedbackButton" />
 
     <ImageView
         android:id="@+id/edit_change_banner"
diff --git a/app/src/main/res/layout/page_list.xml b/app/src/main/res/layout/page_list.xml
index 65f8114b..f6e0eb7e 100644
--- a/app/src/main/res/layout/page_list.xml
+++ b/app/src/main/res/layout/page_list.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/list_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".activity.UserLists">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/list_toolbar"
diff --git a/app/src/main/res/layout/page_listdetail.xml b/app/src/main/res/layout/page_listdetail.xml
index 87536d01..23cb82d7 100644
--- a/app/src/main/res/layout/page_listdetail.xml
+++ b/app/src/main/res/layout/page_listdetail.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/listdetail_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".activity.ListDetail">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/listdetail_toolbar"
diff --git a/app/src/main/res/layout/page_login.xml b/app/src/main/res/layout/page_login.xml
index b4cee655..2409a33b 100644
--- a/app/src/main/res/layout/page_login.xml
+++ b/app/src/main/res/layout/page_login.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/login_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".activity.LoginActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/login_toolbar"
         android:layout_width="0dp"
         android:layout_height="@dimen/loginpage_toolbar_height"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
         android:id="@+id/login_first_opt"
@@ -24,11 +25,11 @@
         android:layout_marginRight="@dimen/loginpage_number_padding"
         android:text="@string/login_first_opt"
         android:textSize="24sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/login_toolbar"
         app:layout_constraintBottom_toTopOf="@id/login_sec_opt"
         app:layout_constraintEnd_toStartOf="@id/login_get_link"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/login_toolbar"
         app:layout_constraintVertical_weight="1" />
 
     <Button
@@ -40,13 +41,12 @@
         android:paddingRight="@dimen/loginpage_button_padding"
         android:text="@string/register_link"
         android:textSize="@dimen/loginpage_textsize_button"
-        app:layout_constraintBottom_toBottomOf="@+id/login_first_opt"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/login_first_opt"
         app:layout_constraintTop_toTopOf="@+id/login_first_opt"
+        app:layout_constraintBottom_toBottomOf="@+id/login_first_opt"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintVertical_weight="2" />
 
-
     <TextView
         android:id="@+id/login_sec_opt"
         android:layout_width="wrap_content"
@@ -55,10 +55,10 @@
         android:layout_marginRight="@dimen/loginpage_number_padding"
         android:text="@string/login_sec_opt"
         android:textSize="24sp"
-        app:layout_constraintBottom_toBottomOf="@id/login_third_opt"
-        app:layout_constraintEnd_toStartOf="@id/login_enter_pin"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/login_third_opt"
+        app:layout_constraintEnd_toStartOf="@id/login_enter_pin"
         app:layout_constraintTop_toBottomOf="@id/login_first_opt" />
 
     <EditText
@@ -73,11 +73,10 @@
         android:maxLength="@integer/loginpage_pin_max_chars"
         android:singleLine="true"
         android:textSize="@dimen/loginpage_textsize_login_key"
-        app:layout_constraintBottom_toBottomOf="@+id/login_sec_opt"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/login_sec_opt"
-        app:layout_constraintTop_toTopOf="@+id/login_sec_opt" />
-
+        app:layout_constraintTop_toTopOf="@+id/login_sec_opt"
+        app:layout_constraintBottom_toBottomOf="@+id/login_sec_opt"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
         android:id="@+id/login_third_opt"
@@ -87,11 +86,11 @@
         android:layout_marginRight="@dimen/loginpage_number_padding"
         android:text="@string/login_trd_opt"
         android:textSize="24sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/login_verifier"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/login_sec_opt" />
+        app:layout_constraintTop_toBottomOf="@id/login_sec_opt"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/login_verifier" />
 
     <Button
         android:id="@+id/login_verifier"
@@ -102,10 +101,9 @@
         android:paddingRight="@dimen/loginpage_button_padding"
         android:text="@string/login_verifier"
         android:textSize="@dimen/loginpage_textsize_button"
-        app:layout_constraintBottom_toBottomOf="@+id/login_third_opt"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/login_third_opt"
-        app:layout_constraintTop_toTopOf="@+id/login_third_opt" />
-
+        app:layout_constraintTop_toTopOf="@+id/login_third_opt"
+        app:layout_constraintBottom_toBottomOf="@+id/login_third_opt"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/page_main.xml b/app/src/main/res/layout/page_main.xml
index 97e278b3..b78d0361 100644
--- a/app/src/main/res/layout/page_main.xml
+++ b/app/src/main/res/layout/page_main.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".activity.MainActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/home_toolbar"
diff --git a/app/src/main/res/layout/page_media.xml b/app/src/main/res/layout/page_media.xml
index 85d11f6c..770d95e8 100644
--- a/app/src/main/res/layout/page_media.xml
+++ b/app/src/main/res/layout/page_media.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/half_transparent">
+    android:background="@color/half_transparent"
+    tools:context=".activity.MediaViewer">
 
     <org.nuclearfog.zoomview.ZoomView
         android:id="@+id/image_full"
@@ -20,11 +22,11 @@
 
     <LinearLayout
         android:id="@+id/image_preview_list"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
+        android:layout_margin="@dimen/mediapage_preview_margin"
         android:orientation="horizontal"
         android:visibility="gone"
-        android:layout_margin="@dimen/mediapage_preview_margin"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/page_profile.xml b/app/src/main/res/layout/page_profile.xml
index 513216cc..7821870e 100644
--- a/app/src/main/res/layout/page_profile.xml
+++ b/app/src/main/res/layout/page_profile.xml
@@ -5,7 +5,8 @@
     android:id="@+id/user_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    tools:context=".activity.UserProfile">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -24,30 +25,33 @@
 
                 <ImageView
                     android:id="@+id/profile_banner"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:adjustViewBounds="true"
                     android:contentDescription="@string/profile_banner"
                     android:scaleType="centerCrop"
                     app:layout_constraintDimensionRatio="3.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <ImageView
                     android:id="@+id/profile_toolbar_background"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="@dimen/profile_toolbar_height"
                     android:scaleType="centerCrop"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
                     tools:ignore="ContentDescription" />
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/profile_toolbar"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="@dimen/profile_toolbar_height"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <ImageView
                     android:id="@+id/profile_img"
@@ -160,7 +164,7 @@
 
                 <TextView
                     android:id="@+id/bio"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/profile_tv_margin"
                     android:layout_marginLeft="@dimen/profile_tv_margin"
@@ -171,9 +175,9 @@
                     android:linksClickable="true"
                     android:maxLines="@integer/profile_text_bio_lines"
                     android:scrollbars="vertical"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/profile_bio_barrier" />
+                    app:layout_constraintTop_toBottomOf="@+id/profile_bio_barrier"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
 
                 <TextView
@@ -220,7 +224,7 @@
 
                 <TextView
                     android:id="@+id/profile_date"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/profile_tv_margin"
                     android:layout_marginLeft="@dimen/profile_tv_margin"
@@ -230,9 +234,9 @@
                     android:singleLine="true"
                     android:textSize="@dimen/profile_textsize_small"
                     android:visibility="invisible"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/profile_date_barrier" />
+                    app:layout_constraintTop_toBottomOf="@+id/profile_date_barrier"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/page_search.xml b/app/src/main/res/layout/page_search.xml
index 729a51be..5642e3af 100644
--- a/app/src/main/res/layout/page_search.xml
+++ b/app/src/main/res/layout/page_search.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/search_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".activity.SearchPage">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/search_toolbar"
diff --git a/app/src/main/res/layout/page_settings.xml b/app/src/main/res/layout/page_settings.xml
index 02432c8f..7d1b9f0d 100644
--- a/app/src/main/res/layout/page_settings.xml
+++ b/app/src/main/res/layout/page_settings.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:gravity="center_horizontal"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".activity.AppSettings">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar_setting"
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index 78a152e8..70d002c2 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tweet_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    tools:context=".activity.TweetActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/tweet_toolbar"
diff --git a/app/src/main/res/layout/page_user_exclude.xml b/app/src/main/res/layout/page_user_exclude.xml
index 4c362d70..c1384b46 100644
--- a/app/src/main/res/layout/page_user_exclude.xml
+++ b/app/src/main/res/layout/page_user_exclude.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/userexclude_root"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    tools:context=".activity.UserExclude">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/userexclude_toolbar"
diff --git a/app/src/main/res/layout/popup_controlpanel.xml b/app/src/main/res/layout/popup_controlpanel.xml
index 0dc2f20b..e07d524c 100644
--- a/app/src/main/res/layout/popup_controlpanel.xml
+++ b/app/src/main/res/layout/popup_controlpanel.xml
@@ -34,10 +34,10 @@
         android:layout_height="@dimen/controller_button_height"
         android:contentDescription="@string/button_play_pause"
         android:visibility="visible"
-        app:layout_constraintStart_toStartOf="@+id/controller_play"
-        app:layout_constraintTop_toTopOf="@+id/controller_play"
-        app:layout_constraintBottom_toBottomOf="@+id/controller_play"
-        app:layout_constraintEnd_toEndOf="@+id/controller_play" />
+        app:layout_constraintStart_toStartOf="@id/controller_play"
+        app:layout_constraintTop_toTopOf="@id/controller_play"
+        app:layout_constraintBottom_toBottomOf="@id/controller_play"
+        app:layout_constraintEnd_toEndOf="@id/controller_play" />
 
     <ImageButton
         android:id="@+id/controller_forward"
@@ -78,7 +78,7 @@
         android:textSize="@dimen/controller_text_size"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/controller_progress"
-        app:layout_constraintBottom_toBottomOf="@+id/controller_progress"
+        app:layout_constraintBottom_toBottomOf="@id/controller_progress"
         app:layout_constraintEnd_toStartOf="@id/controller_progress" />
 
     <SeekBar
@@ -103,7 +103,7 @@
         android:textSize="@dimen/controller_text_size"
         app:layout_constraintStart_toEndOf="@id/controller_progress"
         app:layout_constraintTop_toTopOf="@id/controller_progress"
-        app:layout_constraintBottom_toBottomOf="@+id/controller_progress"
+        app:layout_constraintBottom_toBottomOf="@id/controller_progress"
         app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_dm.xml b/app/src/main/res/layout/popup_dm.xml
index 084b8be3..7e2b9eab 100644
--- a/app/src/main/res/layout/popup_dm.xml
+++ b/app/src/main/res/layout/popup_dm.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/dm_popup"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".activity.MessageEditor">
 
     <ImageView
         android:id="@+id/dm_background"
@@ -30,10 +31,10 @@
         android:importantForAutofill="no"
         android:inputType="text"
         android:singleLine="true"
-        app:layout_constraintStart_toStartOf="@+id/dm_background"
-        app:layout_constraintTop_toTopOf="@+id/dm_background"
-        app:layout_constraintBottom_toBottomOf="@+id/dm_send"
-        app:layout_constraintEnd_toStartOf="@+id/dm_preview" />
+        app:layout_constraintStart_toStartOf="@id/dm_background"
+        app:layout_constraintTop_toTopOf="@id/dm_background"
+        app:layout_constraintBottom_toBottomOf="@id/dm_send"
+        app:layout_constraintEnd_toStartOf="@id/dm_preview" />
 
     <ImageButton
         android:id="@+id/dm_preview"
@@ -50,9 +51,9 @@
         app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toEndOf="@id/dm_receiver"
-        app:layout_constraintTop_toTopOf="@+id/dm_background"
-        app:layout_constraintBottom_toBottomOf="@+id/dm_send"
-        app:layout_constraintEnd_toStartOf="@+id/dm_media" />
+        app:layout_constraintTop_toTopOf="@id/dm_background"
+        app:layout_constraintBottom_toBottomOf="@id/dm_send"
+        app:layout_constraintEnd_toStartOf="@id/dm_media" />
 
     <ImageButton
         android:id="@+id/dm_media"
@@ -65,10 +66,10 @@
         android:contentDescription="@string/tweet_add_image"
         app:layout_constraintWidth_percent="0.1"
         app:layout_constraintDimensionRatio="1.0"
-        app:layout_constraintStart_toEndOf="@+id/dm_preview"
-        app:layout_constraintTop_toTopOf="@+id/dm_background"
-        app:layout_constraintBottom_toBottomOf="@+id/dm_send"
-        app:layout_constraintEnd_toStartOf="@+id/dm_send" />
+        app:layout_constraintStart_toEndOf="@id/dm_preview"
+        app:layout_constraintTop_toTopOf="@id/dm_background"
+        app:layout_constraintBottom_toBottomOf="@id/dm_send"
+        app:layout_constraintEnd_toStartOf="@id/dm_send" />
 
     <ImageButton
         android:id="@+id/dm_send"
@@ -82,8 +83,8 @@
         app:layout_constraintWidth_percent="0.1"
         app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintStart_toEndOf="@id/dm_media"
-        app:layout_constraintTop_toTopOf="@+id/dm_background"
-        app:layout_constraintEnd_toEndOf="@+id/dm_background" />
+        app:layout_constraintTop_toTopOf="@id/dm_background"
+        app:layout_constraintEnd_toEndOf="@id/dm_background" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/dm_barrier"
@@ -109,9 +110,9 @@
         android:inputType="textMultiLine"
         app:layout_constraintVertical_bias="0.0"
         app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="@+id/dm_background"
-        app:layout_constraintTop_toBottomOf="@+id/dm_barrier"
-        app:layout_constraintBottom_toBottomOf="@+id/dm_background"
-        app:layout_constraintEnd_toEndOf="@+id/dm_background" />
+        app:layout_constraintStart_toStartOf="@id/dm_background"
+        app:layout_constraintTop_toBottomOf="@id/dm_barrier"
+        app:layout_constraintBottom_toBottomOf="@id/dm_background"
+        app:layout_constraintEnd_toEndOf="@id/dm_background" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_tweet.xml b/app/src/main/res/layout/popup_tweet.xml
index 1891bfd2..79cb1cbc 100644
--- a/app/src/main/res/layout/popup_tweet.xml
+++ b/app/src/main/res/layout/popup_tweet.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tweet_popup"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".activity.TweetEditor">
 
     <ImageView
         android:id="@+id/tweet_popup_background"
@@ -32,10 +33,10 @@
         android:hint="@string/popup_tweet_hint"
         android:importantForAutofill="no"
         android:inputType="textMultiLine"
-        app:layout_constraintStart_toStartOf="@+id/tweet_popup_background"
-        app:layout_constraintTop_toTopOf="@+id/tweet_popup_background"
-        app:layout_constraintBottom_toTopOf="@+id/tweet_placeholder"
-        app:layout_constraintEnd_toEndOf="@+id/tweet_popup_background" />
+        app:layout_constraintStart_toStartOf="@id/tweet_popup_background"
+        app:layout_constraintTop_toTopOf="@id/tweet_popup_background"
+        app:layout_constraintBottom_toTopOf="@id/tweet_placeholder"
+        app:layout_constraintEnd_toEndOf="@id/tweet_popup_background" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/tweet_placeholder"
@@ -58,9 +59,9 @@
         app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="@+id/tweet_popup_background"
-        app:layout_constraintBottom_toBottomOf="@+id/tweet_popup_background"
-        app:layout_constraintEnd_toStartOf="@+id/tweet_add_media" />
+        app:layout_constraintStart_toStartOf="@id/tweet_popup_background"
+        app:layout_constraintBottom_toBottomOf="@id/tweet_popup_background"
+        app:layout_constraintEnd_toStartOf="@id/tweet_add_media" />
 
     <ImageButton
         android:id="@+id/tweet_add_media"
@@ -74,9 +75,9 @@
         app:layout_constraintWidth_percent="0.1"
         app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toEndOf="@+id/tweet_prev_media"
-        app:layout_constraintBottom_toBottomOf="@+id/tweet_popup_background"
-        app:layout_constraintEnd_toStartOf="@+id/tweet_add_location" />
+        app:layout_constraintStart_toEndOf="@id/tweet_prev_media"
+        app:layout_constraintBottom_toBottomOf="@id/tweet_popup_background"
+        app:layout_constraintEnd_toStartOf="@id/tweet_add_location" />
 
     <ProgressBar
         android:id="@+id/location_progress"
@@ -84,10 +85,10 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:visibility="invisible"
-        app:layout_constraintStart_toStartOf="@+id/tweet_add_location"
-        app:layout_constraintTop_toTopOf="@+id/tweet_add_location"
-        app:layout_constraintBottom_toBottomOf="@+id/tweet_add_location"
-        app:layout_constraintEnd_toEndOf="@+id/tweet_add_location" />
+        app:layout_constraintStart_toStartOf="@id/tweet_add_location"
+        app:layout_constraintTop_toTopOf="@id/tweet_add_location"
+        app:layout_constraintBottom_toBottomOf="@id/tweet_add_location"
+        app:layout_constraintEnd_toEndOf="@id/tweet_add_location" />
 
     <ImageButton
         android:id="@+id/tweet_add_location"
@@ -101,9 +102,9 @@
         app:layout_constraintWidth_percent="0.1"
         app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toEndOf="@+id/tweet_add_media"
-        app:layout_constraintBottom_toBottomOf="@+id/tweet_popup_background"
-        app:layout_constraintEnd_toStartOf="@+id/tweet_send" />
+        app:layout_constraintStart_toEndOf="@id/tweet_add_media"
+        app:layout_constraintBottom_toBottomOf="@id/tweet_popup_background"
+        app:layout_constraintEnd_toStartOf="@id/tweet_send" />
 
     <ImageButton
         android:id="@+id/tweet_send"
@@ -117,9 +118,9 @@
         app:layout_constraintWidth_percent="0.1"
         app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toEndOf="@+id/tweet_add_location"
-        app:layout_constraintBottom_toBottomOf="@+id/tweet_popup_background"
-        app:layout_constraintEnd_toStartOf="@+id/close" />
+        app:layout_constraintStart_toEndOf="@id/tweet_add_location"
+        app:layout_constraintBottom_toBottomOf="@id/tweet_popup_background"
+        app:layout_constraintEnd_toStartOf="@id/close" />
 
     <ImageButton
         android:id="@+id/close"
@@ -133,8 +134,8 @@
         app:layout_constraintWidth_percent="0.1"
         app:layout_constraintDimensionRatio="1.0"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toEndOf="@+id/tweet_send"
-        app:layout_constraintBottom_toBottomOf="@+id/tweet_popup_background"
-        app:layout_constraintEnd_toEndOf="@+id/tweet_popup_background" />
+        app:layout_constraintStart_toEndOf="@id/tweet_send"
+        app:layout_constraintBottom_toBottomOf="@id/tweet_popup_background"
+        app:layout_constraintEnd_toEndOf="@id/tweet_popup_background" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_userlist.xml b/app/src/main/res/layout/popup_userlist.xml
index 6b2c722b..5a60bb0b 100644
--- a/app/src/main/res/layout/popup_userlist.xml
+++ b/app/src/main/res/layout/popup_userlist.xml
@@ -4,18 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/list_popup_root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".activity.ListEditor">
 
     <ImageView
         android:id="@+id/userlist_popup_background"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.85"
         app:layout_constraintHeight_percent="0.4"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.85"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         tools:ignore="ContentDescription" />
 
     <TextView
@@ -30,9 +31,9 @@
         android:singleLine="true"
         android:text="@string/userlist_create_new_list"
         android:textSize="@dimen/userlist_title_textsize"
-        app:layout_constraintEnd_toEndOf="@+id/userlist_popup_background"
-        app:layout_constraintStart_toStartOf="@+id/userlist_popup_background"
-        app:layout_constraintTop_toTopOf="@+id/userlist_popup_background" />
+        app:layout_constraintStart_toStartOf="@id/userlist_popup_background"
+        app:layout_constraintTop_toTopOf="@id/userlist_popup_background"
+        app:layout_constraintEnd_toEndOf="@id/userlist_popup_background" />
 
     <EditText
         android:id="@+id/list_edit_title"
@@ -49,10 +50,10 @@
         android:hint="@string/userlist_enter_title"
         android:inputType="textPersonName"
         android:singleLine="true"
-        app:layout_constraintBottom_toTopOf="@+id/list_edit_descr"
-        app:layout_constraintEnd_toEndOf="@+id/userlist_popup_background"
-        app:layout_constraintStart_toStartOf="@+id/userlist_popup_background"
-        app:layout_constraintTop_toBottomOf="@+id/popup_list_title" />
+        app:layout_constraintStart_toStartOf="@id/userlist_popup_background"
+        app:layout_constraintTop_toBottomOf="@id/popup_list_title"
+        app:layout_constraintBottom_toTopOf="@id/list_edit_descr"
+        app:layout_constraintEnd_toEndOf="@id/userlist_popup_background" />
 
     <EditText
         android:id="@+id/list_edit_descr"
@@ -70,10 +71,10 @@
         android:hint="@string/userlist_enter_description"
         android:autofillHints="@string/userlist_enter_description"
         android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="@id/userlist_popup_background"
+        app:layout_constraintTop_toBottomOf="@id/list_edit_title"
         app:layout_constraintBottom_toTopOf="@id/list_edit_public_sw"
-        app:layout_constraintEnd_toEndOf="@+id/userlist_popup_background"
-        app:layout_constraintStart_toStartOf="@+id/userlist_popup_background"
-        app:layout_constraintTop_toBottomOf="@+id/list_edit_title" />
+        app:layout_constraintEnd_toEndOf="@id/userlist_popup_background" />
 
 
     <com.kyleduo.switchbutton.SwitchButton
@@ -85,10 +86,10 @@
         android:layout_marginEnd="@dimen/popup_userlist_layout_margin"
         android:layout_marginRight="@dimen/popup_userlist_layout_margin"
         android:layout_marginBottom="@dimen/popup_userlist_background_margin"
-        app:layout_constraintBottom_toBottomOf="@+id/userlist_popup_background"
-        app:layout_constraintEnd_toStartOf="@+id/userlist_switch_text"
         app:layout_constraintStart_toStartOf="@id/userlist_popup_background"
-        app:layout_constraintTop_toBottomOf="@+id/list_edit_descr" />
+        app:layout_constraintTop_toBottomOf="@id/list_edit_descr"
+        app:layout_constraintBottom_toBottomOf="@id/userlist_popup_background"
+        app:layout_constraintEnd_toStartOf="@id/userlist_switch_text" />
 
     <TextView
         android:id="@+id/userlist_switch_text"
@@ -98,11 +99,11 @@
         android:layout_marginRight="@dimen/popup_userlist_layout_margin"
         android:singleLine="true"
         android:text="@string/userlist_public_sel"
-        app:layout_constraintBottom_toBottomOf="@+id/list_edit_public_sw"
-        app:layout_constraintEnd_toStartOf="@+id/userlist_create_list"
         app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toEndOf="@+id/list_edit_public_sw"
-        app:layout_constraintTop_toTopOf="@+id/list_edit_public_sw" />
+        app:layout_constraintStart_toEndOf="@id/list_edit_public_sw"
+        app:layout_constraintTop_toTopOf="@id/list_edit_public_sw"
+        app:layout_constraintBottom_toBottomOf="@id/list_edit_public_sw"
+        app:layout_constraintEnd_toStartOf="@id/userlist_create_list" />
 
     <Button
         android:id="@+id/userlist_create_list"
@@ -114,10 +115,10 @@
         android:paddingLeft="@dimen/userlist_button_padding"
         android:paddingRight="@dimen/userlist_button_padding"
         android:text="@string/userlist_create"
-        app:layout_constraintBottom_toBottomOf="@+id/userlist_switch_text"
-        app:layout_constraintEnd_toEndOf="@id/userlist_popup_background"
         app:layout_constraintHorizontal_weight="3"
-        app:layout_constraintStart_toEndOf="@+id/userlist_switch_text"
-        app:layout_constraintTop_toTopOf="@+id/userlist_switch_text" />
+        app:layout_constraintStart_toEndOf="@id/userlist_switch_text"
+        app:layout_constraintTop_toTopOf="@id/userlist_switch_text"
+        app:layout_constraintBottom_toBottomOf="@id/userlist_switch_text"
+        app:layout_constraintEnd_toEndOf="@id/userlist_popup_background" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tabitem.xml b/app/src/main/res/layout/tabitem.xml
index f2141e1e..790f1274 100644
--- a/app/src/main/res/layout/tabitem.xml
+++ b/app/src/main/res/layout/tabitem.xml
@@ -11,11 +11,10 @@
         android:layout_width="@dimen/tabitem_icon_size"
         android:layout_height="@dimen/tabitem_icon_size"
         android:scaleType="fitXY"
-        app:layout_constraintBottom_toTopOf="@+id/tab_text"
-        app:layout_constraintDimensionRatio=""
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/tab_text"
+        app:layout_constraintEnd_toEndOf="parent"
         tools:ignore="ContentDescription" />
 
     <TextView
@@ -25,9 +24,9 @@
         android:gravity="center"
         android:singleLine="true"
         android:textSize="@dimen/tabitem_textsize"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tab_icon" />
+        app:layout_constraintTop_toBottomOf="@id/tab_icon"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c1d82e09..563c5bc7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,14 +15,12 @@
     <dimen name="settings_cardview_padding">10dp</dimen>
     <dimen name="settings_textsize">20sp</dimen>
     <dimen name="settings_textsize_small">12sp</dimen>
-
     <dimen name="settings_button_height">30sp</dimen>
     <dimen name="settings_button_margin">5dp</dimen>
     <dimen name="settings_switch_margin">10dp</dimen>
     <dimen name="settings_spinner_margin">10dp</dimen>
     <dimen name="settings_column_margin">5dp</dimen>
     <dimen name="settings_seek_number_width">30sp</dimen>
-    <dimen name="settings_seek_margin">10dp</dimen>
 
     <!--dimens of page_tweet.xml-->
     <dimen name="tweet_toolbar_height">@dimen/toolbar_height</dimen>