diff --git a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java
index c15d04fc..7072bbbb 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentEditActivity.java
@@ -101,7 +101,7 @@ public class DocumentEditActivity extends AppCompatActivity {
             finish();
             return;
         }
-        JSONArray tagArray = tags.optJSONArray("stats");
+        JSONArray tagArray = tags.optJSONArray("tags");
 
         List<JSONObject> tagList = new ArrayList<>();
         for (int i = 0; i < tagArray.length(); i++) {
diff --git a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
index ec38eae4..46a17f55 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentViewActivity.java
@@ -642,10 +642,10 @@ public class DocumentViewActivity extends AppCompatActivity {
                 }
 
                 // Action only available if the document is writable
-                findViewById(R.id.actionEditDocument).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
-                findViewById(R.id.actionUploadFile).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
-                findViewById(R.id.actionSharing).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
-                findViewById(R.id.actionDelete).setVisibility(writable ? View.VISIBLE : View.INVISIBLE);
+                findViewById(R.id.actionEditDocument).setVisibility(writable ? View.VISIBLE : View.GONE);
+                findViewById(R.id.actionUploadFile).setVisibility(writable ? View.VISIBLE : View.GONE);
+                findViewById(R.id.actionSharing).setVisibility(writable ? View.VISIBLE : View.GONE);
+                findViewById(R.id.actionDelete).setVisibility(writable ? View.VISIBLE : View.GONE);
 
                 // ACLs
                 ListView aclListView = (ListView) findViewById(R.id.aclListView);
diff --git a/docs-android/app/src/main/java/com/sismics/docs/fragment/SearchFragment.java b/docs-android/app/src/main/java/com/sismics/docs/fragment/SearchFragment.java
index a1e8cadb..cc55d3a5 100644
--- a/docs-android/app/src/main/java/com/sismics/docs/fragment/SearchFragment.java
+++ b/docs-android/app/src/main/java/com/sismics/docs/fragment/SearchFragment.java
@@ -73,7 +73,7 @@ public class SearchFragment extends DialogFragment {
             dialog.cancel();
             return dialog;
         }
-        JSONArray tagArray = tags.optJSONArray("stats");
+        JSONArray tagArray = tags.optJSONArray("tags");
 
         List<JSONObject> tagList = new ArrayList<>();
         for (int i = 0; i < tagArray.length(); i++) {
diff --git a/docs-android/app/src/main/res/layout/document_view_activity.xml b/docs-android/app/src/main/res/layout/document_view_activity.xml
index 13c3e0f3..0068dceb 100644
--- a/docs-android/app/src/main/res/layout/document_view_activity.xml
+++ b/docs-android/app/src/main/res/layout/document_view_activity.xml
@@ -166,28 +166,6 @@
                 android:orientation="horizontal"
                 style="?android:buttonBarStyle">
 
-                <Button
-                    android:id="@+id/actionEditDocument"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_create_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/edit_document"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
-
-                <Button
-                    android:id="@+id/actionUploadFile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_file_upload_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/upload_file"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="8dp"/>
-
                 <Button
                     android:id="@+id/actionDownload"
                     android:layout_width="wrap_content"
@@ -199,6 +177,28 @@
                     android:textAllCaps="false"
                     android:layout_margin="8dp"/>
 
+                <Button
+                    android:id="@+id/actionExportPdf"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_description_grey600_24dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:text="@string/export_pdf"
+                    android:textColor="#ff5a595b"
+                    android:textAllCaps="false"
+                    android:layout_margin="8dp"/>
+
+                <Button
+                    android:id="@+id/actionAuditLog"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_assignment_grey600_24dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:text="@string/activity"
+                    android:textColor="#ff5a595b"
+                    android:textAllCaps="false"
+                    android:layout_margin="8dp"/>
+
             </LinearLayout>
 
             <LinearLayout
@@ -208,12 +208,23 @@
                 style="?android:buttonBarStyle">
 
                 <Button
-                    android:id="@+id/actionExportPdf"
+                    android:id="@+id/actionEditDocument"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_description_grey600_24dp"
+                    android:drawableTop="@drawable/ic_create_grey600_24dp"
                     style="?android:buttonBarButtonStyle"
-                    android:text="@string/export_pdf"
+                    android:text="@string/edit_document"
+                    android:textColor="#ff5a595b"
+                    android:textAllCaps="false"
+                    android:layout_margin="0dp"/>
+
+                <Button
+                    android:id="@+id/actionUploadFile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_file_upload_grey600_24dp"
+                    style="?android:buttonBarButtonStyle"
+                    android:text="@string/upload_file"
                     android:textColor="#ff5a595b"
                     android:textAllCaps="false"
                     android:layout_margin="0dp"/>
@@ -229,17 +240,6 @@
                     android:textAllCaps="false"
                     android:layout_margin="0dp"/>
 
-                <Button
-                    android:id="@+id/actionAuditLog"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_assignment_grey600_24dp"
-                    style="?android:buttonBarButtonStyle"
-                    android:text="@string/activity"
-                    android:textColor="#ff5a595b"
-                    android:textAllCaps="false"
-                    android:layout_margin="0dp"/>
-
                 <Button
                     android:id="@+id/actionDelete"
                     android:layout_width="wrap_content"
diff --git a/docs-android/gradle.properties b/docs-android/gradle.properties
index 5d08ba75..0bbecbc9 100644
--- a/docs-android/gradle.properties
+++ b/docs-android/gradle.properties
@@ -12,6 +12,8 @@
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
+org.gradle.jvmargs=-Xmx3072m
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects