diff --git a/app/src/main/res/layout/list_docker_image_group_item.xml b/app/src/main/res/layout/list_docker_image_group_item.xml
index a5c37ad..d9641f0 100644
--- a/app/src/main/res/layout/list_docker_image_group_item.xml
+++ b/app/src/main/res/layout/list_docker_image_group_item.xml
@@ -4,21 +4,21 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft">
+                android:paddingStart="?android:attr/expandableListPreferredItemPaddingLeft">
 
     <LinearLayout
         android:id="@+id/box_image_indicators"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:gravity="center"
         android:minWidth="30dp"
         android:orientation="vertical"
-        android:paddingRight="2dp">
+        android:paddingEnd="2dp">
 
         <TextView
             android:id="@+id/listitem_image_stars"
@@ -31,7 +31,8 @@
             android:minWidth="30dp"
             android:text="1234"
             android:textAlignment="center"
-            tools:gravity="center"/>
+            tools:gravity="center"
+            tools:ignore="HardcodedText"/>
 
         <ImageView
             android:id="@+id/listitem_image_official"
@@ -50,23 +51,26 @@
         android:id="@+id/listitem_image_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_toStartOf="@id/box_image_indicators"
         android:ellipsize="end"
+        android:maxLines="2"
         android:text="Image Name"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        android:textColor="@color/textColorPrimary"/>
+        android:textColor="@color/textColorPrimary"
+        tools:ignore="HardcodedText"/>
 
     <TextView
         android:id="@+id/listitem_image_desc"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_below="@id/listitem_image_name"
         android:layout_toStartOf="@+id/box_image_indicators"
         android:ellipsize="end"
         android:maxLines="2"
-        android:text="Image Description"/>
+        android:text="Image Description"
+        tools:ignore="HardcodedText"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_docker_tag_item.xml b/app/src/main/res/layout/list_docker_tag_item.xml
index 2867a1f..a5d601a 100644
--- a/app/src/main/res/layout/list_docker_tag_item.xml
+++ b/app/src/main/res/layout/list_docker_tag_item.xml
@@ -9,34 +9,42 @@
 
     <TextView
         android:id="@+id/listitem_tag_name"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="1.0-alpha"
+        android:layout_toStartOf="@id/layout_size_and_timestamp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:text="1.0-alpha-alpha-alpha.beta-beta-beta-beta-beta-beta-beta"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textColor="@color/textColorPrimary"
         tools:ignore="HardcodedText"/>
 
-    <TextView
-        android:id="@+id/listitem_tag_size"
+    <LinearLayout
+        android:id="@+id/layout_size_and_timestamp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="213 MB"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:layout_toEndOf="@+id/listitem_tag_name"
-        android:textAlignment="textEnd"
-        android:textStyle="italic"
-        />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/listitem_tag_last_updated"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="date time"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@+id/listitem_tag_size"
-        android:textAlignment="textEnd"
-        android:textStyle="italic"
-        />
+        <TextView
+            android:id="@+id/listitem_tag_size"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="213 MB"
+            android:textAlignment="textEnd"
+            android:textStyle="italic"
+            tools:ignore="HardcodedText"/>
+
+        <TextView
+            android:id="@+id/listitem_tag_last_updated"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="date time relative"
+            android:textAlignment="textEnd"
+            android:textStyle="italic"
+            tools:ignore="HardcodedText"/>
+
+    </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file