diff --git a/app.tag b/app.tag
index 249e7c0..98c9f78 100644
--- a/app.tag
+++ b/app.tag
@@ -30,12 +30,10 @@
           }
           break;
         case 'home':
-          if (catalog.display) {
-            catalog.display();
+          if (registryUI.catalog.display) {
+            registryUI.catalog.display();
           }
           break;
-        default:
-
       }
     })
     this.router.start();
diff --git a/catalog.tag b/catalog.tag
index 1902519..2f44473 100644
--- a/catalog.tag
+++ b/catalog.tag
@@ -21,9 +21,9 @@
       <div class="mdl-card__title">
         <h2 class="mdl-card__title-text">Repositories of { registryUI.url() }</h2>
       </div>
-      <div id="catalog-spinner" style="{ catalog.loadend ? 'display:none;': '' }" class="mdl-spinner mdl-js-spinner is-active section-centerd"></div>
+      <div id="catalog-spinner" style="{ registryUI.catalog.loadend ? 'display:none;': '' }" class="mdl-spinner mdl-js-spinner is-active section-centerd"></div>
       <ul class="mdl-list">
-        <li class="mdl-list__item mdl-menu__item" style="opacity: 1;" each="{ item in catalog.repositories }" onclick="catalog.go('{item}');">
+        <li class="mdl-list__item mdl-menu__item" style="opacity: 1;" each="{ item in registryUI.catalog.repositories }" onclick="registryUI.catalog.go('{item}');">
           <span class="mdl-list__item-primary-content">
             <i class="material-icons mdl-list__item-icon">send</i>
             { item }
@@ -38,16 +38,15 @@
   </div>
 
   <script>
-    catalog.instance = this;
+    registryUI.catalog.instance = this;
     this.mixin('rg.router');
-    catalog.display = function () {
-      registryUI.content = 'catalog';
+    registryUI.catalog.display = function () {
       var oReq = new XMLHttpRequest();
-      catalog.createSnackbar = function (msg) {
+      registryUI.catalog.createSnackbar = function (msg) {
         var snackbar = document.querySelector('#error-snackbar');
-        catalog.error = msg;
+        registryUI.catalog.error = msg;
         var data = {
-          message: catalog.error,
+          message: registryUI.catalog.error,
           timeout: 100000,
           actionHandler: function () {
             snackbar.classList.remove('mdl-snackbar--active');
@@ -58,19 +57,19 @@
       };
       oReq.addEventListener('load', function () {
         if (this.status == 200) {
-          catalog.repositories = JSON.parse(this.responseText).repositories.sort();
+          registryUI.catalog.repositories = JSON.parse(this.responseText).repositories.sort();
         } else if (this.status == 404) {
-          catalog.createSnackbar('Server not found');
+          registryUI.catalog.createSnackbar('Server not found');
         } else {
-          catalog.createSnackbar(this.responseText);
+          registryUI.catalog.createSnackbar(this.responseText);
         }
       });
       oReq.addEventListener('error', function () {
-        catalog.createSnackbar('An error occured');
+        registryUI.catalog.createSnackbar('An error occured');
       });
       oReq.addEventListener('loadend', function () {
-        catalog.loadend = true;
-        catalog.instance.update();
+        registryUI.catalog.loadend = true;
+        registryUI.catalog.instance.update();
       });
       oReq.open('GET', registryUI.url() + '/v2/_catalog');
       oReq.withCredentials = false;
@@ -79,13 +78,13 @@
     this.on('updated', function () {
       componentHandler.upgradeElements(this['catalog-tag']);
     });
-    catalog.go = function (image) {
+    registryUI.catalog.go = function (image) {
       rg.router.go('taglist', {
         repository: image.split('/')[0],
         image: image.split('/')[1]
       });
     };
-    catalog.display();
+    registryUI.catalog.display();
   </script>
   <!-- End of tag -->
 </catalog>
diff --git a/script.js b/script.js
index ba579b8..ad987b0 100644
--- a/script.js
+++ b/script.js
@@ -46,10 +46,9 @@ registryUI.changeServer = function(url) {
   }
   registryServer.splice(index, 1);
   registryServer = [url].concat(registryServer);
-  registryUI.registryServer.servers = registryServer;
   localStorage.setItem('registryServer', JSON.stringify(registryServer));
 }
-var catalog = {};
+registryUI.catalog = {};
 registryUI.taglist = {};
 
 riot.mount('catalog');
diff --git a/taglist.tag b/taglist.tag
index 371505d..ee0f0c1 100644
--- a/taglist.tag
+++ b/taglist.tag
@@ -53,7 +53,6 @@
         name = rg.router.current.params.repository + (rg.router.current.params.image
           ? '/' + rg.router.current.params.image
           : '');
-        registryUI.content = 'taglist';
         var oReq = new XMLHttpRequest();
         registryUI.taglist.name = name;
         registryUI.taglist.createSnackbar = function (msg) {