diff --git a/content/controls/common.php b/content/controls/common.php
index 69595d7..9bad246 100644
--- a/content/controls/common.php
+++ b/content/controls/common.php
@@ -117,8 +117,18 @@
         $itemData=$data['item'];
         if (!$itemData)
           $itemData=[];
+        $link=$meta['link'];
+        if ($link){
+          if ($link[0]=='&')
+            $link=substr($link,1);
+          if (($link.'?')[0]!='?')
+            $link="?$link";
+          $link.='&';
+        }else
+          $link='?';
+        $link.='data='.urlencode(json_encode($itemData));
         ?>
-          <a href="<?=$meta['link']?>?data=<?=urlencode(json_encode($itemData))?>"><li class="list-item <?=$meta['class']?>"><?=$itemData[$meta['field-title']]?></li></a>
+          <a href="<?=$link?>"><li class="list-item <?=$meta['class']?>"><?=$itemData[$meta['field-title']]?></li></a>
         <?php
       }
     },
diff --git a/content/pages/admin/dashboard.json b/content/pages/admin/dashboard.json
index b5b235c..7d06ec4 100644
--- a/content/pages/admin/dashboard.json
+++ b/content/pages/admin/dashboard.json
@@ -1,5 +1,4 @@
 {
-    "title": "Bienvenido a Conjuro",
     "layout": "layout-admin",
     "control-libraries": [
         "common",
diff --git a/content/pages/admin/page-edit.json b/content/pages/admin/page-edit.json
new file mode 100644
index 0000000..b4f7183
--- /dev/null
+++ b/content/pages/admin/page-edit.json
@@ -0,0 +1,43 @@
+{
+    "layout": "layout-admin",
+    "controller": [
+        {
+            "module": "admin",
+            "action": "admin-pages-controller"
+        }
+    ],
+    "control-libraries": [
+        "common",
+        "common-admin"
+    ],
+    "auth": [
+        "admin"
+    ],
+    "panel": [
+        {
+            "@": "admin-panel-buttons"
+        }
+    ],
+    "header": [
+        {
+            "@": "admin-title",
+            "title": "Editar página"
+        }
+    ],
+    "body": [
+        {
+            "@": "admin-tile",
+            "content": [
+                {
+                    "@": "list",
+                    "data":"pages",
+                    "item":{
+                        "@":"list-item",
+                        "link":"?page=admin/edit",
+                        "field-title":"name"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/content/pages/admin/pages.json b/content/pages/admin/pages.json
index 04a6a99..33514b8 100644
--- a/content/pages/admin/pages.json
+++ b/content/pages/admin/pages.json
@@ -1,5 +1,4 @@
 {
-    "title": "Bienvenido a Conjuro",
     "layout": "layout-admin",
     "controller": [
         {
@@ -34,7 +33,7 @@
                     "data":"pages",
                     "item":{
                         "@":"list-item",
-                        "link":"?page=admin/edit",
+                        "link":"?page=admin/page-edit",
                         "field-title":"name"
                     }
                 }
diff --git a/content/pages/admin/test.json b/content/pages/admin/test.json
new file mode 100644
index 0000000..cf61129
--- /dev/null
+++ b/content/pages/admin/test.json
@@ -0,0 +1,47 @@
+{
+    "layout": "layout-admin",
+    "control-libraries": [
+        "common",
+        "common-admin"
+    ],
+    "auth": [
+        "admin"
+    ],
+    "panel": [
+        {
+            "@": "admin-panel-buttons"
+        }
+    ],
+    "header": [
+        {
+            "@": "admin-title",
+            "title": "Test - full of Megumin"
+        }
+    ],
+    "body": [
+        {
+            "@": "admin-tile",
+            "html": "<b>Welcome</b> to <span class='conj'>Conjuro!!</span>"
+        },
+        {
+            "@": "img",
+            "class":"center",
+            "src": "media/megumin-bg.gif"
+        },
+        {
+            "@": "img",
+            "class":"center",
+            "src": "media/megumin-pc.gif"
+        },
+        {
+            "@": "img",
+            "class":"center",
+            "src": "media/megumin-seriously-pointing.gif"
+        },
+        {
+            "@": "img",
+            "class":"center",
+            "src": "media/megumin-end.gif"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/content/pages/admin/user-edit.json b/content/pages/admin/user-edit.json
new file mode 100644
index 0000000..983d38c
--- /dev/null
+++ b/content/pages/admin/user-edit.json
@@ -0,0 +1,43 @@
+{
+    "layout": "layout-admin",
+    "controller": [
+        {
+            "module": "admin",
+            "action": "admin-users-controller"
+        }
+    ],
+    "control-libraries": [
+        "common",
+        "common-admin"
+    ],
+    "auth": [
+        "admin"
+    ],
+    "panel": [
+        {
+            "@": "admin-panel-buttons"
+        }
+    ],
+    "header": [
+        {
+            "@": "admin-title",
+            "title": "Editar usuario"
+        }
+    ],
+    "body": [
+        {
+            "@": "admin-tile",
+            "content": [
+                {
+                    "@": "list",
+                    "data":"users",
+                    "item":{
+                        "@":"list-item",
+                        "link":"?page=admin/user-edit",
+                        "field-title":"name"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/content/pages/admin/users.json b/content/pages/admin/users.json
index 34a98d5..75cc710 100644
--- a/content/pages/admin/users.json
+++ b/content/pages/admin/users.json
@@ -1,5 +1,4 @@
 {
-    "title": "Bienvenido a Conjuro",
     "layout": "layout-admin",
     "controller": [
         {