diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml
index 509e602663..1f840d09b0 100644
--- a/app/src/main/res/layout-land/manga_info_controller.xml
+++ b/app/src/main/res/layout-land/manga_info_controller.xml
@@ -65,11 +65,14 @@
                     style="@style/TextAppearance.Medium.Title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
                     android:maxLines="2"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:autoSizeTextType="uniform"
+                    app:autoSizeMinTextSize="12sp"
+                    app:autoSizeMaxTextSize="100sp"
+                    app:autoSizeStepGranularity="2sp"/>
 
                 <TextView
                     android:id="@+id/manga_author_label"
diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml
index 6837e69a8f..51476c1ffd 100644
--- a/app/src/main/res/layout/manga_info_controller.xml
+++ b/app/src/main/res/layout/manga_info_controller.xml
@@ -92,7 +92,12 @@
                     android:maxLines="2"
                     android:textIsSelectable="false"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"/>
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:autoSizeTextType="uniform"
+                    app:autoSizeMinTextSize="12sp"
+                    app:autoSizeMaxTextSize="100sp"
+                    app:autoSizeStepGranularity="2sp"/>
+
                 <TextView
                     android:id="@+id/manga_author_label"
                     style="@style/TextAppearance.Medium.Body2"
@@ -104,7 +109,6 @@
                     app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
                     app:layout_constraintLeft_toLeftOf="parent"/>
 
-
                 <TextView
                     android:id="@+id/manga_author"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
@@ -237,67 +241,70 @@
 
         </android.support.v4.widget.NestedScrollView>
 
-        <android.support.v4.widget.NestedScrollView
-            android:id="@+id/description_scrollview"
-            android:layout_width="0dp"
+        <TextView
+            android:id="@+id/manga_summary_label"
+            style="@style/TextAppearance.Medium.Body2"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="8dp"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
+            android:text="@string/description"
+            app:layout_constraintTop_toBottomOf="@+id/guideline"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/guideline">
+            android:textIsSelectable="false"/>
+
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/description_scrollview"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintHeight_default="spread"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/manga_summary_label"
+            app:layout_constraintBottom_toTopOf="@id/manga_genres_tags"
+            >
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/manga_summary_label"
-                    style="@style/TextAppearance.Medium.Body2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/description"
-                    android:textIsSelectable="false"/>
-
                 <TextView
                     android:id="@+id/manga_summary"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textIsSelectable="false"/>
 
             </LinearLayout>
-
         </android.support.v4.widget.NestedScrollView>
 
         <me.gujun.android.taggroup.TagGroup
             android:id="@+id/manga_genres_tags"
             style="@style/TagGroup"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginBottom="16dp"
+            app:layout_constraintHeight_default="spread"
+            app:layout_constraintWidth_default="spread"
             android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="16dp"
-            android:orientation="vertical"
+            android:layout_marginBottom="8dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/description_scrollview"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/description_scrollview"
             app:atg_borderStrokeWidth="1dp"
             app:atg_backgroundColor="@android:color/transparent"
             app:atg_borderColor="@color/md_blue_A400"
             app:atg_textColor="@color/md_blue_A400"
             />
 
-
     </android.support.constraint.ConstraintLayout>
 
 </android.support.v4.widget.SwipeRefreshLayout>