diff --git a/app/src/main/java/com/idormy/sms/forwarder/view/IPEditText.java b/app/src/main/java/com/idormy/sms/forwarder/view/IPEditText.java
index 33b1504b..4d57379a 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/view/IPEditText.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/view/IPEditText.java
@@ -169,7 +169,6 @@ public class IPEditText extends LinearLayout {
                     Edit4.setText(ip4);
                     Edit4.setSelection(ip4.length());
                     Toast.makeText(context, R.string.invalid_ip, Toast.LENGTH_LONG).show();
-                    return;
                 }
             }
 
diff --git a/app/src/main/res/layout/activity_clone.xml b/app/src/main/res/layout/activity_clone.xml
index 792820aa..63975512 100644
--- a/app/src/main/res/layout/activity_clone.xml
+++ b/app/src/main/res/layout/activity_clone.xml
@@ -9,15 +9,6 @@
     android:paddingTop="16dp"
     android:weightSum="1">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0.1"
-        android:gravity="start"
-        android:orientation="horizontal">
-
-    </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,8 +53,7 @@
         <com.idormy.sms.forwarder.view.IPEditText
             android:id="@+id/textServerIp"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_alignParentLeft="true" />
+            android:layout_width="match_parent" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/iptext.xml b/app/src/main/res/layout/iptext.xml
index d26e5670..de80cc64 100644
--- a/app/src/main/res/layout/iptext.xml
+++ b/app/src/main/res/layout/iptext.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <EditText
         android:id="@+id/edit1"
@@ -10,7 +11,9 @@
         android:inputType="number"
         android:digits="0123456789."
         android:maxLength="3"
-        android:text="" />
+        android:text=""
+        tools:ignore="LabelFor"
+        android:autofillHints="" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -27,7 +30,9 @@
         android:inputType="number"
         android:digits="0123456789."
         android:maxLength="3"
-        android:text="" />
+        android:text=""
+        tools:ignore="LabelFor"
+        android:autofillHints="" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -44,7 +49,9 @@
         android:inputType="number"
         android:digits="0123456789."
         android:maxLength="3"
-        android:text="" />
+        android:text=""
+        tools:ignore="LabelFor"
+        android:autofillHints="" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -61,5 +68,7 @@
         android:inputType="number"
         android:digits="0123456789."
         android:maxLength="3"
-        android:text="" />
+        android:text=""
+        tools:ignore="LabelFor"
+        android:autofillHints="" />
 </merge>
\ No newline at end of file