diff --git a/primitiveFTPd/res/layout/block_client_action.xml b/primitiveFTPd/res/layout/block_client_action.xml
index 1353362a..b1d2f911 100644
--- a/primitiveFTPd/res/layout/block_client_action.xml
+++ b/primitiveFTPd/res/layout/block_client_action.xml
@@ -1,11 +1,10 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <!-- label -->
     <TextView
         android:id="@+id/clientActionsLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
         android:textStyle="bold"
         android:layout_marginTop="16dp"
         android:text="@string/clientActionsLabel"
@@ -16,23 +15,23 @@
         android:id="@+id/clientActionsLine1"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:textIsSelectable="true"
+        tools:text="2024-10-12 14:00:01 FS FTP 192.168.154.195 LIST_DIR /storage/emulated/0"
         />
     <TextView
         android:id="@+id/clientActionsLine2"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:visibility="gone"
         android:textIsSelectable="true"
+        tools:text="2024-10-12 14:00:01 FS FTP 192.168.154.195 LIST_DIR /storage/emulated/0/Download"
         />
     <TextView
         android:id="@+id/clientActionsLine3"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:visibility="gone"
         android:textIsSelectable="true"
+        tools:text="2024-10-12 14:00:01 FS FTP 192.168.154.195 LIST_DIR /storage/emulated/0/Download/temp"
         />
 </merge>
diff --git a/primitiveFTPd/res/layout/block_connect_data.xml b/primitiveFTPd/res/layout/block_connect_data.xml
index e1e137ca..e98cc8ce 100644
--- a/primitiveFTPd/res/layout/block_connect_data.xml
+++ b/primitiveFTPd/res/layout/block_connect_data.xml
@@ -1,184 +1,212 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- QuickShare Info -->
-    <TextView
-        android:id="@+id/quickShareInfo"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textStyle="bold"
-        android:layout_marginTop="16dp"
-        android:focusable="false"
-    />
-
-    <!-- interfaces/addresses and ports info in 2 columns -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:baselineAligned="false">
+        >
+        <!-- QuickShare Info -->
+        <TextView
+            android:id="@+id/quickShareInfo"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:focusable="false"
+            android:gravity="center_horizontal"
+            android:visibility="gone"
+            tools:text="Running in QuickShare Mode for 1839 file(s)"
+            tools:visibility="visible"
+            />
 
-        <!-- left column -->
+        <!-- interfaces/addresses and ports info in 2 columns -->
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <!-- addresses / interfaces -->
-            <TextView
-                android:id="@+id/addressesLabel"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:textStyle="bold"
-                android:layout_marginTop="16dp"
-                android:focusable="false"
-            />
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:baselineAligned="false">
 
+            <!-- left column -->
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <!-- addresses / interfaces -->
+                <TextView
+                    android:id="@+id/addressesLabel"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:textStyle="bold"
+                    android:focusable="false"
+                    tools:text="IP Address (Network Interface)"
+                    />
+
+                <LinearLayout
+                    android:id="@+id/addressesContainer"
+                    android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    >
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        tools:visibility="visible"
+                        tools:text="10.80.90.70 (rmnet_data3)"
+                        />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        tools:visibility="visible"
+                        tools:text="192.168.43.1 (wlan0)"
+                        />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        tools:visibility="visible"
+                        tools:text="aaaa:bbbb:cccc:dddd:eeee:ffff:0000:1111 (rmnet_data2)"
+                        />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        tools:visibility="visible"
+                        tools:text="aaaa:bbbb:cccc:dddd:eeee:ffff:0000:1112 (rmnet_data1)"
+                        />
+                </LinearLayout>
+            </LinearLayout>
+
+            <!-- right column -->
             <LinearLayout
-                android:id="@+id/addressesContainer"
-                android:orientation="vertical"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-            />
+                android:layout_height="fill_parent"
+                android:orientation="vertical">
+
+                <!-- ports -->
+                <TextView
+                    android:id="@+id/portsLabel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textStyle="bold"
+                    android:focusable="false"
+                    tools:text="Protocol / Port / State"
+                    />
+                <TextView
+                    android:id="@+id/ftpTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textIsSelectable="true"
+                    android:focusable="false"
+                    tools:text="ftp / 2211 / Stopped"
+                    />
+                <TextView
+                    android:id="@+id/sftpTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textIsSelectable="true"
+                    android:focusable="false"
+                    tools:text="sftp / 1234 / Stopped"
+                    />
+            </LinearLayout>
         </LinearLayout>
 
-        <!-- right column -->
+        <!-- user name -->
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <!-- ports -->
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            >
             <TextView
-                android:id="@+id/portsLabel"
-                android:layout_width="fill_parent"
+                android:id="@+id/usernameLabel"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:textStyle="bold"
-                android:layout_marginTop="16dp"
-                android:focusable="false"
-            />
-            <TextView
-                android:id="@+id/ftpTextView"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:textIsSelectable="true"
+                android:text="@string/prefTitleUser"
                 android:focusable="false"
-            />
+                />
+
             <TextView
-                android:id="@+id/sftpTextView"
-                android:layout_width="fill_parent"
+                android:id="@+id/usernameTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:textIsSelectable="true"
                 android:focusable="false"
-            />
+                tools:text="ftp_username"
+                />
         </LinearLayout>
-    </LinearLayout>
-
-    <!-- user name -->
-    <TextView
-        android:id="@+id/usernameLabel"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textStyle="bold"
-        android:layout_marginTop="16dp"
-        android:text="@string/prefTitleUser"
-        android:focusable="false"
-    />
-    <TextView
-        android:id="@+id/usernameTextView"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textIsSelectable="true"
-        android:focusable="false"
-    />
-
-    <!-- login / auth / permission info in 2 columns -->
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:baselineAligned="false"
-        android:layout_marginTop="16dp"
-        >
 
-        <!-- left column -->
+        <!-- login / auth / permission info in 2 columns -->
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:baselineAligned="false"
+            android:layout_marginTop="16dp"
+            >
+
 
             <TextView
                 android:id="@+id/anonymousLoginTextView"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:focusable="false"
-            />
+                tools:text="@string/isAnonymous"
+                />
 
             <TextView
                 android:id="@+id/passwordPresentTextView"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:focusable="false"
+                tools:text="@string/passwordPresent"
                 />
 
             <TextView
                 android:id="@+id/pubKeyAuthTextView"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:focusable="false"
+                tools:text="@string/pubKeyAuth"
                 />
-        </LinearLayout>
-
-        <!-- right column -->
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="fill_parent"
-            android:layout_weight="2"
-            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/hasNormalStorageAccessTextView"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:focusable="false"
+                tools:text="@string/hasNormalAccessToStorage"
                 />
 
             <TextView
                 android:id="@+id/hasFullStorageAccessTextView"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:focusable="false"
+                tools:text="@string/hasFullAccessToStorage"
                 />
 
             <TextView
                 android:id="@+id/hasMediaLocationAccessTextView"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:focusable="false"
+                tools:text="@string/hasAccessToMediaLocation"
                 />
 
             <TextView
                 android:id="@+id/hasNotificationPermissionTextView"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                 android:focusable="false"
+                tools:text="@string/hasNotificationPermission"
                 />
         </LinearLayout>
 
diff --git a/primitiveFTPd/res/layout/block_key_fingerprints.xml b/primitiveFTPd/res/layout/block_key_fingerprints.xml
index edd2f5ae..e89c707c 100644
--- a/primitiveFTPd/res/layout/block_key_fingerprints.xml
+++ b/primitiveFTPd/res/layout/block_key_fingerprints.xml
@@ -1,11 +1,12 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    >
 
     <!-- key fingerprints -->
     <TextView
         android:id="@+id/keyFingerprintsLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
         android:textStyle="bold"
         android:layout_marginTop="16dp"
         android:text="@string/fingerprintsLabel"
@@ -25,7 +26,6 @@
         android:id="@+id/allKeysFingerprintsLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:text="@string/allKeysFingerprintsLabel"
@@ -44,56 +44,56 @@
         android:id="@+id/keyFingerprintMd5Label"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:focusable="false"
+        tools:text="MD5 (ed25519)"
         />
     <TextView
         android:id="@+id/keyFingerprintMd5TextView"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:typeface="monospace"
         android:textIsSelectable="true"
         android:selectAllOnFocus="true"
         android:focusable="false"
+        tools:text="00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00\nBase 64\nOyaoinjnvjwnoijjoiejijiewj"
         />
     <!-- SHA 1 -->
     <TextView
         android:id="@+id/keyFingerprintSha1Label"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:layout_marginTop="8dp"
         android:focusable="false"
+        tools:text="SHA1 (ed25519)"
         />
     <TextView
         android:id="@+id/keyFingerprintSha1TextView"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:typeface="monospace"
         android:textIsSelectable="true"
         android:selectAllOnFocus="true"
         android:focusable="false"
+        tools:text="00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00\nBase 64\nOyaoinjnvjwnoijjoiejijiewj"
         />
     <!-- SHA 256 -->
     <TextView
         android:id="@+id/keyFingerprintSha256Label"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:layout_marginTop="8dp"
         android:focusable="false"
+        tools:text="SHA256 (ed25519)"
         />
     <TextView
         android:id="@+id/keyFingerprintSha256TextView"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:typeface="monospace"
         android:textIsSelectable="true"
         android:selectAllOnFocus="true"
         android:focusable="false"
+        tools:text="00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00\nBase 64\nOyaoinjnvjwnoijjoiejijiewj"
         />
 
 </merge>
diff --git a/primitiveFTPd/res/layout/block_storage_type.xml b/primitiveFTPd/res/layout/block_storage_type.xml
index 6406c50a..c173f36d 100644
--- a/primitiveFTPd/res/layout/block_storage_type.xml
+++ b/primitiveFTPd/res/layout/block_storage_type.xml
@@ -5,13 +5,11 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
         >
         <TextView
             android:id="@+id/storageTypeLabel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
             android:textStyle="bold"
             android:layout_marginTop="16dp"
             android:text="@string/storageType"
@@ -65,7 +63,6 @@
         android:id="@+id/safExplainHeading"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:text="@string/safExplainHeading"
         android:textStyle="bold"
         />
@@ -73,14 +70,12 @@
         android:id="@+id/safExplain"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:text="@string/safExplainV2"
         />
     <TextView
         android:id="@+id/safUriLabel"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:text="@string/selectedSafUri"
         android:textStyle="bold"
         android:visibility="gone"
@@ -89,7 +84,6 @@
         android:id="@+id/safUri"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
         android:visibility="gone"
         android:textIsSelectable="true"
         android:selectAllOnFocus="true"
diff --git a/primitiveFTPd/res/layout/main.xml b/primitiveFTPd/res/layout/main.xml
index f2e27e20..4b7869c2 100644
--- a/primitiveFTPd/res/layout/main.xml
+++ b/primitiveFTPd/res/layout/main.xml
@@ -8,7 +8,10 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        >
 
         <include layout="@layout/block_connect_data"  />
         <include layout="@layout/block_storage_type"  />
diff --git a/primitiveFTPd/src/org/primftpd/ui/PftpdFragment.java b/primitiveFTPd/src/org/primftpd/ui/PftpdFragment.java
index 8290ce94..cd3a4b32 100644
--- a/primitiveFTPd/src/org/primftpd/ui/PftpdFragment.java
+++ b/primitiveFTPd/src/org/primftpd/ui/PftpdFragment.java
@@ -23,7 +23,6 @@
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.UnderlineSpan;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -468,7 +467,6 @@ protected void showAddresses() {
 			TextView textView = new TextView(container.getContext());
 			container.addView(textView);
 			textView.setText(displayText);
-			textView.setGravity(Gravity.CENTER_HORIZONTAL);
 			textView.setTextIsSelectable(true);
 		}
 
diff --git a/primitiveFTPd/src/org/primftpd/util/IpAddressProvider.java b/primitiveFTPd/src/org/primftpd/util/IpAddressProvider.java
index 71f75fb5..b7f2fee8 100644
--- a/primitiveFTPd/src/org/primftpd/util/IpAddressProvider.java
+++ b/primitiveFTPd/src/org/primftpd/util/IpAddressProvider.java
@@ -11,8 +11,10 @@
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Objects;
 
 public class IpAddressProvider {
 
@@ -87,6 +89,11 @@ public List<String> ipAddressTexts(Context ctxt, boolean verbose, boolean isLeft
             String msg = ctxt.getText(R.string.ifacesError) + e.getLocalizedMessage();
             Toast.makeText(ctxt, msg, Toast.LENGTH_SHORT).show();
         }
+        Collections.sort(result, (s1, s2) -> {
+            if (Objects.equals(s1, s2)) return 0;
+            if (s1.contains(".")) return -1;
+            return s1.startsWith("wlan") ? -1 : 1;
+        });
         return result;
     }