diff --git a/app/src/main/res/layout/activity_app_filter.xml b/app/src/main/res/layout/activity_app_filter.xml
index 0668267..a0e5c87 100644
--- a/app/src/main/res/layout/activity_app_filter.xml
+++ b/app/src/main/res/layout/activity_app_filter.xml
@@ -25,7 +25,6 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-
     </androidx.recyclerview.widget.RecyclerView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/card_appview.xml b/app/src/main/res/layout/card_appview.xml
index a41bd15..97e14a3 100644
--- a/app/src/main/res/layout/card_appview.xml
+++ b/app/src/main/res/layout/card_appview.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/app_icon"
-        android:layout_width="46dp"
-        android:layout_height="46dp"
-        android:paddingEnd="10dp"
-        android:paddingLeft="14dp"
-        android:paddingRight="10dp"
-        android:paddingStart="14dp" />
+            android:id="@+id/app_icon"
+            android:layout_width="46dp"
+            android:layout_height="46dp"
+            android:paddingEnd="10dp"
+            android:paddingStart="14dp"/>
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/app_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1.0" />
+            android:id="@+id/app_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.0"/>
 
     <androidx.appcompat.widget.AppCompatCheckBox
-        android:id="@+id/app_check"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="false"
-        android:paddingEnd="6dp"
-        android:paddingLeft="2dp"
-        android:paddingRight="6dp"
-        android:paddingStart="2dp" />
+            android:id="@+id/app_check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="false"
+            android:paddingEnd="6dp"
+            android:paddingStart="2dp"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/card_rule.xml b/app/src/main/res/layout/card_rule.xml
index d448b35..d90ecad 100644
--- a/app/src/main/res/layout/card_rule.xml
+++ b/app/src/main/res/layout/card_rule.xml
@@ -14,47 +14,39 @@
             app:cardPreventCornerOverlap="true"
             android:id="@+id/cardView_indicator">
 
-        <LinearLayout
+        <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:focusable="true"
                 android:orientation="vertical"
-                android:background="?android:attr/selectableItemBackground">
-            <RelativeLayout
+                android:background="?android:attr/selectableItemBackground"
+                android:layout_marginStart="@dimen/margin_small">
+            <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_small"
-                    android:layout_marginLeft="@dimen/margin_small">
-
-                <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/margin_small"
-                        android:id="@+id/textView_rule_name"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"/>
-                <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/textView_rule_name"
-                        android:padding="@dimen/margin_small"
-                        android:id="@+id/textView_rule_detail"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:layout_alignParentBottom="true"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"/>
-                <TextView android:id="@+id/textView_rule_size"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_gravity="bottom"
-                          android:padding="@dimen/margin_small"
-                          android:layout_alignParentEnd="true"
-                          android:layout_alignParentRight="true"
-                          android:ellipsize="end"
-                          android:textAppearance="?android:attr/textAppearanceSmall"/>
-            </RelativeLayout>
-        </LinearLayout>
+                    android:padding="@dimen/margin_small"
+                    android:id="@+id/textView_rule_name"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentStart="true"/>
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/textView_rule_name"
+                    android:padding="@dimen/margin_small"
+                    android:id="@+id/textView_rule_detail"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentStart="true"/>
+            <TextView
+                    android:id="@+id/textView_rule_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:padding="@dimen/margin_small"
+                    android:layout_alignParentEnd="true"
+                    android:ellipsize="end"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+        </RelativeLayout>
     </androidx.cardview.widget.CardView>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/card_server.xml b/app/src/main/res/layout/card_server.xml
index 1a350a2..6191267 100644
--- a/app/src/main/res/layout/card_server.xml
+++ b/app/src/main/res/layout/card_server.xml
@@ -5,6 +5,7 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:clickable="true"
+        android:focusable="true"
         android:foreground="?attr/selectableItemBackground"
         app:cardCornerRadius="10dp"
         app:cardPreventCornerOverlap="true"
@@ -23,7 +24,6 @@
                 android:id="@+id/textView_custom_dns_name"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"/>
         <TextView
                 android:layout_width="match_parent"
@@ -34,8 +34,7 @@
                 android:id="@+id/textView_custom_dns_address"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"/>
 
     </RelativeLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/fragment_dns_servers.xml b/app/src/main/res/layout/fragment_dns_servers.xml
index d012c3e..5021ef3 100644
--- a/app/src/main/res/layout/fragment_dns_servers.xml
+++ b/app/src/main/res/layout/fragment_dns_servers.xml
@@ -11,7 +11,6 @@
             android:layout_height="match_parent"
             android:scrollbars="horizontal"
             android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -23,4 +22,4 @@
             android:src="@drawable/ic_note_add"
             android:tint="#FFFFFF"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_dns_test.xml b/app/src/main/res/layout/fragment_dns_test.xml
index 66d3cb2..eb1e1f9 100644
--- a/app/src/main/res/layout/fragment_dns_test.xml
+++ b/app/src/main/res/layout/fragment_dns_test.xml
@@ -41,18 +41,15 @@
                 android:layout_alignParentStart="true"
                 android:layout_marginTop="10dp"
                 android:id="@+id/button_start_test"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentLeft="true"/>
+                android:layout_alignParentEnd="true"/>
         <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/button_start_test"
                 android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
                 android:layout_marginTop="10dp"
                 android:id="@+id/textView_test_info"
                 android:textIsSelectable="true"
                 android:textSize="18sp"/>
     </RelativeLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 30b23a1..2924b70 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -13,7 +13,6 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:context="org.itxtech.daedalus.fragment.HomeFragment">
     <ImageView
-            android:contentDescription="icon"
             android:id="@+id/imageView_icon"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -21,7 +20,7 @@
             app:srcCompat="@mipmap/ic_launcher"
             app:layout_widthPercent="40%"
             app:layout_heightPercent="20%"
-            app:layout_marginTopPercent="5%"
+            app:layout_marginTopPercent="10%"
             android:layout_alignParentTop="true" android:layout_centerHorizontal="true"/>
     <TextView
             android:text="@string/app_name"
@@ -39,6 +38,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/button_activate"
-            app:layout_marginTopPercent="10%"
-            android:layout_alignTop="@+id/textView_notice" android:layout_centerHorizontal="true"/>
+            app:layout_marginTopPercent="15%"
+            android:layout_alignTop="@+id/textView_app_name" android:layout_centerHorizontal="true"/>
 </androidx.percentlayout.widget.PercentRelativeLayout>
diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml
index 05d0491..f10b62d 100644
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@@ -11,7 +11,6 @@
             android:layout_height="match_parent"
             android:scrollbars="horizontal"
             android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -23,4 +22,4 @@
             android:src="@drawable/ic_note_add"
             android:tint="#FFFFFF"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>