diff --git a/app/src/main/res/layout/activity_bucket_select.xml b/app/src/main/res/layout/activity_bucket_select.xml
index c63f650..231d411 100644
--- a/app/src/main/res/layout/activity_bucket_select.xml
+++ b/app/src/main/res/layout/activity_bucket_select.xml
@@ -10,6 +10,7 @@
         android:id="@+id/blist"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:contentDescription="@string/bucket_list"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index aa99d5e..cf83c33 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,27 +1,25 @@
 <?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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".MainActivity">
 
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_marginTop="100dp"
+        android:layout_height="wrap_content"
         android:text="@string/accountselect"
         android:textAlignment="center"
-        android:textSize="25sp"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textSize="25sp" />
 
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
+        android:layout_height="70dp"
         android:layout_margin="20dp"
         android:orientation="horizontal"
-        android:padding="10dp"
         tools:ignore="MissingConstraints"
         tools:layout_editor_absoluteX="20dp">
 
@@ -31,7 +29,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/accountadd_button"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints"
+            style="?android:attr/buttonStyle" />
 
         <Button
             android:id="@+id/ltest"
@@ -39,7 +38,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:text="@string/dummy_button"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints"
+            style="?android:attr/buttonStyle" />
 
     </LinearLayout>
 
@@ -47,10 +47,6 @@
         android:id="@+id/alist"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="140dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="1.0"
         tools:layout_editor_absoluteX="27dp" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_select.xml b/app/src/main/res/layout/activity_object_select.xml
index fc2d179..b511bc6 100644
--- a/app/src/main/res/layout/activity_object_select.xml
+++ b/app/src/main/res/layout/activity_object_select.xml
@@ -7,13 +7,14 @@
     tools:context=".ObjectSelect">
 
     <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/olist"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintVertical_bias="0.0"
-    tools:layout_editor_absoluteX="-27dp" />
+        android:id="@+id/olist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/object_list"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
+        tools:layout_editor_absoluteX="-27dp" />
 
     <ProgressBar
         android:id="@+id/simpleProgressBar"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a31959..6b16f5b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,9 @@
     <string name="app_name">S3 Manager</string>
     <string name="aws_endpoint">.amazonaws.com</string>
     <string name="title_activity_video_player">VideoPlayer</string>
+    <string name="account_list">Account list</string>
+    <string name="bucket_list">Bucket list</string>
+    <string name="object_list">Object list</string>
     <string name="broken_database">Local database is corrupted. Please reinstall this app</string>
     <string name="pending_feature">This feature is not implemented yet</string>
     <string name="file_external">Open in</string>