diff --git a/app/build.gradle b/app/build.gradle
index 959a6a3..43f24f2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName '0.2'
+        versionName '0.3'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/res/layout-v26/activity_main.xml b/app/src/main/res/layout-v26/activity_main.xml
index 00ec697..3dc1783 100644
--- a/app/src/main/res/layout-v26/activity_main.xml
+++ b/app/src/main/res/layout-v26/activity_main.xml
@@ -4,23 +4,23 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_alignParentBottom="true"
     android:paddingStart="60dp"
     android:paddingEnd="16dp"
-    android:layout_alignParentBottom="true"
     tools:context=".MainActivity">
 
     <TextView
         android:id="@+id/textMeetingName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="70dp"
         android:layout_above="@+id/TextMeetingName"
+        android:layout_marginTop="70dp"
         android:text="@string/MeetingName" />
 
     <de.joel.zoomhelper.InstantAutoComplete
         android:id="@+id/TextMeetingName"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/textName"
         android:inputType="text" />
 
@@ -41,9 +41,9 @@
         android:id="@+id/imageAdd"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/editAtt"
         android:layout_marginStart="30dp"
         android:layout_marginTop="30dp"
-        android:layout_below="@+id/editAtt"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:focusable="true"
@@ -54,9 +54,9 @@
         android:id="@+id/imageTrash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/imageAdd"
         android:layout_alignTop="@+id/imageAdd"
         android:layout_marginStart="15dp"
+        android:layout_toEndOf="@+id/imageAdd"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:focusable="true"
@@ -67,9 +67,9 @@
         android:id="@+id/imageSave"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/imageTrash"
         android:layout_alignTop="@+id/imageAdd"
         android:layout_marginStart="15dp"
+        android:layout_toEndOf="@+id/imageTrash"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:focusable="true"
@@ -80,9 +80,9 @@
         android:id="@+id/imageShare"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/imageSave"
         android:layout_alignTop="@+id/imageAdd"
         android:layout_marginStart="15dp"
+        android:layout_toEndOf="@+id/imageSave"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:focusable="true"
@@ -93,9 +93,9 @@
         android:id="@+id/imageAttend"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/imageShare"
         android:layout_alignTop="@+id/imageAdd"
         android:layout_marginStart="15dp"
+        android:layout_toEndOf="@+id/imageShare"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
         android:focusable="true"
@@ -112,7 +112,7 @@
     <EditText
         android:id="@+id/textBoxID"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/textPW"
         android:focusable="true"
         android:focusableInTouchMode="true"
@@ -140,8 +140,7 @@
             android:id="@+id/editTextTextPassword2"
             android:layout_width="215dp"
             android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            />
+            android:inputType="textPassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -151,17 +150,15 @@
         android:layout_height="wrap_content"
         android:layout_above="@+id/textBoxName"
         android:layout_marginTop="22dp"
-        android:text="@string/DisplayName"
-        />
+        android:text="@string/DisplayName" />
 
 
     <de.joel.zoomhelper.InstantAutoComplete
         android:id="@+id/textBoxName"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/textAtt"
-        android:inputType="text"
-        />
+        android:inputType="text" />
 
     <ImageView
         android:id="@+id/image2"
@@ -173,8 +170,7 @@
         android:clickable="true"
         android:focusable="true"
         android:padding="5dp"
-        android:src="@mipmap/baseline_arrow_drop_down_black_24"
-        />
+        android:src="@mipmap/baseline_arrow_drop_down_black_24" />
 
     <TextView
         android:id="@+id/textAtt"
@@ -182,37 +178,34 @@
         android:layout_height="wrap_content"
         android:layout_above="@+id/editAtt"
         android:layout_marginTop="22dp"
-        android:text="@string/AttendeesInput"
-        />
+        android:text="@string/AttendeesInput" />
 
     <EditText
         android:id="@+id/editAtt"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/btnSave"
-        android:inputType="number"
-        />
+        android:inputType="number" />
 
 
     <Button
         android:id="@+id/btnSave"
-        android:layout_alignParentBottom= "true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:layout_marginTop="80dp"
         android:layout_marginBottom="40dp"
 
         android:onClick="btnSave_onClick"
-        android:text="@string/Save"
-        />
+        android:text="@string/Save" />
 
     <Button
         android:id="@+id/btnJoin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/btnSave"
-        android:layout_toEndOf="@+id/btnSave"
         android:layout_marginStart="22dp"
+        android:layout_toEndOf="@+id/btnSave"
 
         android:onClick="btnJoin_onClick"
         android:text="@string/Join" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5c7f74a..f63fac7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,7 +20,7 @@
     <de.joel.zoomhelper.InstantAutoComplete
         android:id="@+id/TextMeetingName"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/textName"
         android:inputType="text" />
 
@@ -107,7 +107,7 @@
     <EditText
         android:id="@+id/textBoxID"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/textPW"
         android:focusable="true"
         android:focusableInTouchMode="true"
@@ -134,7 +134,7 @@
         <EditText
             android:id="@+id/editTextTextPassword2"
             android:layout_width="215dp"
-            android:layout_height="39dp"
+            android:layout_height="wrap_content"
             android:inputType="textPassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -151,7 +151,7 @@
     <de.joel.zoomhelper.InstantAutoComplete
         android:id="@+id/textBoxName"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/textAtt"
         android:inputType="text" />
 
@@ -178,7 +178,7 @@
     <EditText
         android:id="@+id/editAtt"
         android:layout_width="215dp"
-        android:layout_height="39dp"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/btnSave"
         android:inputType="number" />