diff --git a/app/build.gradle b/app/build.gradle
index 9818d72..a67d07a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         applicationId "eu.neilalexander.yggdrasil"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 5
+        versionCode 6
         versionName "0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f95c342..9b2fcd8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,405 +27,418 @@
                 android:textSize="24sp"
                 android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/statusSectionLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:text="Status"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <TableLayout
-                android:id="@+id/connectedPeersTableLayout"
+            <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="8pt"
-                android:background="@drawable/rounded"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle">
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4pt"
-                    android:layout_marginLeft="4pt"
-                    android:layout_marginTop="6pt"
-                    android:layout_marginEnd="4pt"
-                    android:layout_marginRight="4pt"
-                    android:layout_marginBottom="6pt">
-
-                    <TextView
-                        android:id="@+id/enableYggdrasilLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Enable Yggdrasil"
-                        android:textColor="?attr/textDefault"
-                        android:textSize="14sp" />
+                android:layout_height="match_parent">
 
-                    <Space
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2" />
-
-                    <Switch
-                        android:id="@+id/enableMulticastBeacon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-
-                </TableRow>
-
-                <TableRow
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4pt"
-                    android:layout_marginLeft="4pt"
-                    android:layout_marginTop="6pt"
-                    android:layout_marginEnd="4pt"
-                    android:layout_marginRight="4pt"
-                    android:layout_marginBottom="6pt">
+                    android:orientation="vertical" >
 
                     <TextView
-                        android:id="@+id/yggdrasilStatusLabel"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/statusSectionLabel"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Not enabled"
-                        android:textSize="14sp"
-                        android:textStyle="bold" />
-
-                </TableRow>
-
-            </TableLayout>
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="32px" />
-
-            <TextView
-                android:id="@+id/statisticsSectionLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Statistics"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <TableLayout
-                android:id="@+id/configuredPeersTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="8pt"
-                android:background="@drawable/rounded"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle">
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="4pt"
-                    android:layout_marginLeft="4pt"
-                    android:layout_marginTop="6pt"
-                    android:layout_marginEnd="4pt"
-                    android:layout_marginRight="4pt"
-                    android:layout_marginBottom="6pt">
-
-                    <TextView
-                        android:id="@+id/ipAddressLabel"
-                        android:layout_width="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:text="Status"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                    <TableLayout
+                        android:id="@+id/connectedPeersTableLayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:text="IP"
-                        android:textColor="?attr/textDefault" />
-
-                    <TextView
-                        android:id="@+id/ipAddressValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:alpha="0.5"
-                        android:ellipsize="none"
-                        android:scrollHorizontally="true"
-                        android:selectAllOnFocus="true"
-                        android:singleLine="true"
-                        android:text="N/A"
-                        android:textAlignment="viewEnd"
-                        android:textIsSelectable="true"
-                        android:textSize="14sp" />
-                </TableRow>
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="4pt"
-                    android:layout_marginLeft="4pt"
-                    android:layout_marginTop="6pt"
-                    android:layout_marginEnd="4pt"
-                    android:layout_marginRight="4pt"
-                    android:layout_marginBottom="6pt">
-
-                    <TextView
-                        android:id="@+id/subnetLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:text="Subnet"
-                        android:textColor="?attr/textDefault" />
-
-                    <TextView
-                        android:id="@+id/subnetValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:alpha="0.5"
-                        android:ellipsize="none"
-                        android:scrollHorizontally="true"
-                        android:selectAllOnFocus="true"
-                        android:singleLine="true"
-                        android:text="N/A"
-                        android:textAlignment="viewEnd"
-                        android:textIsSelectable="true"
-                        android:textSize="14sp" />
-
-                </TableRow>
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="4pt"
-                    android:layout_marginLeft="4pt"
-                    android:layout_marginTop="6pt"
-                    android:layout_marginEnd="4pt"
-                    android:layout_marginRight="4pt"
-                    android:layout_marginBottom="6pt">
-
-                    <TextView
-                        android:id="@+id/coordinatesLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:text="Coordinates"
-                        android:textColor="?attr/textDefault" />
-
-                    <TextView
-                        android:id="@+id/coordinatesValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:alpha="0.5"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:selectAllOnFocus="true"
-                        android:singleLine="true"
-                        android:text="[]"
-                        android:textAlignment="viewEnd"
-                        android:textIsSelectable="true" />
-                </TableRow>
-
-            </TableLayout>
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="32px" />
-
-            <TextView
-                android:id="@+id/configurationSectionLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Configuration"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <TableLayout
-                android:id="@+id/configurationTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:background="@drawable/rounded"
-                android:clickable="true"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle">
-
-                <TableRow
-                    android:id="@+id/peersTableRow"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:paddingStart="4pt"
-                    android:paddingTop="6pt"
-                    android:paddingEnd="4pt"
-                    android:paddingBottom="6pt">
-
-                    <TextView
-                        android:id="@+id/multicastLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Peers"
-                        android:textColor="?attr/textDefault" />
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="8pt"
+                        android:background="@drawable/rounded"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle">
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4pt"
+                            android:layout_marginLeft="4pt"
+                            android:layout_marginTop="6pt"
+                            android:layout_marginEnd="4pt"
+                            android:layout_marginRight="4pt"
+                            android:layout_marginBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/enableYggdrasilLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Enable Yggdrasil"
+                                android:textColor="?attr/textDefault"
+                                android:textSize="14sp" />
+
+                            <Space
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2" />
+
+                            <Switch
+                                android:id="@+id/enableMulticastBeacon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
+
+                        </TableRow>
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4pt"
+                            android:layout_marginLeft="4pt"
+                            android:layout_marginTop="6pt"
+                            android:layout_marginEnd="4pt"
+                            android:layout_marginRight="4pt"
+                            android:layout_marginBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/yggdrasilStatusLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Not enabled"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                        </TableRow>
+
+                    </TableLayout>
 
                     <Space
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2" />
+                        android:layout_width="match_parent"
+                        android:layout_height="32px" />
 
                     <TextView
-                        android:id="@+id/peersValue"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/statisticsSectionLabel"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:alpha="0.5"
-                        android:text="No peers"
-                        android:textAlignment="textEnd" />
-
-                    <ImageView
-                        android:id="@+id/peersChevron"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="2pt"
-                        android:alpha="0.4"
-                        android:cropToPadding="false"
-                        android:scaleType="fitEnd"
-                        android:scaleX="1.2"
-                        android:scaleY="1.2"
-                        app:srcCompat="@drawable/ic_baseline_chevron_right_24" />
-                </TableRow>
-
-                <TableRow
-                    android:id="@+id/settingsTableRow"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:paddingStart="4pt"
-                    android:paddingTop="6pt"
-                    android:paddingEnd="4pt"
-                    android:paddingBottom="6pt">
-
-                    <TextView
-                        android:id="@+id/settingsLabel"
-                        android:layout_width="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Statistics"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                    <TableLayout
+                        android:id="@+id/configuredPeersTableLayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Settings"
-                        android:textColor="?attr/textDefault" />
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="8pt"
+                        android:background="@drawable/rounded"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle">
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="4pt"
+                            android:layout_marginLeft="4pt"
+                            android:layout_marginTop="6pt"
+                            android:layout_marginEnd="4pt"
+                            android:layout_marginRight="4pt"
+                            android:layout_marginBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/ipAddressLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0"
+                                android:text="IP"
+                                android:textColor="?attr/textDefault" />
+
+                            <TextView
+                                android:id="@+id/ipAddressValue"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:alpha="0.5"
+                                android:ellipsize="none"
+                                android:scrollHorizontally="true"
+                                android:selectAllOnFocus="true"
+                                android:singleLine="true"
+                                android:text="N/A"
+                                android:textAlignment="viewEnd"
+                                android:textIsSelectable="true"
+                                android:textSize="14sp" />
+                        </TableRow>
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="4pt"
+                            android:layout_marginLeft="4pt"
+                            android:layout_marginTop="6pt"
+                            android:layout_marginEnd="4pt"
+                            android:layout_marginRight="4pt"
+                            android:layout_marginBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/subnetLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0"
+                                android:text="Subnet"
+                                android:textColor="?attr/textDefault" />
+
+                            <TextView
+                                android:id="@+id/subnetValue"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:alpha="0.5"
+                                android:ellipsize="none"
+                                android:scrollHorizontally="true"
+                                android:selectAllOnFocus="true"
+                                android:singleLine="true"
+                                android:text="N/A"
+                                android:textAlignment="viewEnd"
+                                android:textIsSelectable="true"
+                                android:textSize="14sp" />
+
+                        </TableRow>
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="4pt"
+                            android:layout_marginLeft="4pt"
+                            android:layout_marginTop="6pt"
+                            android:layout_marginEnd="4pt"
+                            android:layout_marginRight="4pt"
+                            android:layout_marginBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/coordinatesLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0"
+                                android:text="Coordinates"
+                                android:textColor="?attr/textDefault" />
+
+                            <TextView
+                                android:id="@+id/coordinatesValue"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:alpha="0.5"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:scrollHorizontally="false"
+                                android:selectAllOnFocus="true"
+                                android:singleLine="true"
+                                android:text="[]"
+                                android:textAlignment="viewEnd"
+                                android:textIsSelectable="true" />
+                        </TableRow>
+
+                    </TableLayout>
 
                     <Space
-                        android:layout_width="320dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="2" />
+                        android:layout_width="match_parent"
+                        android:layout_height="32px" />
 
                     <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-
-                    <ImageView
-                        android:id="@+id/settingsChevron"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="2pt"
-                        android:alpha="0.4"
-                        android:scaleType="fitEnd"
-                        android:scaleX="1.2"
-                        android:scaleY="1.2"
-                        app:srcCompat="@drawable/ic_baseline_chevron_right_24" />
-
-                </TableRow>
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="4pt"
-                    android:layout_marginLeft="4pt"
-                    android:layout_marginTop="6pt"
-                    android:layout_marginEnd="4pt"
-                    android:layout_marginRight="4pt"
-                    android:layout_marginBottom="6pt">
-
-                    <TextView
-                        android:id="@+id/versionLabel"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/configurationSectionLabel"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Version"
-                        android:textColor="?attr/textDefault" />
-
-                    <Space
-                        android:layout_width="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Configuration"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                    <TableLayout
+                        android:id="@+id/configurationTableLayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2" />
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:background="@drawable/rounded"
+                        android:clickable="true"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle">
+
+                        <TableRow
+                            android:id="@+id/peersTableRow"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="?android:attr/selectableItemBackground"
+                            android:clickable="true"
+                            android:paddingStart="4pt"
+                            android:paddingTop="6pt"
+                            android:paddingEnd="4pt"
+                            android:paddingBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/multicastLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Peers"
+                                android:textColor="?attr/textDefault" />
+
+                            <Space
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2" />
+
+                            <TextView
+                                android:id="@+id/peersValue"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:alpha="0.5"
+                                android:text="No peers"
+                                android:textAlignment="textEnd" />
+
+                            <ImageView
+                                android:id="@+id/peersChevron"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_marginLeft="2pt"
+                                android:alpha="0.4"
+                                android:cropToPadding="false"
+                                android:scaleType="fitEnd"
+                                android:scaleX="1.2"
+                                android:scaleY="1.2"
+                                app:srcCompat="@drawable/ic_baseline_chevron_right_24" />
+                        </TableRow>
+
+                        <TableRow
+                            android:id="@+id/settingsTableRow"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="?android:attr/selectableItemBackground"
+                            android:paddingStart="4pt"
+                            android:paddingTop="6pt"
+                            android:paddingEnd="4pt"
+                            android:paddingBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/settingsLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Settings"
+                                android:textColor="?attr/textDefault" />
+
+                            <Space
+                                android:layout_width="320dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="2" />
+
+                            <TextView
+                                android:id="@+id/textView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
+
+                            <ImageView
+                                android:id="@+id/settingsChevron"
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_marginLeft="2pt"
+                                android:alpha="0.4"
+                                android:scaleType="fitEnd"
+                                android:scaleX="1.2"
+                                android:scaleY="1.2"
+                                app:srcCompat="@drawable/ic_baseline_chevron_right_24" />
+
+                        </TableRow>
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="4pt"
+                            android:layout_marginLeft="4pt"
+                            android:layout_marginTop="6pt"
+                            android:layout_marginEnd="4pt"
+                            android:layout_marginRight="4pt"
+                            android:layout_marginBottom="6pt">
+
+                            <TextView
+                                android:id="@+id/versionLabel"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Version"
+                                android:textColor="?attr/textDefault" />
+
+                            <Space
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2" />
+
+                            <TextView
+                                android:id="@+id/versionValue"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:alpha="0.5"
+                                android:text="Unknown"
+                                android:textAlignment="textEnd" />
+
+                        </TableRow>
+
+                    </TableLayout>
 
                     <TextView
-                        android:id="@+id/versionValue"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:alpha="0.5"
-                        android:text="Unknown"
-                        android:textAlignment="textEnd" />
-
-                </TableRow>
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="2pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="You must re-enable Yggdrasil after modifying Peers or Settings to make any changes effective."
+                        android:textAllCaps="false"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                </LinearLayout>
+            </ScrollView>
 
-            </TableLayout>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="2pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="You must re-enable Yggdrasil after modifying Peers or Settings to make any changes effective."
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
         </LinearLayout>
     </FrameLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_peers.xml b/app/src/main/res/layout/activity_peers.xml
index 1d9ecf9..3001949 100644
--- a/app/src/main/res/layout/activity_peers.xml
+++ b/app/src/main/res/layout/activity_peers.xml
@@ -47,196 +47,207 @@
                     app:srcCompat="@drawable/ic_baseline_add_circle_24" />
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/connectedPeersLabel"
+            <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:text="Connected Peers"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <TableLayout
-                android:id="@+id/connectedPeersTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:background="@drawable/rounded"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle" />
-
-            <TextView
-                android:id="@+id/configuredPeersLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Configured Peers"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <TableLayout
-                android:id="@+id/configuredPeersTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:background="@drawable/rounded"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="2pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="4pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Yggdrasil will automatically attempt to connect to configured peers when started. If you configure more than one peer, your device may carry traffic on behalf of other network nodes. Avoid this by configuring only a single peer."
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="32px" />
+                android:layout_height="match_parent">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Peer Connectivity"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <TableLayout
-                android:id="@+id/configurationTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:background="@drawable/rounded"
-                android:clickable="true"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle">
-
-                <TableRow
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clickable="true"
-                    android:paddingStart="4pt"
-                    android:paddingTop="2pt"
-                    android:paddingEnd="4pt"
-                    android:paddingBottom="4pt">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical" >
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:id="@+id/connectedPeersLabel"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Discoverable over multicast"
-                        android:textColor="?attr/textDefault" />
-
-                    <Space
-                        android:layout_width="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:text="Connected Peers"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                    <TableLayout
+                        android:id="@+id/connectedPeersTableLayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2" />
-
-                    <Switch
-                        android:id="@+id/enableMulticastBeacon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-
-                </TableRow>
-
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clickable="true"
-                    android:paddingStart="4pt"
-                    android:paddingTop="4pt"
-                    android:paddingEnd="4pt"
-                    android:paddingBottom="2pt">
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:background="@drawable/rounded"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:id="@+id/configuredPeersLabel"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Search for multicast peers"
-                        android:textColor="?attr/textDefault" />
-
-                    <Space
-                        android:layout_width="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Configured Peers"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                    <TableLayout
+                        android:id="@+id/configuredPeersTableLayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2" />
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:background="@drawable/rounded"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle" />
 
-                    <Switch
-                        android:id="@+id/enableMulticastListen"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="2pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="4pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Yggdrasil will automatically attempt to connect to configured peers when started. If you configure more than one peer, your device may carry traffic on behalf of other network nodes. Avoid this by configuring only a single peer."
+                        android:textAllCaps="false"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
 
-                </TableRow>
+                    <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="32px" />
 
-            </TableLayout>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Peer Connectivity"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                    <TableLayout
+                        android:id="@+id/configurationTableLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:background="@drawable/rounded"
+                        android:clickable="true"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle">
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:clickable="true"
+                            android:paddingStart="4pt"
+                            android:paddingTop="2pt"
+                            android:paddingEnd="4pt"
+                            android:paddingBottom="4pt">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Discoverable over multicast"
+                                android:textColor="?attr/textDefault" />
+
+                            <Space
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2" />
+
+                            <Switch
+                                android:id="@+id/enableMulticastBeacon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
+
+                        </TableRow>
+
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:clickable="true"
+                            android:paddingStart="4pt"
+                            android:paddingTop="4pt"
+                            android:paddingEnd="4pt"
+                            android:paddingBottom="2pt">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Search for multicast peers"
+                                android:textColor="?attr/textDefault" />
+
+                            <Space
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2" />
+
+                            <Switch
+                                android:id="@+id/enableMulticastListen"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
+
+                        </TableRow>
+
+                    </TableLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="2pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Multicast peers will be discovered on the same Wi-Fi network or via USB. Data charges may apply when using mobile data. You can prevent data usage in the device settings."
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="2pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Multicast peers will be discovered on the same Wi-Fi network or via USB. Data charges may apply when using mobile data. You can prevent data usage in the device settings."
+                        android:textAllCaps="false"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+                </LinearLayout>
+            </ScrollView>
 
         </LinearLayout>
     </FrameLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 070bfc8..5d79ce2 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -38,229 +38,241 @@
 
             </LinearLayout>
 
-            <TextView
+            <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:text="Node Info"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
-
-            <TableLayout
-                android:id="@+id/nodeInfoTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:background="@drawable/rounded"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle" >
+                android:layout_height="match_parent">
 
-                <TableRow
-                    android:id="@+id/deviceNameTableRow"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clickable="true"
-                    android:paddingStart="4pt"
-                    android:paddingTop="4pt"
-                    android:paddingEnd="4pt"
-                    android:paddingBottom="4pt">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical" >
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="Device Name"
-                        android:textColor="?attr/textDefault" />
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:text="Node Info"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
 
-                    <EditText
-                        android:id="@+id/deviceNameEntry"
+                    <TableLayout
+                        android:id="@+id/nodeInfoTableLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@null"
-                        android:ems="10"
-                        android:hint="Tap to edit"
-                        android:inputType="textPersonName"
-                        android:padding="0pt"
-                        android:textAlignment="textEnd"
-                        android:textSize="14sp" />
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:background="@drawable/rounded"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle">
 
-                </TableRow>
-            </TableLayout>
+                        <TableRow
+                            android:id="@+id/deviceNameTableRow"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:clickable="true"
+                            android:paddingStart="4pt"
+                            android:paddingTop="4pt"
+                            android:paddingEnd="4pt"
+                            android:paddingBottom="4pt">
 
-            <TextView
-                android:id="@+id/textView6"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="2pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="4pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Information entered here is public and may be shown on network maps."
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:text="Device Name"
+                                android:textColor="?attr/textDefault" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Public Key"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
+                            <EditText
+                                android:id="@+id/deviceNameEntry"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:background="@null"
+                                android:ems="10"
+                                android:hint="Tap to edit"
+                                android:inputType="textPersonName"
+                                android:padding="0pt"
+                                android:textAlignment="textEnd"
+                                android:textSize="14sp" />
 
-            <TableLayout
-                android:id="@+id/publicKeyTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:background="@drawable/rounded"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle" >
+                        </TableRow>
+                    </TableLayout>
 
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="4pt"
-                    android:layout_marginTop="4pt"
-                    android:layout_marginRight="4pt"
-                    android:layout_marginBottom="4pt">
+                    <TextView
+                        android:id="@+id/textView6"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="2pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="4pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Information entered here is public and may be shown on network maps."
+                        android:textAllCaps="false"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
 
-                    <LinearLayout
+                    <TextView
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal">
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Public Key"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
 
-                        <TextView
-                            android:id="@+id/publicKeyLabel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="monospace"
-                            android:text="Public Key"
-                            android:textSize="14sp" />
+                    <TableLayout
+                        android:id="@+id/publicKeyTableLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:background="@drawable/rounded"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle">
 
-                    </LinearLayout>
-                </TableRow>
-            </TableLayout>
+                        <TableRow
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="4pt"
+                            android:layout_marginTop="4pt"
+                            android:layout_marginRight="4pt"
+                            android:layout_marginBottom="4pt">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="2pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="4pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Your public key forms your identity on the network. It is safe to be shared."
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:orientation="horizontal">
 
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="32px" />
+                                <TextView
+                                    android:id="@+id/publicKeyLabel"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:fontFamily="monospace"
+                                    android:text="Public Key"
+                                    android:textSize="14sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:layout_marginBottom="2pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Reset"
-                android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
+                            </LinearLayout>
+                        </TableRow>
+                    </TableLayout>
 
-            <TableLayout
-                android:id="@+id/backupTableLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8pt"
-                android:layout_marginLeft="8pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:background="@drawable/rounded"
-                android:clickable="true"
-                android:divider="#46878787"
-                android:dividerPadding="4pt"
-                android:paddingLeft="4pt"
-                android:paddingTop="2pt"
-                android:paddingRight="4pt"
-                android:paddingBottom="2pt"
-                android:showDividers="middle">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="2pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="4pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Your public key forms your identity on the network. It is safe to be shared."
+                        android:textAllCaps="false"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
 
-                <TableRow
-                    android:id="@+id/resetConfigurationRow"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true"
-                    android:padding="4pt">
+                    <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="32px" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:layout_marginBottom="2pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Reset"
+                        android:textAllCaps="true"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
+
+                    <TableLayout
+                        android:id="@+id/backupTableLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8pt"
+                        android:layout_marginLeft="8pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:background="@drawable/rounded"
+                        android:clickable="true"
+                        android:divider="#46878787"
+                        android:dividerPadding="4pt"
+                        android:paddingLeft="4pt"
+                        android:paddingTop="2pt"
+                        android:paddingRight="4pt"
+                        android:paddingBottom="2pt"
+                        android:showDividers="middle">
+
+                        <TableRow
+                            android:id="@+id/resetConfigurationRow"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="?android:attr/selectableItemBackground"
+                            android:clickable="true"
+                            android:padding="4pt">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Reset configuration"
+                                android:textColor="@android:color/holo_red_dark" />
+                        </TableRow>
+                    </TableLayout>
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Reset configuration"
-                        android:textColor="@android:color/holo_red_dark" />
-                </TableRow>
-            </TableLayout>
+                        android:layout_marginStart="16pt"
+                        android:layout_marginLeft="16pt"
+                        android:layout_marginTop="2pt"
+                        android:layout_marginEnd="8pt"
+                        android:layout_marginRight="8pt"
+                        android:alpha="0.7"
+                        android:paddingRight="8pt"
+                        android:text="Resetting will overwrite with newly generated configuration. Your public keys and IP address on the network will change."
+                        android:textAllCaps="false"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textSize="12sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16pt"
-                android:layout_marginLeft="16pt"
-                android:layout_marginTop="2pt"
-                android:layout_marginEnd="8pt"
-                android:layout_marginRight="8pt"
-                android:alpha="0.7"
-                android:paddingRight="8pt"
-                android:text="Resetting will overwrite with newly generated configuration. Your public keys and IP address on the network will change."
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textSize="12sp" />
+                </LinearLayout>
+            </ScrollView>
 
         </LinearLayout>
     </FrameLayout>
diff --git a/app/src/main/res/layout/peers_configured.xml b/app/src/main/res/layout/peers_configured.xml
index e9aff3c..82615d5 100644
--- a/app/src/main/res/layout/peers_configured.xml
+++ b/app/src/main/res/layout/peers_configured.xml
@@ -1,29 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
+<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/tableRow"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="4pt">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/addressValue"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="18dp"
+        android:layout_marginBottom="12dp"
+        android:ellipsize="end"
+        android:singleLine="true"
         android:text="TextView"
-        android:textColor="?attr/textDefault" />
+        android:textColor="?attr/textDefault"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/deletePeerButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/space" />
 
     <Space
-        android:layout_width="wrap_content"
+        android:id="@+id/space"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1" />
+        app:layout_constraintBottom_toTopOf="@+id/deletePeerButton"
+        app:layout_constraintEnd_toStartOf="@+id/deletePeerButton"
+        app:layout_constraintStart_toEndOf="@+id/addressValue"
+        app:layout_constraintTop_toTopOf="@+id/deletePeerButton" />
 
     <ImageButton
         android:id="@+id/deletePeerButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginRight="2pt"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginBottom="10dp"
         android:background="@android:color/transparent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_baseline_remove_circle_24" />
-</TableRow>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/peers_connected.xml b/app/src/main/res/layout/peers_connected.xml
index 325d3ac..5981d39 100644
--- a/app/src/main/res/layout/peers_connected.xml
+++ b/app/src/main/res/layout/peers_connected.xml
@@ -16,6 +16,8 @@
             android:id="@+id/addressLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:text="(unknown)"
             android:textColor="?attr/textDefault" />
 
@@ -24,6 +26,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="0.5"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:text="TCP peer on unknown"
             android:textColor="?attr/textDefault"
             android:textSize="12sp" />