diff --git a/frontend/resources/templates/index.mustache b/frontend/resources/templates/index.mustache
index 1b8e1a80c..99d48366f 100644
--- a/frontend/resources/templates/index.mustache
+++ b/frontend/resources/templates/index.mustache
@@ -4,14 +4,12 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <title>UXBOX - The Open-Source prototyping tool</title>
-    <link id="theme" href="/css/main-{{& th}}.css?ts={{& ts}}" rel="stylesheet" type="text/css" />
+    <link id="theme" href="/css/main-{{& th}}.css?ts={{& ts}}" 
+          rel="stylesheet" type="text/css" />
     <link rel="icon" href="/images/favicon.png" />
-    <!-- <link rel="preload" as="image" type="image/svg+xml" -->
-    <!--       href="/images/svg-sprite/symbol/svg/sprite.symbol.svg" /> -->
   </head>
   <body>
     <section id="app" tabindex="1"></section>
-    <section id="loader"></section>
     <section id="modal"></section>
     <script>
       window.uxboxConfig = JSON.parse({{& config }});
diff --git a/frontend/resources/templates/view.mustache b/frontend/resources/templates/view.mustache
deleted file mode 100644
index 5b6a601fa..000000000
--- a/frontend/resources/templates/view.mustache
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>UXBOX View</title>
-    <link href="/css/view-{{& th}}.css?ts={{& ts}}" rel="stylesheet" type="text/css" />
-    <link rel="icon" href="/images/favicon.png" />
-  </head>
-  <body>
-    <section id="app" tabindex="1"></section>
-    <section id="loader"></section>
-    <section id="modal"></section>
-    <script>
-      window.uxboxConfig = JSON.parse({{& config }});
-      window.uxboxTranslations = JSON.parse({{& translations }});
-    </script>
-    <script src="/js/shared.js?ts={{& ts}}"></script>
-    <script src="/js/view.js?ts={{& ts}}"></script>
-    <script>uxbox.view.init()</script>
-  </body>
-</html>
diff --git a/frontend/src/uxbox/main.cljs b/frontend/src/uxbox/main.cljs
index 0e18738c8..4b9cc223e 100644
--- a/frontend/src/uxbox/main.cljs
+++ b/frontend/src/uxbox/main.cljs
@@ -18,7 +18,6 @@
    [uxbox.main.store :as st]
    [uxbox.main.ui :as ui]
    [uxbox.main.ui.modal :refer [modal]]
-   [uxbox.main.ui.loader :refer [loader]]
    [uxbox.main.worker]
    [uxbox.util.dom :as dom]
    [uxbox.util.html.history :as html-history]
@@ -32,14 +31,17 @@
 
 (defn- on-navigate
   [router path]
-  (let [match (rt/match router path)]
-    (cond
-      (and (= path "") (:auth storage))
-      (st/emit! (rt/nav :dashboard-projects))
+  (let [match (rt/match router path)
+        profile (:profile storage)]
+    (prn "on-navigate" match path)
 
-      (and (= path "") (not (:auth storage)))
+    (cond
+      (and (= path "") (not profile))
       (st/emit! (rt/nav :login))
 
+      (and (= path "") profile)
+      (st/emit! (rt/nav :dashboard-team {:team-id (:default-team-id profile)}))
+
       (nil? match)
       (st/emit! (rt/nav :not-found))
 
@@ -59,19 +61,15 @@
 
     (mf/mount (mf/element ui/app) (dom/get-element "app"))
     (mf/mount (mf/element modal) (dom/get-element "modal"))
-    (mf/mount (mf/element loader) (dom/get-element "loader"))
 
     (on-navigate router cpath)))
 
-(def app-sym (.for js/Symbol "uxbox.app"))
-
 (defn ^:export init
   []
   (let [translations (gobj/get goog.global "uxboxTranslations")
         themes (gobj/get goog.global "uxboxThemes")]
     (i18n/init! translations)
     (theme/init! themes)
-    (unchecked-set js/window app-sym "main")
     (st/init)
     (init-ui)))
 
@@ -80,11 +78,9 @@
   (remove-watch html-history/path ::main)
   (mf/unmount (dom/get-element "app"))
   (mf/unmount (dom/get-element "modal"))
-  (mf/unmount (dom/get-element "loader"))
   (init-ui))
 
 (defn ^:dev/after-load after-load
   []
-  (when (= "main" (unchecked-get js/window app-sym))
-    (reinit)))
+  (reinit))
 
