diff --git a/app/build.gradle b/app/build.gradle
index 73a9b19b..b61f2989 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,11 +29,12 @@ android {
 dependencies {
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
     implementation 'com.github.QuadFlask:colorpicker:0.0.13'
-    implementation 'com.github.NudeDude:ZoomImageView:1.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:exifinterface:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.android.support:support-vector-drawable:28.0.0'
     implementation 'com.android.support:design:28.0.0'
+
+    implementation(name:'zoomview', ext:'aar')
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java
index 04f57f15..8ee8a5a5 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java
@@ -64,6 +64,7 @@ public class ImageDetail extends AppCompatActivity implements OnImageClickListen
         int destHeight = (int) (image.getHeight() / ratio);
 
         image = Bitmap.createScaledBitmap(image, 960, destHeight, false);
+        zoomImage.reset();
         zoomImage.setImageBitmap(image);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dm.xml b/app/src/main/res/layout/item_dm.xml
index d1839c35..65cedd5c 100644
--- a/app/src/main/res/layout/item_dm.xml
+++ b/app/src/main/res/layout/item_dm.xml
@@ -87,17 +87,17 @@
 
             <TextView
                 android:id="@+id/dm_answer"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/side_padding"
+                android:layout_marginRight="@dimen/side_padding"
                 android:text="@string/answer"
                 android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/dm_delete"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:text="@string/delete_dm"
                 android:textSize="12sp" />
 
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index 770b51fc..9f240e68 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -33,14 +33,6 @@
                     android:paddingLeft="@dimen/layout_margin"
                     android:paddingRight="@dimen/layout_margin">
 
-                    <TextView
-                        android:id="@+id/answer_reference_detail"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:singleLine="true"
-                        android:textSize="12sp"
-                        android:visibility="gone" />
-
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -62,6 +54,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/layout_margin"
                             android:layout_marginLeft="@dimen/layout_margin"
+                            android:layout_marginBottom="@dimen/layout_margin"
                             android:gravity="center"
                             android:orientation="vertical">
 
@@ -105,6 +98,14 @@
 
                     </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/answer_reference_detail"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:singleLine="true"
+                        android:textSize="12sp"
+                        android:visibility="gone" />
+
                     <TextView
                         android:id="@+id/tweet_detailed"
                         android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index 82c41f25..74a3cd79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,12 @@ allprojects {
     repositories {
         jcenter()
         google()
-        maven { url "https://jitpack.io"}
+        maven { 
+	    url "https://jitpack.io"
+	}
+	flatDir {
+	    dirs 'libs'
+	}
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0db5b331..d6007f26 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
\ No newline at end of file