diff --git a/Conjuro/Builder.php b/Conjuro/Builder.php
deleted file mode 100644
index e37d22a..0000000
--- a/Conjuro/Builder.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-echo "ÑO";
-?>
\ No newline at end of file
diff --git a/content/controls/common-admin.php b/content/controls/common-admin.php
index c6c1e7d..23fd677 100644
--- a/content/controls/common-admin.php
+++ b/content/controls/common-admin.php
@@ -5,12 +5,13 @@
   return [
     new class("admin-title") extends Control{
       protected function renderControl($meta,$data) {
-        c()->rhtml('div',['class'=>'admin-title'],function() use($meta){
-          echo $meta["title"];
-        });
-        c()->rhtml('div',['class'=>'admin-title-right'],function() use($meta){
-          c()->control("icon")->render(['icon'=>'gear','class'=>'btn-ico'],$data);
-        });
+        ?>
+          <div id="<?=$meta['id']?>" class="admin-title <?=$meta['class']?>"><?=$meta["title"]?>
+            <?php if ($meta['left']) foreach($meta['left'] as $child) c()->renderContent($child,$data); ?>
+          </div>
+          <div class="admin-title-right <?=$meta['class']?>">&nbsp;<i class="fa-solid fa-gear btn-ico"></i></div>
+          <div class="clear"></div>
+        <?php
       }
     },
     new class("admin-panel-buttons") extends Control{
diff --git a/content/controls/common.php b/content/controls/common.php
index 9bad246..3844d61 100644
--- a/content/controls/common.php
+++ b/content/controls/common.php
@@ -3,12 +3,19 @@
    * Common control library 0.1 for Conjuro.
    */
   return [
-    new class("html") extends Control{
+    new class('data') extends Control{
       protected function renderControl($meta,$data) {
-        echo $meta["html"];
+        ?>
+        <span id="<?=$meta['id']?>" class="<?=$meta['id']?>"><?=htmlentities($data[$meta['key']])?></span>
+        <?php
       }
     },
-    new class("img") extends Control{
+    new class('html') extends Control{
+      protected function renderControl($meta,$data) {
+        echo $meta['html'];
+      }
+    },
+    new class('img') extends Control{
       protected function renderControl($meta,$data) {
         c()->rhtml(
           'img',
@@ -16,12 +23,12 @@
         );
       }
     },
-    new class("builder") extends Control{
+    new class('builder') extends Control{
       protected function renderControl($meta,$data) {
         include "Conjuro/Builder.php";
       }
     },
-    new class("form") extends Control{
+    new class('form') extends Control{
       protected function renderControl($meta,$data) {
         $cols=$meta['columns'];
         c()->rhtml(
@@ -55,7 +62,7 @@
         );
       }
     },
-    new class("form-data") extends Control{
+    new class('form-data') extends Control{
       protected function renderControl($meta,$data) {
         if ($meta['id']){
           $lid=$meta["id"].'-label';
@@ -77,24 +84,24 @@
         });
       }
     },
-    new class("jump") extends Control{
+    new class('jump') extends Control{
       protected function renderControl($meta,$data) {
         $ctt=$meta["height"];
         echo "<div style='height:$ctt'></div>";
       }
     },
-    new class("icon") extends Control{
+    new class('icon') extends Control{
       protected function renderControl($meta,$data) {
         ?><i class="<?=$meta['class']?> fa-solid fa-<?=$meta['icon']?>"></i><?php
       }
     },
-    new class("table") extends Control{
+    new class('table') extends Control{
       protected function renderControl($meta,$data) {
         ?><table class="tbl <?=$meta['class']?>"><tr><?php
         ?></tr></table><?php
       }
     },
-    new class("list") extends Control{
+    new class('list') extends Control{
       protected function renderControl($meta,$data) {
         $itemData=$data[$meta['data']];
         $itemTemplate=$meta['item'];
@@ -112,7 +119,7 @@
         <?php
       }
     },
-    new class("list-item") extends Control{
+    new class('list-item') extends Control{
       protected function renderControl($meta,$data) {
         $itemData=$data['item'];
         if (!$itemData)
diff --git a/content/modules/Admin.php b/content/modules/Admin.php
index 6e0e1dc..06e5194 100644
--- a/content/modules/Admin.php
+++ b/content/modules/Admin.php
@@ -49,7 +49,7 @@
   }
 
   public function init(){
-    $this->register("get-panel-links",function(){
+    $this->register('get-panel-links',function(){
       return [
         ["title"=>"Dashboard","link"=>"?page=admin/dashboard","icon"=>"gauge"],
         ["title"=>"Users","link"=>"?page=admin/users","icon"=>"user"],
@@ -57,11 +57,20 @@
         ["title"=>"Test","link"=>"?page=admin/test","icon"=>"vial-virus"],
       ];
     });
-    $this->register("admin-pages-controller",function($page){
+    $this->register('controller-page-list',function($page){
       $page->setData('pages',$this->listPages());
     });
-    $this->register("admin-users-controller",function($page){
+    $this->register('controller-page-edit',function($page){
+      $edata=$_GET['data'];
+      //$page->setData('pages',$this->listPages());
+    });
+    $this->register('controller-user-list',function($page){
       $page->setData('users',$this->listUsers());
     });
+    $this->register('controller-user-edit',function($page){
+      $edata=json_decode($_GET['data'],true);
+      $page->setData('user-id',$edata['id']);
+      $page->setData('user-name',$edata['name']);
+    });
   }
 }?>
\ No newline at end of file
diff --git a/content/pages/admin/page-edit.json b/content/pages/admin/page-edit.json
index b4f7183..168d10e 100644
--- a/content/pages/admin/page-edit.json
+++ b/content/pages/admin/page-edit.json
@@ -3,7 +3,7 @@
     "controller": [
         {
             "module": "admin",
-            "action": "admin-pages-controller"
+            "action": "controller-page-edit"
         }
     ],
     "control-libraries": [
diff --git a/content/pages/admin/pages.json b/content/pages/admin/pages.json
index 33514b8..45e6eaf 100644
--- a/content/pages/admin/pages.json
+++ b/content/pages/admin/pages.json
@@ -3,7 +3,7 @@
     "controller": [
         {
             "module": "admin",
-            "action": "admin-pages-controller"
+            "action": "controller-page-list"
         }
     ],
     "control-libraries": [
diff --git a/content/pages/admin/user-edit.json b/content/pages/admin/user-edit.json
index 983d38c..6bfd3e7 100644
--- a/content/pages/admin/user-edit.json
+++ b/content/pages/admin/user-edit.json
@@ -3,7 +3,7 @@
     "controller": [
         {
             "module": "admin",
-            "action": "admin-users-controller"
+            "action": "controller-user-edit"
         }
     ],
     "control-libraries": [
@@ -21,7 +21,13 @@
     "header": [
         {
             "@": "admin-title",
-            "title": "Editar usuario"
+            "title": "Editar usuario",
+            "left": [
+                {
+                    "@": "data",
+                    "key": "user-name"
+                }
+            ]
         }
     ],
     "body": [
@@ -30,11 +36,11 @@
             "content": [
                 {
                     "@": "list",
-                    "data":"users",
-                    "item":{
-                        "@":"list-item",
-                        "link":"?page=admin/user-edit",
-                        "field-title":"name"
+                    "data": "users",
+                    "item": {
+                        "@": "list-item",
+                        "link": "?page=admin/user-edit",
+                        "field-title": "name"
                     }
                 }
             ]
diff --git a/content/pages/admin/users.json b/content/pages/admin/users.json
index 75cc710..a2e589f 100644
--- a/content/pages/admin/users.json
+++ b/content/pages/admin/users.json
@@ -3,7 +3,7 @@
     "controller": [
         {
             "module": "admin",
-            "action": "admin-users-controller"
+            "action": "controller-user-list"
         }
     ],
     "control-libraries": [
diff --git a/media/admin/style.css b/media/admin/style.css
index 8f8303b..90718b8 100644
--- a/media/admin/style.css
+++ b/media/admin/style.css
@@ -164,13 +164,10 @@
 /* Admin title*/
 
 .admin-title{
-    display:inline-block;
-    width: 30%;
+    float:left;
 }
 .admin-title-right{
-    display:inline-block;
-    width: 70%;
-    text-align: right;
+    float:right;
 }
 
 /* Admin tile*/