diff --git a/dbs/myapp.mv.db b/dbs/myapp.mv.db
index 68c4951..baed416 100644
Binary files a/dbs/myapp.mv.db and b/dbs/myapp.mv.db differ
diff --git a/server/services/users/register.post.js b/server/services/users/register.post.js
index 98bcd79..6197209 100644
--- a/server/services/users/register.post.js
+++ b/server/services/users/register.post.js
@@ -34,6 +34,7 @@ if (emailExists != null) {
         'user',
         _val.map()
             .set("name", name)
+            .set("user", username)
             .set("email", email)
             .set("client_user_id", user_id)
             .set("role_id", 1)
diff --git a/server/setup/_end.js b/server/setup/_end.js
index e69de29..07aaa19 100644
--- a/server/setup/_end.js
+++ b/server/setup/_end.js
@@ -0,0 +1,5 @@
+_group.createIfNotExists(
+    _val.map()
+        .set("name", "Generic User")
+        .set("code", "user")
+)
\ No newline at end of file
diff --git a/server/setup/_schema-form-6-user.js b/server/setup/_schema-form-6-user.js
index 3768fb2..50076f3 100644
--- a/server/setup/_schema-form-6-user.js
+++ b/server/setup/_schema-form-6-user.js
@@ -53,7 +53,7 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 6)
+	.set("y", 7)
 )
 _form.createComponentIfNotExists(
 	"e5ec80ac-841c-416d-b73b-dc3ab56dad69",
@@ -83,7 +83,7 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 2)
+	.set("y", 3)
 )
 _form.createComponentIfNotExists(
 	"e5ec80ac-841c-416d-b73b-dc3ab56dad69",
@@ -115,36 +115,6 @@ _form.createComponentIfNotExists(
 	.set("x", 1)
 	.set("y", 1)
 )
-_form.createComponentIfNotExists(
-	"e5ec80ac-841c-416d-b73b-dc3ab56dad69",
-	_val.init()
-	.set("colspan", 0)
-	.set("displayname", "Password")
-	.set("firebase", "")
-	.set("group_id", 0)
-	.set("height", 0)
-	.set("max", 0)
-	.set("min", 0)
-	.set("name", "password")
-	.set("notnull", false)
-	.set("primarykey", false)
-	.set("properties", "{\"MASK_REVERSE\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK\":{\"default\":\"\",\"type\":\"STRING\",\"value\":\"\"}}")
-	.set("rowspan", 0)
-	.set("tdheight", 0)
-	.set("tdwidth", 0)
-	.set("type", "text")
-	.set("uid", "c980e7fa-8435-441c-92b4-b6f3145b54ee")
-	.set("user_id", 0)
-	.set("whenedit", true)
-	.set("whenexport", true)
-	.set("whenfilter", true)
-	.set("whennew", true)
-	.set("whenresult", true)
-	.set("whenview", true)
-	.set("width", 0)
-	.set("x", 1)
-	.set("y", 4)
-)
 _form.createComponentIfNotExists(
 	"e5ec80ac-841c-416d-b73b-dc3ab56dad69",
 	_val.init()
@@ -173,7 +143,7 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 5)
+	.set("y", 6)
 )
 _form.createComponentIfNotExists(
 	"e5ec80ac-841c-416d-b73b-dc3ab56dad69",
@@ -203,5 +173,5 @@ _form.createComponentIfNotExists(
 	.set("whenview", true)
 	.set("width", 0)
 	.set("x", 1)
-	.set("y", 1)
+	.set("y", 2)
 )
diff --git a/website/src/App.js b/website/src/App.js
index a408ca5..00f1379 100644
--- a/website/src/App.js
+++ b/website/src/App.js
@@ -17,9 +17,12 @@ import {
   Redirect
 } from "react-router-dom";
 
+import TopMenuNoAuth from './components/Menu/Top/NoAuth';
+
 import Home from './pages/Home';
 import Login from './pages/Login';
 import Register from './pages/Register';
+import Dashboard from './pages/Dashboard';
 import NotFound from './pages/NotFound';
 
 const { Header, Content, Footer } = Layout;
@@ -30,15 +33,12 @@ export default () => {
   return (
     <Router>
       <Layout>
-        <Header>
-          <Menu mode="horizontal" theme="dark">
-            <Menu.Item><Link to="/">Home</Link></Menu.Item>
-            <Menu.Item><Link to="/login">Login</Link></Menu.Item>
-            <Menu.Item><Link to="/register">Register</Link></Menu.Item>
-          </Menu>
-        </Header>
+        <TopMenuNoAuth />
         <Content>
           <Switch>
+            <Route path="/dashboard">
+              <Dashboard />
+            </Route>
             <Route path="/login">
               <Login />
             </Route>
diff --git a/website/src/pages/dashboard/index.js b/website/src/components/Menu/Side/index.js
similarity index 100%
rename from website/src/pages/dashboard/index.js
rename to website/src/components/Menu/Side/index.js
diff --git a/website/src/pages/dashboard/index.less b/website/src/components/Menu/Side/index.less
similarity index 100%
rename from website/src/pages/dashboard/index.less
rename to website/src/components/Menu/Side/index.less
diff --git a/website/src/components/Menu/Top/Auth/index.js b/website/src/components/Menu/Top/Auth/index.js
new file mode 100644
index 0000000..e69de29
diff --git a/website/src/components/Menu/Top/Auth/index.less b/website/src/components/Menu/Top/Auth/index.less
new file mode 100644
index 0000000..e69de29
diff --git a/website/src/components/Menu/Top/NoAuth/index.js b/website/src/components/Menu/Top/NoAuth/index.js
new file mode 100644
index 0000000..4f823da
--- /dev/null
+++ b/website/src/components/Menu/Top/NoAuth/index.js
@@ -0,0 +1,28 @@
+import React, { userState, useEffect } from 'react';
+
+import { Layout, Menu, Button } from 'antd';
+
+import { Link } from "react-router-dom";
+
+import './index.less';
+
+const topMenuNoAuth = () => {
+
+    const { Header } = Layout;
+
+    return (
+        <Header>
+        <Menu mode="horizontal" theme="dark">
+          <Menu.Item><Link to="/">Home</Link></Menu.Item>
+          <Menu.Item><Link to="/login">Login</Link></Menu.Item>
+          <Menu.Item><Link to="/register">Register</Link></Menu.Item>
+        </Menu>
+      </Header>
+
+    );
+
+}
+
+
+export default topMenuNoAuth;
+
diff --git a/website/src/components/Menu/Top/NoAuth/index.less b/website/src/components/Menu/Top/NoAuth/index.less
new file mode 100644
index 0000000..e69de29
diff --git a/website/src/pages/Dashboard/index.js b/website/src/pages/Dashboard/index.js
new file mode 100644
index 0000000..04a75c4
--- /dev/null
+++ b/website/src/pages/Dashboard/index.js
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import './index.less';
+
+export default () => {
+    return (
+        <main>
+            <h2>DASHBOARD</h2>
+        </main>
+    );
+};
diff --git a/website/src/pages/Dashboard/index.less b/website/src/pages/Dashboard/index.less
new file mode 100644
index 0000000..e69de29