diff --git a/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java b/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
index 9cb23771e..d1525b474 100644
--- a/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
+++ b/app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
@@ -136,7 +136,6 @@ public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder>
         @BindView(R.id.author) TextView author;
         @BindView(R.id.expand_layout) LinearLayout expandLayout;
         @BindView(R.id.update) ImageView updateImage;
-        @BindView(R.id.installed) ImageView installedImage;
         @BindView(R.id.changeLog) ImageView changeLog;
         @BindView(R.id.authorLink) ImageView authorLink;
         @BindView(R.id.supportLink) ImageView supportLink;
@@ -179,6 +178,11 @@ public class ReposAdapter extends RecyclerView.Adapter<ReposAdapter.ViewHolder>
             layoutParams.height = expanded ? expandHeight : 0;
             expandLayout.setLayoutParams(layoutParams);
             expandLayout.setVisibility(expanded ? View.VISIBLE : View.GONE);
+            if (expanded) {
+                updateImage.setTranslationY(expandHeight / 2);
+            } else {
+                updateImage.setTranslationY(0);
+            }
         }
 
         private void expand() {
diff --git a/app/src/main/res/layout/list_item_module.xml b/app/src/main/res/layout/list_item_module.xml
index 6bb5fd6cb..b53f90b93 100644
--- a/app/src/main/res/layout/list_item_module.xml
+++ b/app/src/main/res/layout/list_item_module.xml
@@ -20,9 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:minHeight="?android:attr/listPreferredItemHeight"
-        android:padding="@dimen/card_layout_padding"
-        android:paddingEnd="@dimen/card_layout_padding"
-        android:paddingStart="@dimen/card_layout_padding">
+        android:padding="@dimen/card_layout_padding">
 
         <TextView
             android:id="@+id/title"
diff --git a/app/src/main/res/layout/list_item_repo.xml b/app/src/main/res/layout/list_item_repo.xml
index 68231e26f..2dabde751 100644
--- a/app/src/main/res/layout/list_item_repo.xml
+++ b/app/src/main/res/layout/list_item_repo.xml
@@ -20,134 +20,128 @@
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:padding="@dimen/card_layout_padding">
 
-        <RelativeLayout
+        <LinearLayout
+            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="@dimen/card_textview_width"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginTop="0dp"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textIsSelectable="false"/>
-
-            <TextView
-                android:id="@+id/version_name"
-                android:layout_width="@dimen/card_textview_width"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_below="@id/title"
-                android:text="@string/no_info_provided"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@android:color/tertiary_text_dark"
-                android:textIsSelectable="false"
-                android:textStyle="bold|italic"/>
-
-            <TextView
-                android:id="@+id/author"
-                android:layout_width="@dimen/card_textview_width"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_below="@id/version_name"
-                android:text="@string/no_info_provided"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@android:color/tertiary_text_dark"
-                android:textIsSelectable="false"
-                android:textStyle="bold|italic"/>
-
-            <TextView
-                android:id="@+id/description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_below="@id/author"
-                android:layout_gravity="center_vertical"
-                android:text="@string/no_info_provided"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textIsSelectable="false"
-                android:layout_alignEnd="@+id/author" />
-
-            <ImageView
-                android:id="@+id/update"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@id/title"
-                android:layout_alignParentEnd="true"
-                android:layout_gravity="end"
-                android:background="@drawable/ic_file_download_black"
-                android:backgroundTint="@color/icon_grey"
-                android:focusable="false"
-                android:gravity="end"/>
-
+            android:layout_gravity="center_vertical"
+            android:id="@+id/info_layout">
 
             <LinearLayout
-                android:id="@+id/expand_layout"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_below="@id/description"
-                android:orientation="vertical">
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="horizontal">
+                    android:layout_weight="1">
 
-                    <ImageView
-                        android:id="@+id/changeLog"
-                        android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/title"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/card_imageview_margin"
-                        android:layout_marginStart="@dimen/card_imageview_margin"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:padding="15dp"
-                        android:src="@drawable/ic_changelog"
-                        android:tint="@color/icon_grey"/>
+                        android:layout_marginTop="0dp"
+                        android:maxLines="1"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textIsSelectable="false"/>
 
-                    <ImageView
-                        android:id="@+id/authorLink"
-                        android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/version_name"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/card_imageview_margin"
-                        android:layout_marginStart="@dimen/card_imageview_margin"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:padding="15dp"
-                        android:src="@drawable/ic_person"
-                        android:tint="@color/icon_grey"/>
+                        android:text="@string/no_info_provided"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@android:color/tertiary_text_dark"
+                        android:textIsSelectable="false"
+                        android:textStyle="bold|italic"/>
 
-                    <ImageView
-                        android:id="@+id/supportLink"
-                        android:layout_width="wrap_content"
+                    <TextView
+                        android:id="@+id/author"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/card_imageview_margin"
-                        android:layout_marginStart="@dimen/card_imageview_margin"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:padding="15dp"
-                        android:src="@drawable/ic_help"
-                        android:tint="@color/icon_grey"/>
+                        android:text="@string/no_info_provided"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@android:color/tertiary_text_dark"
+                        android:textIsSelectable="false"
+                        android:textStyle="bold|italic"/>
+
+                    <TextView
+                        android:id="@+id/description"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/no_info_provided"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textIsSelectable="false" />
 
                 </LinearLayout>
 
+                <ImageView
+                    android:id="@+id/update"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:background="@drawable/ic_file_download_black"
+                    android:backgroundTint="@color/icon_grey"
+                    android:focusable="false"
+                    android:gravity="end" />
+
             </LinearLayout>
 
+        </LinearLayout>
 
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/installed"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/expand_layout"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/card_imageview_margin"
-            android:layout_marginStart="@dimen/card_imageview_margin"
-            android:focusable="false"
-            android:gravity="end"
-            android:visibility="gone"/>
+            android:layout_alignParentStart="true"
+            android:layout_below="@id/info_layout"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/changeLog"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/card_imageview_margin"
+                    android:layout_marginStart="@dimen/card_imageview_margin"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:padding="15dp"
+                    android:src="@drawable/ic_changelog"
+                    android:tint="@color/icon_grey"/>
+
+                <ImageView
+                    android:id="@+id/authorLink"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/card_imageview_margin"
+                    android:layout_marginStart="@dimen/card_imageview_margin"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:padding="15dp"
+                    android:src="@drawable/ic_person"
+                    android:tint="@color/icon_grey"/>
+
+                <ImageView
+                    android:id="@+id/supportLink"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/card_imageview_margin"
+                    android:layout_marginStart="@dimen/card_imageview_margin"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:padding="15dp"
+                    android:src="@drawable/ic_help"
+                    android:tint="@color/icon_grey"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
 
     </RelativeLayout>