diff --git a/Conjuro/Conjuro.php b/Conjuro/Conjuro.php
index 984b468..637dd56 100644
--- a/Conjuro/Conjuro.php
+++ b/Conjuro/Conjuro.php
@@ -36,7 +36,10 @@
       $this->conf=$conf;
       //$this->loadControls();
     }
-  
+
+    ///////////////////////////////////////////////////// DATABASE TOOLS
+    ////////////////////////////////////////////////////////////////////
+
     // Return data from database
     public function DBget($type,$key=""){
       if ($key!="")
@@ -125,9 +128,9 @@
     }
 
     // Database
-    public function db(){
+    private function db(){
       if(!isset($this->db))
-        $this->db=new DB($conf);
+        $this->db=new DB($this->conf);
       return $this->db;
     }
 
@@ -137,6 +140,40 @@
       return json_decode($json, true);
     }
 
+    /////////////////////////////////////////////////////////////// AUTH
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Process the login information.
+     */
+    public function login($usr,$pwd){
+      $_SESSION['user']=null; // Reset previous login if any
+      $usr=strtolower($usr);
+      $user=$this->db()->selectOne('users',null,'where user=? and pass=sha1(?) and active=true','ss',$usr,$pwd);
+      $user['user']=strtolower($user['user']);      
+      if ($user)
+        return $_SESSION['user']=$user;
+      // Check for bootstrap/recover users
+      foreach($this->conf['bootusers'] as $buser){
+        if (strtolower($buser[0])==$usr && $buser[1]==$pwd)
+          return $_SESSION['user']=['user'=>strtolower($buser[0]),'name'=>$buser[0]];
+      }
+    }
+
+    /**
+     * Checks the current login information
+     */
+    public function checkLogin(){
+      if ($_SESSION['user']) // refresh user data
+        return $_SESSION['user']=$this->db()->selectOne('users',null,'where id=? and active=true','i',$_SESSION['user']['id']);
+      // Check for bootstrap/recover users
+      foreach($this->conf['bootusers'] as $buser){
+        if (strtolower($buser[0])==$_SESSION['user']['user'])
+          return $_SESSION['user']=['user'=>strtolower($buser[0]),'name'=>$buser[0]];
+      }
+      $_SESSION['user']=null; //Drop session if not found anymore
+    }
+
     //////////////////////////////////////////////////// MODULE HANDLING
     ////////////////////////////////////////////////////////////////////
 
diff --git a/content/controls/common.php b/content/controls/common.php
index f2a3403..00f04b3 100644
--- a/content/controls/common.php
+++ b/content/controls/common.php
@@ -23,22 +23,32 @@
     },
     new class("form") extends Control{
       protected function renderControl($meta,$data) {
-        $cols=$meta["columns"];
+        $cols=$meta['columns'];
         c()->rhtml(
           'form',
-          ['id'=>$meta['id'],'class'=>$meta['class']],
+          ['id'=>$meta['id'],'class'=>$meta['class'],'action'=>$meta['action'],'method'=>$meta['method']],
           fn()=>c()->rhtml(
             'table',
             ['class'=>'form-body-table'],
-            function() use($meta,$data){
+            function() use($meta,$data,$cols){
               echo '<tr>';
               $col=0;
               foreach($meta['childs'] as $child){
                 c()->renderContent($child,$data);
-                if($col++>=$cols){
+                if(++$col>=$cols){
                   echo '</tr><tr>';
                 }
               }
+              if ($meta['accept']||$meta['reset']){ //Buttons}
+                if ($col!=0)
+                  echo '</tr><tr>';
+                echo '<td colspan='.($cols*2).' class="form-body-buttons">';
+                if ($meta['accept'])
+                  c()->rhtml('input',['type'=>'submit','value'=>$meta['accept']]);
+                if ($meta['reset'])
+                  c()->rhtml('input',['type'=>'reset','value'=>$meta['reset']]);
+                echo '</td>';
+            }
               echo '</tr>';
             }
           )
@@ -52,7 +62,25 @@
           $vid=$meta["id"].'-value';
         }
         c()->rhtml('td',['id'=>$lid,'class'=>'form-data-label '.$meta["class"]],fn()=>print(htmlentities($meta["label"])));
-        c()->rhtml('td',['id'=>$vid,'class'=>'form-data-value '.$meta["class"]]);
+        c()->rhtml('td',['id'=>$vid,'class'=>'form-data-value '.$meta["class"]],function() use($meta,$data){
+          $type=$meta['type'];
+          if (!$type)
+            $type='input';
+          switch($type){
+            case 'input':
+              echo c()->htmlopen('input',['id'=>$meta['id'],'name'=>$meta['id']]);
+              break;
+            case 'password':
+              echo c()->htmlopen('input',['id'=>$meta['id'],'name'=>$meta['id'],'type'=>'password']);
+              break;
+            }
+        });
+      }
+    },
+    new class("jump") extends Control{
+      protected function renderControl($meta,$data) {
+        $ctt=$meta["height"];
+        echo "<div style='height:$ctt'></div>";
       }
     }
   ];
diff --git a/content/fragment/layout-admin.php b/content/fragment/layout-admin.php
index 9a5a3db..a8b04e9 100644
--- a/content/fragment/layout-admin.php
+++ b/content/fragment/layout-admin.php
@@ -10,12 +10,12 @@
 <body>
 <div id="panel">
     <div id="panel-title"><img src="media/conjuro-logo-400.png"></div>
-    <div id="panel-user"><?=$this->data("username")?></div>
-    <div id="panel-content"><?php $this->showContent("panel");?></div>
+    <div id="panel-user"><?=$this->data('username')?> <a href="?logout=yes&page=index"><i class="fa-solid fa-right-from-bracket"></i></a></div>
+    <div id="panel-content"><?php $this->showContent('panel');?></div>
 </div>
 <div id="content">
-    <div id="content-header"><?php $this->showContent("header");?></div>
-    <div id="content-body"><?php $this->showContent("body");?></div>
+    <div id="content-header"><?php $this->showContent('header');?></div>
+    <div id="content-body"><?php $this->showContent('body');?></div>
 </div>
 <div id="footer">
 (C) XWolf 2022-2023
diff --git a/content/modules/Page.php b/content/modules/Page.php
index 2d05b2d..f35261d 100644
--- a/content/modules/Page.php
+++ b/content/modules/Page.php
@@ -67,7 +67,23 @@
    * Return the value defined for a page meta key
    */
   public function data($name){
-    return "{{$name}}";//$this->data[$name];
+    if (isset($this->data[$name]))
+      return $this->data[$name];      
+    return "{{$name}}";
+  }
+
+  /**
+   * Sets the data dictionary of the page
+   */
+  public function setData($datablock){
+    $this->data=$datablock;
+  }
+
+  /**
+   * Gets the data dictionary of the page
+   */
+  public function getData(){
+    return $this->data;
   }
 
   /**
@@ -75,10 +91,13 @@
    */
   public function showContent($name){
     if (isset($this->meta[$name])){
-      c()->renderContent($this->meta[$name],[]);
+      c()->renderContent($this->meta[$name],$this->data);
     }
   }
 
+  /**
+   * Prepare page (load dependencies if any)
+   */
   public function prepare(){
     if(isset($this->meta["control-libraries"])){
       foreach($this->meta["control-libraries"] as $clib){
@@ -87,6 +106,9 @@
     }
   }
   
+  /**
+   * Page needs authorization of any kind
+   */
   public function needAuth(){
     return isset($this->meta["auth"]);
   }
@@ -118,10 +140,14 @@
     $this->processRequest();
     $page=$this->getPage($this->currentPage());
     if ($page->needAuth() && !$_SESSION['user']){
-      //TODO Goes to Auth module
       $page=$this->getPage($this->conf["login-page"]);
     }
+    $data=$_SESSION['data'];
+    $data['username']=$_SESSION['user']['name'];
+    $data['userid']=$_SESSION['user']['id'];    
+    $page->setData($data);
     $page->showPage();
+    $_SESSION['data']=$page->getData();
   }
 
   //Loads page meta from page name (id)
@@ -132,6 +158,8 @@
   }
 
   private function processRequest(){
+    if ($_GET['logout']=='yes')
+      session_destroy();
     // Current page
     if (isset($_GET["page"]))
       $this->page=$_GET["page"];
@@ -140,18 +168,11 @@
     else
       $this->page=$this->conf["index-page"];
     $_SESSION["page"]=$this->page;
-    // Session (TODO: Goes to Auth Module)
+    // Session
     if ($_POST['user'])
-      $_SESSION['user']=$this->doLogin($_POST['user'],$_POST['pwd']);
-    else if ($_SESSION['user']) // refresh user data
-      $_SESSION['user']=$this->db->selectOne('users',null,'where user=?','s',$_SESSION['user']['user']);
-    if ($_GET['logout']=='yes')
-      session_reset();
-  }
-
-  //TODO Goes to Auth module
-  private function doLogin($user,$access){
-    return $this->db->selectOne("users",null,'where user=? and pass=sha1(?)','ss',$user,$access);
+      c()->login($_POST['user'],$_POST['pwd']);
+    else
+      c()->checkLogin();
   }
   
   // Get current selected page
diff --git a/content/pages/login.json b/content/pages/login.json
index 99f7a93..4c7838b 100644
--- a/content/pages/login.json
+++ b/content/pages/login.json
@@ -12,8 +12,14 @@
     ],
     "body": [
         {
+            "@": "jump",
+            "height": "2rem"
+        },
+        {
             "@": "form",
             "id": "login",
+            "method":"post",
+            "action":"?page=admin/dashboard",
             "columns": 1,
             "childs": [
                 {
@@ -30,7 +36,8 @@
                     "type": "password",
                     "key": "userPass"
                 }
-            ]
+            ],
+            "accept":"Ok"
         }
     ]
 }
\ No newline at end of file
diff --git a/media/admin/style.css b/media/admin/style.css
index 2d90fde..4971975 100644
--- a/media/admin/style.css
+++ b/media/admin/style.css
@@ -1,5 +1,6 @@
 :root {
     --color-text: #333333;
+    --color-text-highlight: #5a5a5a;
     --color-text-logo: #838ea8;
 }
 
@@ -77,6 +78,15 @@
     padding: 0.5rem;
 }
 
+a,
+a:visited {
+    color: var(--color-text);
+}
+
+a:hover {
+    color: var(--color-text-highlight);
+}
+
 /* Admin-Panel */
 .admin-panel-button {
     padding: 0.5rem 0;
diff --git a/media/style.css b/media/style.css
index 2b9d4d2..5a528b3 100644
--- a/media/style.css
+++ b/media/style.css
@@ -1,24 +1,33 @@
-/* Layout */
-html, body{
-    margin:0;
-    font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
-    width:100%;
-    height:100%;
+:root {
+    --color-text: #333333;
+    --color-text-highlight: #5a5a5a;
+    --color-text-logo: #838ea8;
 }
-html{
+
+/* Layout */
+html,
+body {
+    margin: 0;
+    font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+    width: 100%;
+    height: 100%;
+}
+
+html {
     background-color: #e9edf1;
     font-size: 16px;
 }
-body{
+
+body {
     max-width: 900px;
     margin: 0 auto;
-    position:relative;
+    position: relative;
     overflow: hidden;
 }
 
-#header{
+#header {
     background-color: #4e6d8a;
-    color:white;
+    color: white;
     overflow: hidden;
     text-align: center;
     width: 100%;
@@ -27,49 +36,77 @@
     line-height: 60px;
 }
 
-#footer{
+#footer {
     position: absolute;
-    bottom:0;
+    bottom: 0;
     background-color: #8fa5b9;
     text-align: right;
-    font-size:16px;
+    font-size: 16px;
     font-weight: bold;
     width: 100%;
     line-height: 24px;
-    color:white;
+    color: white;
 }
 
-#content{
+#content {
     background-color: white;
-    width:100%;
-    height:100%;
-    margin-bottom:84px;
-    border-bottom:1px sold tomato;
+    width: 100%;
+    height: 100%;
+    margin-bottom: 84px;
+    border-bottom: 1px sold tomato;
+}
+
+a,
+a:visited {
+    color: var(--color-text);
+}
+
+a:hover {
+    color: var(--color-text-highlight);
+}
+
+/* Forms */
+.form-body-table {
+    padding: 0.5rem;
+    margin: 0 auto;
+    background-color: white;
+    background-image: linear-gradient(#e6eff7, white);
+    background-repeat: no-repeat;
+    background-size: 100% 1rem;
+    border-radius: 0.5rem;
+    box-shadow: 0 0 0.5rem #0000006c;
+}
+
+.form-body-buttons {
+    text-align: right;
 }
 
 /* Sections */
 
-div.section{
-    padding:4px 32px;
-}
-div.section>h2{
-    text-align:center;
-    text-decoration: underline;
-    padding-top:16px;
-    padding-bottom:5px;
-    font-size: 24px;
-    margin:0;
-}
-div.section>div{
-    margin:0 auto;
+div.section {
+    padding: 4px 32px;
 }
 
-table.form{
-    margin:0 auto;
+div.section>h2 {
+    text-align: center;
+    text-decoration: underline;
+    padding-top: 16px;
+    padding-bottom: 5px;
+    font-size: 24px;
+    margin: 0;
+}
+
+div.section>div {
+    margin: 0 auto;
+}
+
+table.form {
+    margin: 0 auto;
     border-collapse: collapse;
 }
-table.form td{
-    padding:2px 5px;
+
+table.form td {
+    padding: 2px 5px;
     border-bottom: 1px solid #f5f5f5;
     font-size: 16px;
-}
+}
\ No newline at end of file