diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 708555ed5..a7d98f69e 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -1477,9 +1477,12 @@ class AnkiQt(QMainWindow):
         ret = self.deck.fixIntegrity()
         if ret == "ok":
             ret = _("""\
-No problems found. Some data structures have been rebuilt in case
-they were causing problems. On the next sync, all cards will be
-sent to the server.""")
+No problems found. Some data structures have been rebuilt in case<br>
+they were causing problems.<p>
+<b>On the next sync, all cards will be sent to the server.</b><br>
+If you have changes on the server and have not synced locally,<br>
+do not sync your deck. Restore your deck from an automatic<br>
+backup and then run this command again after syncing.""")
             ui.utils.showInfo(ret)
             ret = True
         else:
diff --git a/designer/main.ui b/designer/main.ui
index bc8d38005..75a8f2547 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -460,12 +460,11 @@
     <property name="title" >
      <string>&amp;Advanced</string>
     </property>
-    <addaction name="actionMergeModels" />
-    <addaction name="separator" />
-    <addaction name="actionCheckMediaDatabase" />
-    <addaction name="separator" />
     <addaction name="actionCheckDatabaseIntegrity" />
+    <addaction name="actionCheckMediaDatabase" />
     <addaction name="actionOptimizeDatabase" />
+    <addaction name="separator" />
+    <addaction name="actionMergeModels" />
    </widget>
    <widget class="QMenu" name="menuPlugins" >
     <property name="title" >
@@ -911,7 +910,7 @@
      <normaloff>:/icons/sqlitebrowser.png</normaloff>:/icons/sqlitebrowser.png</iconset>
    </property>
    <property name="text" >
-    <string>Check Database Integrity</string>
+    <string>Check Database..</string>
    </property>
   </action>
   <action name="actionOptimizeDatabase" >