diff --git a/management/mail_log.py b/management/mail_log.py
index 8b68f956..d7bc8408 100755
--- a/management/mail_log.py
+++ b/management/mail_log.py
@@ -42,8 +42,9 @@ def scan_mail_log(logger, env):
 			for date, sender, message in collector["rejected-mail"][k]:
 				logger.print_line(k + "\t" + str(date) + "\t" + sender + "\t" + message)
 
-	logger.add_heading("Other")
-	logger.print_block("Unrecognized services in the log: " + ", ".join(collector["other-services"]))
+	if len(collector["other-services"]) > 0:
+		logger.add_heading("Other")
+		logger.print_block("Unrecognized services in the log: " + ", ".join(collector["other-services"]))
 
 def scan_mail_log_line(line, collector):
 	m = re.match(r"(\S+ \d+ \d+:\d+:\d+) (\S+) (\S+?)(\[\d+\])?: (.*)", line)
diff --git a/management/templates/custom-dns.html b/management/templates/custom-dns.html
index 431465d2..8f0a0217 100644
--- a/management/templates/custom-dns.html
+++ b/management/templates/custom-dns.html
@@ -23,9 +23,9 @@
       <button type="submit" class="btn btn-primary">Update</button>
     </div>
   </div>
-  <div class="form-group">
+  <div id="secondarydns-clear-instructions" class="form-group" style="display: none">
     <div class="col-sm-offset-1 col-sm-11">
-      <p class="small">Clear the box to use the box itself as secondary DNS, which is the default/normal setup.</p>
+      <p class="small">Clear the input field above and click Update to use this machine itself as secondary DNS, which is the default/normal setup.</p>
     </div>
   </div>
 </form>
@@ -76,6 +76,7 @@ function show_custom_dns() {
     { },
     function(data) {
       $('#secondarydnsHostname').val(data.hostname ? data.hostname : '');
+      $('#secondarydns-clear-instructions').toggle(data.hostname != null);
     });
 }
 
@@ -89,6 +90,7 @@ function do_set_secondary_dns() {
     function(data) {
       if (data == "") return; // nothing updated
       show_modal_error("Secondary DNS", $("<pre/>").text(data));
+      $('#secondarydns-clear-instructions').slideDown();
     },
     function(err) {
       show_modal_error("Secondary DNS", $("<pre/>").text(err));
diff --git a/management/templates/index.html b/management/templates/index.html
index d0c0597b..efe80bb1 100644
--- a/management/templates/index.html
+++ b/management/templates/index.html
@@ -81,7 +81,7 @@
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li class="dropdown active">
+            <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">System <b class="caret"></b></a>
               <ul class="dropdown-menu">
                 <li><a href="#system_status" onclick="return show_panel(this);">Status Checks</a></li>
@@ -92,16 +92,15 @@
                 <li><a href="#external_dns" onclick="return show_panel(this);">External DNS</a></li>
               </ul>
             </li>
-            <li class="dropdown active">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mail/Sync <b class="caret"></b></a>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mail <b class="caret"></b></a>
               <ul class="dropdown-menu">
-                <li><a href="#mail-guide" onclick="return show_panel(this);">Mail Instructions</a></li>
-                <li><a href="#sync_guide" onclick="return show_panel(this);">Contacts/Calendar</a></li>
-                <li class="divider"></li>
+                <li><a href="#mail-guide" onclick="return show_panel(this);">Instructions</a></li>
                 <li><a href="#users" onclick="return show_panel(this);">Users</a></li>
                 <li><a href="#aliases" onclick="return show_panel(this);">Aliases</a></li>
               </ul>
             </li>
+            <li><a href="#sync_guide" onclick="return show_panel(this);">Contacts/Calendar</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right">
             <li><a href="#" onclick="do_logout(); return false;" style="color: white">Log out?</a></li>