diff --git a/src/tags/catalog.tag b/src/tags/catalog.tag
index 71fe6c8..c5cfe03 100644
--- a/src/tags/catalog.tag
+++ b/src/tags/catalog.tag
@@ -17,7 +17,9 @@
 <catalog>
   <!-- Begin of tag -->
   <material-card ref="catalog-tag" class="catalog">
-    <h2>Repositories of { registryUI.url() }</h2>
+    <div class="material-card-title-action">
+      <h2>Repositories of { registryUI.url() }</h2>
+    </div>
     <div hide="{ registryUI.catalog.loadend }" class="spinner-wrapper">
       <material-spinner></material-spinner>
     </div>
@@ -56,8 +58,6 @@
       oReq.open('GET', registryUI.url() + '/v2/_catalog');
       oReq.send();
     };
-    this.on('updated', function () {
-    });
     registryUI.catalog.go = function (image) {
       rg.router.go('taglist', {
         repository: image.split('/')[0],
diff --git a/src/tags/menu.tag b/src/tags/menu.tag
index 368b1af..915985f 100644
--- a/src/tags/menu.tag
+++ b/src/tags/menu.tag
@@ -23,11 +23,11 @@
     <p onclick="registryUI.changeTag.show(); registryUI.menuTag.close();">Change URL</p>
     <p onclick="registryUI.removeTag.show(); registryUI.menuTag.close();">Remove URL</p>
   </material-dropdown>
-  <div class="overlay" onclick="registryUI.menuTag.close();" show="{ registryUI.menuTag.isOpen() }"></div>
+  <div class="overlay" onclick="registryUI.menuTag.close();" show="{ registryUI.menuTag.isOpen && registryUI.menuTag.isOpen() }"></div>
   <script type="text/javascript">
     registryUI.menuTag = registryUI.menuTag || {};
     registryUI.menuTag.update = this.update;
-    this.on('mount', function(args) {
+    this.one('mount', function(args) {
       var self = this;
       registryUI.menuTag.close = function() {
         self.tags['material-dropdown'].close();