diff --git a/app/src/main/res/layout-v26/activity_main.xml b/app/src/main/res/layout-v26/activity_main.xml
index 2777730..a80acd0 100644
--- a/app/src/main/res/layout-v26/activity_main.xml
+++ b/app/src/main/res/layout-v26/activity_main.xml
@@ -1,251 +1,225 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_marginTop="70dp"
+ android:layout_above="@+id/TextMeetingName"
+ android:text="@string/MeetingName" />
+ android:layout_above="@+id/textName"
+ android:inputType="text" />
+ android:src="@mipmap/baseline_arrow_drop_down_black_24" />
-
-
-
-
-
-
-
+ app:srcCompat="@drawable/iconfinder_pluscircle_7124019_32" />
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f3ca2f3..8bdf3b7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,20 +6,22 @@
android:layout_height="match_parent"
android:paddingStart="60dp"
android:paddingEnd="16dp"
+ android:layout_alignParentBottom="true"
tools:context=".MainActivity">
@@ -112,26 +110,26 @@
android:id="@+id/textBoxID"
android:layout_width="215dp"
android:layout_height="39dp"
- android:layout_below="@+id/textID"
+ android:layout_above="@+id/textPW"
android:focusable="true"
android:focusableInTouchMode="true"
android:inputType="text"
- />
+ />
+ />
+ />
@@ -150,17 +148,17 @@
android:id="@+id/textName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/layoutPW"
+ android:layout_above="@+id/textBoxName"
android:layout_marginTop="22dp"
android:text="@string/DisplayName"
- />
+ />
@@ -181,7 +179,7 @@
android:id="@+id/textAtt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textBoxName"
+ android:layout_above="@+id/editAtt"
android:layout_marginTop="22dp"
android:text="@string/AttendeesInput"
/>
@@ -190,17 +188,19 @@
android:id="@+id/editAtt"
android:layout_width="215dp"
android:layout_height="39dp"
- android:layout_below="@+id/textAtt"
+ android:layout_above="@+id/btnSave"
android:inputType="number"
- />
+ />
@@ -212,6 +212,7 @@
android:layout_alignTop="@+id/btnSave"
android:layout_toEndOf="@+id/btnSave"
android:layout_marginStart="22dp"
+
android:onClick="btnJoin_onClick"
android:text="@string/Join" />