diff --git a/src/admin/activities/datatable.html b/src/admin/activities/datatable.html
index 3d6435ed..538ebe0b 100644
--- a/src/admin/activities/datatable.html
+++ b/src/admin/activities/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/apikeys/datatable.html b/src/admin/apikeys/datatable.html
index d9e486f5..c8c02975 100644
--- a/src/admin/apikeys/datatable.html
+++ b/src/admin/apikeys/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/apikeys/form.html b/src/admin/apikeys/form.html
index 4bdfe981..6f97e33d 100644
--- a/src/admin/apikeys/form.html
+++ b/src/admin/apikeys/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/blocks/datatable.html b/src/admin/blocks/datatable.html
index 359ba9eb..d250aa51 100644
--- a/src/admin/blocks/datatable.html
+++ b/src/admin/blocks/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/blocks/form.html b/src/admin/blocks/form.html
index 1ea37a25..2902cebf 100644
--- a/src/admin/blocks/form.html
+++ b/src/admin/blocks/form.html
@@ -27,7 +27,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/blog/datatable.html b/src/admin/blog/datatable.html
index 18e89770..cf6c95bf 100644
--- a/src/admin/blog/datatable.html
+++ b/src/admin/blog/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/blog/form.html b/src/admin/blog/form.html
index a7c488c4..3d1e5d8b 100644
--- a/src/admin/blog/form.html
+++ b/src/admin/blog/form.html
@@ -27,7 +27,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/builder/components/settings.html b/src/admin/builder/components/settings.html
index a4d3e1b8..5fc9cf6f 100644
--- a/src/admin/builder/components/settings.html
+++ b/src/admin/builder/components/settings.html
@@ -28,7 +28,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/builder/index.html b/src/admin/builder/index.html
index 3be1e294..a82100ec 100644
--- a/src/admin/builder/index.html
+++ b/src/admin/builder/index.html
@@ -51,7 +51,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Save and Make live -->
                 <li class="margin-right:15px">
diff --git a/src/admin/calendar/form.html b/src/admin/calendar/form.html
index c19c17ac..dc1e3530 100644
--- a/src/admin/calendar/form.html
+++ b/src/admin/calendar/form.html
@@ -25,7 +25,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/calendar/index.html b/src/admin/calendar/index.html
index ed348cdf..1e437931 100644
--- a/src/admin/calendar/index.html
+++ b/src/admin/calendar/index.html
@@ -51,7 +51,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/call-center/index.html b/src/admin/call-center/index.html
index 9c2de744..6d8b3d21 100644
--- a/src/admin/call-center/index.html
+++ b/src/admin/call-center/index.html
@@ -38,7 +38,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
@@ -115,7 +115,7 @@
                                   	  <img src="images/Velazquez.jpg" onerror="this.style.display='none'"/>
                                   	</span>
                                 </a>
-                                <div class="avatar-status sessionUser_Id" collection="users" document_id="" user-status='{"name":"status"}'></div>
+                                <div class="avatar-status" collection="users" document_id="{{userId}}" user-status='{"name":"status"}'></div>
                             </div>
 
                             <!-- Call Details -->
@@ -297,7 +297,7 @@
                                           	  <img src="images/Velazquez.jpg" onerror="this.style.display='none'"/>
                                           	</span>
                                         </a>
-                                            <!--<div class="avatar-status sessionUser_Id" collection="users" document_id="" user-status='{"name":"status"}'></div>-->
+                                            <!--<div class="avatar-status " collection="users" document_id="{{userId}}" user-status='{"name":"status"}'></div>-->
                                         </div>
                                     </div>
                                     <div class="margin-left:10px">
@@ -330,7 +330,7 @@ <h4><span collection="{{document.collection}}" document_id="{{document._id}}" na
                             <!--                                  <img src="images/Velazquez.jpg" onerror="this.style.display='none'"/>-->
                             <!--                              </span>-->
                             <!--                          </a>-->
-                            <!--                          <div class="avatar-status sessionUser_Id" collection="users" document_id="" user-status='{"name":"status"}'></div>-->
+                            <!--                          <div class="avatar-status" collection="users" document_id="{{userId}}" user-status='{"name":"status"}'></div>-->
                             <!--                      </div>			-->
                             <!--</td>-->
                             <td class="padding:10px">
@@ -397,12 +397,12 @@ <h5>{{document._id}}</h5>
                                             <div class="avatar-wrapper margin:5px_0px margin-right:10px">
                                                 <a class="avatar round" actions="pass, openModal" modal-src="./user-profile/user-profile.html" pass-collection="modules" pass-document_id="5dd010bccbc25f0cdb1a4d9f" pass_to="render" modal-width="300px"
                                                     modal-height="375px" modal-color="#229954">
-                                                  	<span collection="users" document_id="" name="name" class="sessionUser_Id first-letter avatar-name"></span>
-                                                  	<span collection="users" document_id="" name="profile_image" class="sessionUser_Id avatar-image">
+                                                  	<span collection="users" document_id="{{userId}}" name="name" class="first-letter avatar-name"></span>
+                                                  	<span collection="users" document_id="{{userId}}" name="profile_image" class="avatar-image">
                                                   	  <img src="images/Velazquez.jpg" onerror="this.style.display='none'"/>
                                                   	</span>
                                                 </a>
-                                                <div class="avatar-status sessionUser_Id" collection="users" document_id="" user-status='{"name":"status"}'></div>
+                                                <div class="avatar-status" collection="users" document_id="{{userId}}" user-status='{"name":"status"}'></div>
                                             </div>
                                             <div>
                                                 <h3 name="name" value="{{document.name}}">No Name</h3>
diff --git a/src/admin/code-editor/index.html b/src/admin/code-editor/index.html
index a4a91ea9..5e84a4e1 100644
--- a/src/admin/code-editor/index.html
+++ b/src/admin/code-editor/index.html
@@ -26,7 +26,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
                 
                 <!-- Save and Make live -->
                 <li class="margin-right:15px">
diff --git a/src/admin/companies/datatable.html b/src/admin/companies/datatable.html
index 882e0ea1..9e46a9dc 100644
--- a/src/admin/companies/datatable.html
+++ b/src/admin/companies/datatable.html
@@ -36,7 +36,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/companies/form.html b/src/admin/companies/form.html
index 890aa82a..abb1d39a 100644
--- a/src/admin/companies/form.html
+++ b/src/admin/companies/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/components/datatable.html b/src/admin/components/datatable.html
index d9e7d035..f807e312 100644
--- a/src/admin/components/datatable.html
+++ b/src/admin/components/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/components/form.html b/src/admin/components/form.html
index 244e6d1f..fc1a28a3 100644
--- a/src/admin/components/form.html
+++ b/src/admin/components/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/contacts/datatable.html b/src/admin/contacts/datatable.html
index 4bbf5903..be1344e3 100644
--- a/src/admin/contacts/datatable.html
+++ b/src/admin/contacts/datatable.html
@@ -60,7 +60,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/contacts/form.html b/src/admin/contacts/form.html
index 95555f9c..d1553142 100644
--- a/src/admin/contacts/form.html
+++ b/src/admin/contacts/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/dashboard/charts/charts.html b/src/admin/dashboard/charts/charts.html
index fcd728fe..5e88fb95 100644
--- a/src/admin/dashboard/charts/charts.html
+++ b/src/admin/dashboard/charts/charts.html
@@ -63,7 +63,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/dashboard/form.html b/src/admin/dashboard/form.html
index 77b6dfa6..250926bc 100644
--- a/src/admin/dashboard/form.html
+++ b/src/admin/dashboard/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/dashboard/index.html b/src/admin/dashboard/index.html
index f2c14eb8..6b9a236c 100644
--- a/src/admin/dashboard/index.html
+++ b/src/admin/dashboard/index.html
@@ -62,7 +62,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/database/form.html b/src/admin/database/form.html
index 4b2992b9..3261c3a9 100644
--- a/src/admin/database/form.html
+++ b/src/admin/database/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/database/index.html b/src/admin/database/index.html
index 44a8bdd7..f2adab86 100644
--- a/src/admin/database/index.html
+++ b/src/admin/database/index.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/domains/index.html b/src/admin/domains/index.html
index 53f0011e..fe90a25a 100644
--- a/src/admin/domains/index.html
+++ b/src/admin/domains/index.html
@@ -46,7 +46,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/email/index.html b/src/admin/email/index.html
index 491add79..ca1e4305 100644
--- a/src/admin/email/index.html
+++ b/src/admin/email/index.html
@@ -46,7 +46,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
@@ -137,8 +137,8 @@
                         <div class="flip-container">
                             <div class="flip-item avatar-selected"><i class="fas fa-check"></i></div>
                             <a class="flip-item avatar round" actions="pass, openModal" modal-src="render.html" pass-collection="modules">
-                                <span collection="users" document_id="" name="name" class="sessionUser_Id first-letter avatar-name">B</span>
-                                <span collection="users" document_id="" name="profile_image" class="sessionUser_Id avatar-image">
+                                <span collection="users" document_id="{{userId}}" name="name" class="first-letter avatar-name">B</span>
+                                <span collection="users" document_id="{{userId}}" name="profile_image" class="avatar-image">
                                     <img src="/_static/Velazquez.jpg" onerror="this.style.display='none'"/>
                                 </span>
                             </a>
@@ -179,10 +179,11 @@ <h2 class="margin:0px_0px">New messagees from Brenda Elisa G.
                         </h2>
                     </div>
                     <div class="display:flex padding:15px_0px">
+                        <div localstorage-get="user_id" localstorage-key="userId" localstorage-target=".avatar-wrapper"></div>
                         <div class="avatar-wrapper">
                             <a class="avatar round" actions="pass, openModal" modal-src="render.html" pass-collection="modules" pass-document_id="5dd010bccbc25f0cdb1a4d9f" pass_to="render" modal-width="300px" modal-height="375px" modal-color="#229954">
-                                <span collection="users" document_id="" name="name" class="sessionUser_Id first-letter avatar-name">B</span>
-                                <span collection="users" document_id="" name="profile_image" class="sessionUser_Id avatar-image">
+                                <span collection="users" document_id="{{userId}}" name="name" class="first-letter avatar-name">B</span>
+                                <span collection="users" document_id="{{userId}}" name="profile_image" class="avatar-image">
                                     <img src="/_static/Velazquez.jpg" onerror="this.style.display='none'"/>
                                 </span>
                             </a>
diff --git a/src/admin/email/settings.html b/src/admin/email/settings.html
index d34e806a..7dd3e803 100644
--- a/src/admin/email/settings.html
+++ b/src/admin/email/settings.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/estimates/datatable.html b/src/admin/estimates/datatable.html
index 6b52a705..a915bf28 100644
--- a/src/admin/estimates/datatable.html
+++ b/src/admin/estimates/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/estimates/form.html b/src/admin/estimates/form.html
index 9491fc1f..af7740c1 100644
--- a/src/admin/estimates/form.html
+++ b/src/admin/estimates/form.html
@@ -34,7 +34,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/estimates/index.html b/src/admin/estimates/index.html
index 6d9c0e31..ac2e9604 100644
--- a/src/admin/estimates/index.html
+++ b/src/admin/estimates/index.html
@@ -46,7 +46,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/expenses/datatable.html b/src/admin/expenses/datatable.html
index 7ec61a6d..aff95c26 100644
--- a/src/admin/expenses/datatable.html
+++ b/src/admin/expenses/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/expenses/form.html b/src/admin/expenses/form.html
index 5884a3ae..ae6de4c0 100644
--- a/src/admin/expenses/form.html
+++ b/src/admin/expenses/form.html
@@ -28,7 +28,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/files/datatable.html b/src/admin/files/datatable.html
index 9b04c808..5c9a7a19 100644
--- a/src/admin/files/datatable.html
+++ b/src/admin/files/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/files/form.html b/src/admin/files/form.html
index a3ad7551..d87296e5 100644
--- a/src/admin/files/form.html
+++ b/src/admin/files/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/fleet-tracking/index.html b/src/admin/fleet-tracking/index.html
index dad0da23..ea009423 100644
--- a/src/admin/fleet-tracking/index.html
+++ b/src/admin/fleet-tracking/index.html
@@ -74,7 +74,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
@@ -116,15 +116,17 @@
 
                     <div class="display:flex flex-wrap:wrap">
                         <!-- Avatar -->
+                        <div localstorage-get="user_id" localstorage-key="userId" localstorage-target=".avatar-wrapper"></div>
+
                         <div class="avatar-wrapper margin:5px_0px margin-right:10px">
                             <a class="avatar round" actions="pass, openModal" modal-src="./user-profile/user-profile.html" pass-collection="modules" pass-document_id="5dd010bccbc25f0cdb1a4d9f" pass_to="render" modal-width="300px"
                                 modal-height="375px" modal-color="#229954">
-                              	<span collection="users" document_id="" name="name" class="sessionUser_Id first-letter avatar-name"></span>
-                              	<span collection="users" document_id="" name="profile_image" class="sessionUser_Id avatar-image">
+                              	<span collection="users" document_id="{{userId}}" name="name" class="first-letter avatar-name"></span>
+                              	<span collection="users" document_id="{{userId}}" name="profile_image" class="avatar-image">
                               	  <img src="images/Velazquez.jpg" onerror="this.style.display='none'"/>
                               	</span>
                             </a>
-                            <div class="avatar-status sessionUser_Id" collection="users" document_id="" user-status='{"name":"status"}'></div>
+                            <div class="avatar-status" collection="users" document_id="{{userId}}" user-status='{"name":"status"}'></div>
                         </div>
 
                         <div class="">
diff --git a/src/admin/image-editor/index.html b/src/admin/image-editor/index.html
index 90b025fe..07d4c8f4 100644
--- a/src/admin/image-editor/index.html
+++ b/src/admin/image-editor/index.html
@@ -36,7 +36,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/index.html b/src/admin/index.html
index 020008ed..f6ba16fa 100644
--- a/src/admin/index.html
+++ b/src/admin/index.html
@@ -32,7 +32,7 @@
             <ul class="display:inline-flex direction:rtl overflow:auto font-size:20px align-items:center list-style-type:none width:100% height:50px">
             			
             	<!-- Fullscreen toogle -->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
               
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
@@ -87,18 +87,19 @@
             </ul>
             
             <!-- Avatar -->
+            <div localstorage-get="user_id" localstorage-key="userId" localstorage-target="cocreate-select, .avatar-wrapper"></div>
             <div class="avatar-wrapper margin:5px">
                 <a class="avatar round" actions="pass, openModal" modal-src="./users/profile.html" modal-width="300px"  modal-height="375px"  modal-color="#229954">
-                    <span collection="users" document_id="" name="name" class="sessionUser_Id avatar-name"></span>
-                    <span class="sessionUser_Id avatar-image">
-                        <img collection="users" document_id="" name="avatar" onerror="this.style.display='none'" class="sessionUser_Id" width="40px"/>
+                    <span collection="users" document_id="{{userId}}" name="name" class="avatar-name"></span>
+                    <span class="avatar-image">
+                        <img collection="users" document_id="{{userId}}" name="avatar" onerror="this.style.display='none'" width="40px"/>
                     </span>
 					<div pass-collection="modules" document_id="5ff747727005da1c27274182" pass_to="module_id"></div>
 					<div pass-collection="files" pass-document_id="60ddfdc114b5ab0c2dd2fe1c" pass_to="form"></div>
-					<div pass-collection="users" pass-document_id="" class="sessionUser_Id" pass_to="form-fields"></div>
+					<div pass-collection="users" pass-document_id="{{userId}}" pass_to="form-fields"></div>
 					<div pass-collection="files" pass-document_id="60ddfdc114b5ab0c2dd2fe1d" pass-name="src" pass_to="render"></div>
                 </a>
-                <div class="avatar-status sessionUser_Id"  collection="users" document_id="" user-status='{"name":"status"}' ></div>
+                <div class="avatar-status"  collection="users" document_id="{{userId}}" user-status='{"name":"status"}' ></div>
             </div>
         </nav>
     
@@ -112,13 +113,13 @@
         <sidenav id="menuL" class="position:fixed top:0px left:0px overflow:hidden background:whitesmoke height:100vh width:50px width:275px:hover width:0px@xs" resizable resize-target="[content_id='content']" resize-property="margin-left" resize-value="width">
         
             <!-- Select to change organizations  -->
-            <cocreate-select class="org-changer remove-none border:none sessionUser_Id padding:0" name="current_org" collection="users" document_id="">
+            <cocreate-select class="org-changer remove-none border:none padding:0" name="current_org" collection="users" document_id="{{userId}}">
                 <input placeholder="Search" filter-search template_id="connected_orgs">
-                <cc-options class="options overflow:auto sessionUser_Id"
+                <cc-options class="options overflow:auto"
                     fetch-collection="users"
                     fetch-name="connected_orgs"
                     filter-name="_id"
-                    filter-value=""
+                    filter-value="{{userId}}"
                     filter-operator="$eq"
                     template_id="connected_orgs">
                     <cc-option class="display:flex height:50px margin:0!important padding:4px_12px!important" template="connected_orgs" value="{{connected_orgs}}">
diff --git a/src/admin/industries/datatable.html b/src/admin/industries/datatable.html
index 00b9ca58..b2c90cee 100644
--- a/src/admin/industries/datatable.html
+++ b/src/admin/industries/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/industries/form.html b/src/admin/industries/form.html
index 757b914a..1a142377 100644
--- a/src/admin/industries/form.html
+++ b/src/admin/industries/form.html
@@ -27,7 +27,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/invoices/datatable.html b/src/admin/invoices/datatable.html
index 6ea8def0..2f0ae0f2 100644
--- a/src/admin/invoices/datatable.html
+++ b/src/admin/invoices/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/invoices/form.html b/src/admin/invoices/form.html
index 20f95e41..37039d02 100644
--- a/src/admin/invoices/form.html
+++ b/src/admin/invoices/form.html
@@ -34,7 +34,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/invoices/index.html b/src/admin/invoices/index.html
index 754c0374..9ef1c720 100644
--- a/src/admin/invoices/index.html
+++ b/src/admin/invoices/index.html
@@ -46,7 +46,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/items/datatable.html b/src/admin/items/datatable.html
index 35ed5454..6b843084 100644
--- a/src/admin/items/datatable.html
+++ b/src/admin/items/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/items/form.html b/src/admin/items/form.html
index 8c203f84..90c39b47 100644
--- a/src/admin/items/form.html
+++ b/src/admin/items/form.html
@@ -28,7 +28,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/marketplace/form.html b/src/admin/marketplace/form.html
index 54c324c9..77772523 100644
--- a/src/admin/marketplace/form.html
+++ b/src/admin/marketplace/form.html
@@ -28,7 +28,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/marketplace/item.html b/src/admin/marketplace/item.html
index 7cf9863e..bd51a2be 100644
--- a/src/admin/marketplace/item.html
+++ b/src/admin/marketplace/item.html
@@ -30,7 +30,7 @@
 				<li class="margin-right:15px"><a actions="minMaxModal"><i toggle="fa-window-restore, fa-window-maximize" class="far fa-window-maximize">					</i></a> </li>
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize">					</i></a> </li>
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"> <a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a> </li>
+				<li class="margin-right:15px"> <a fullscreen></a> </li>
 				<!-- Render Module Form -->
 				<li class="margin-right:15px"> <a actions="pass, openModal" pass-collection="files" pass-document_id="60ddfdbf14b5ab0c2dd2fe09" pass-name="src" pass_to="render" modal-width="320px">							<i class="fas fa-cog"></i>						 <div pass_id="module-form"							pass-collection="modules"							pass-document_id=""							pass_to="form-fields">						 </div>                      	<div pass_id="datatable" pass-filter-value="" pass_to="module_id">						 </div>					 </a>					</li>
 				<!-- Render Code Editor -->
diff --git a/src/admin/marketplace/list.html b/src/admin/marketplace/list.html
index 334405fe..2f765ad0 100644
--- a/src/admin/marketplace/list.html
+++ b/src/admin/marketplace/list.html
@@ -32,7 +32,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/module-templates/datatable.html b/src/admin/module-templates/datatable.html
index f59e1a9c..38b3ad26 100644
--- a/src/admin/module-templates/datatable.html
+++ b/src/admin/module-templates/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/module-templates/form.html b/src/admin/module-templates/form.html
index e8b85810..769175f3 100644
--- a/src/admin/module-templates/form.html
+++ b/src/admin/module-templates/form.html
@@ -47,7 +47,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/module-templates/templates/datatable.html b/src/admin/module-templates/templates/datatable.html
index 424c295e..62a71b55 100644
--- a/src/admin/module-templates/templates/datatable.html
+++ b/src/admin/module-templates/templates/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/module-templates/templates/form.html b/src/admin/module-templates/templates/form.html
index cd0ea9c3..48f120d4 100644
--- a/src/admin/module-templates/templates/form.html
+++ b/src/admin/module-templates/templates/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/module-templates/templates/kanban.html b/src/admin/module-templates/templates/kanban.html
index 8d934d87..a6ddd82a 100644
--- a/src/admin/module-templates/templates/kanban.html
+++ b/src/admin/module-templates/templates/kanban.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/module-views/datatable.html b/src/admin/module-views/datatable.html
index 978ed0f9..c84f2720 100644
--- a/src/admin/module-views/datatable.html
+++ b/src/admin/module-views/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/module-views/form.html b/src/admin/module-views/form.html
index 67760d3e..48f69484 100644
--- a/src/admin/module-views/form.html
+++ b/src/admin/module-views/form.html
@@ -47,7 +47,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/modules/datatable.html b/src/admin/modules/datatable.html
index 3db926c4..9300acc3 100644
--- a/src/admin/modules/datatable.html
+++ b/src/admin/modules/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/modules/form.html b/src/admin/modules/form.html
index 34bc7ab2..5b1c462b 100644
--- a/src/admin/modules/form.html
+++ b/src/admin/modules/form.html
@@ -69,7 +69,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/organizations/creator.html b/src/admin/organizations/creator.html
index ed586a0a..867699ab 100644
--- a/src/admin/organizations/creator.html
+++ b/src/admin/organizations/creator.html
@@ -38,12 +38,13 @@
                     <img src="https://cdn.cocreate.app/Preloader_2.gif" class="display:block margin:auto-lr margin:20px_0px">
 
                     <hgroup class="speech-bubble position:relative background:white border-radius:4px padding:15px">
+                        <div localstorage-get="user_id" localstorage-key="userId" localstorage-next="div"></div>
                         <div class="color:blue font-size:24px">
                             <p id="ava1">
-                                Hey, <span document_id="" name="name" class="sessionUser_Id" collection="users">First Name</span>! Enter your new organization's name. Don't worry if you are not sure, you can allways update it later.
+                                Hey, <span document_id="{{userId}}" name="name" collection="users">First Name</span>! Enter your new organization's name. Don't worry if you are not sure, you can allways update it later.
                             </p>
                             <p id="ava2" hidden>
-                                Great, <span document_id="" name="name" class="sessionUser_Id" collection="users">First Name</span>! Let’s choose an industry so I can begin to understand what we will be doing.
+                                Great, <span document_id="{{userId}}" name="name" collection="users">First Name</span>! Let’s choose an industry so I can begin to understand what we will be doing.
                             </p>
                             <p id="ava3" hidden>
                                 I could do special animations to impress you. But instead I will build your organization instantly and impress you with my speed!
diff --git a/src/admin/organizations/datatable.html b/src/admin/organizations/datatable.html
index a0c4812f..4b4dd3ba 100644
--- a/src/admin/organizations/datatable.html
+++ b/src/admin/organizations/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/organizations/form.html b/src/admin/organizations/form.html
index af78c09b..601e5160 100644
--- a/src/admin/organizations/form.html
+++ b/src/admin/organizations/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/payments/datatable.html b/src/admin/payments/datatable.html
index d313f35c..9392e9e9 100644
--- a/src/admin/payments/datatable.html
+++ b/src/admin/payments/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/payments/form.html b/src/admin/payments/form.html
index 5cc4d241..a49cc4a2 100644
--- a/src/admin/payments/form.html
+++ b/src/admin/payments/form.html
@@ -27,7 +27,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/payments/settings.html b/src/admin/payments/settings.html
index be7d44d1..b4b32171 100644
--- a/src/admin/payments/settings.html
+++ b/src/admin/payments/settings.html
@@ -28,7 +28,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/permissions/datatable.html b/src/admin/permissions/datatable.html
index 17ddabdc..64ca1de4 100644
--- a/src/admin/permissions/datatable.html
+++ b/src/admin/permissions/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/potentials/datatable.html b/src/admin/potentials/datatable.html
index 95a9157d..1aba3c1e 100644
--- a/src/admin/potentials/datatable.html
+++ b/src/admin/potentials/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/potentials/form.html b/src/admin/potentials/form.html
index 29e0f667..15bf9e23 100644
--- a/src/admin/potentials/form.html
+++ b/src/admin/potentials/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/projects/datatable.html b/src/admin/projects/datatable.html
index 1e690eac..37bbf69c 100644
--- a/src/admin/projects/datatable.html
+++ b/src/admin/projects/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/projects/form.html b/src/admin/projects/form.html
index da2372a6..f701b0ee 100644
--- a/src/admin/projects/form.html
+++ b/src/admin/projects/form.html
@@ -28,7 +28,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/projects/kanban.html b/src/admin/projects/kanban.html
index c377c4a5..341b3768 100644
--- a/src/admin/projects/kanban.html
+++ b/src/admin/projects/kanban.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/settings/index.html b/src/admin/settings/index.html
index 49730a64..4555a5ba 100644
--- a/src/admin/settings/index.html
+++ b/src/admin/settings/index.html
@@ -28,7 +28,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/social/index.html b/src/admin/social/index.html
index 59595b41..d7192e9a 100644
--- a/src/admin/social/index.html
+++ b/src/admin/social/index.html
@@ -57,7 +57,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/tags/datatable.html b/src/admin/tags/datatable.html
index ed444524..6dcbdff1 100644
--- a/src/admin/tags/datatable.html
+++ b/src/admin/tags/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/tags/form.html b/src/admin/tags/form.html
index fd6d5937..b794f5be 100644
--- a/src/admin/tags/form.html
+++ b/src/admin/tags/form.html
@@ -29,7 +29,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/tasklists/datatable.html b/src/admin/tasklists/datatable.html
index 5dcfac85..3a2ed41a 100644
--- a/src/admin/tasklists/datatable.html
+++ b/src/admin/tasklists/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/tasklists/form.html b/src/admin/tasklists/form.html
index 3d60be8b..e1b4c46b 100644
--- a/src/admin/tasklists/form.html
+++ b/src/admin/tasklists/form.html
@@ -40,7 +40,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/university/datatable.html b/src/admin/university/datatable.html
index aa334846..0a18dd38 100644
--- a/src/admin/university/datatable.html
+++ b/src/admin/university/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/university/form.html b/src/admin/university/form.html
index 54568016..cecda1b5 100644
--- a/src/admin/university/form.html
+++ b/src/admin/university/form.html
@@ -27,7 +27,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/users/datatable.html b/src/admin/users/datatable.html
index fc09870d..e626f111 100644
--- a/src/admin/users/datatable.html
+++ b/src/admin/users/datatable.html
@@ -41,7 +41,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/users/form.html b/src/admin/users/form.html
index 8ef67bfe..f2dc44c8 100644
--- a/src/admin/users/form.html
+++ b/src/admin/users/form.html
@@ -26,7 +26,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/users/profile.html b/src/admin/users/profile.html
index 9d6cf388..43d68444 100644
--- a/src/admin/users/profile.html
+++ b/src/admin/users/profile.html
@@ -34,7 +34,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
@@ -81,7 +81,7 @@
 				  <i class="far fa-save"></i>
 				</button>
 				<div class="position:relative bottom:80px width:100% color:#fff font-size:26px padding:6px_35px background:black opacity:0.4 height:40px">
-					<span class="sessionUser_Id float:right" collection="users" name="name" document_id="">test</span>
+					<span class="float:right" collection="users" name="name" document_id="{{userId}}" localstorage-get="user_id" localstorage-key="userId">test</span>
 				</div>
 			</div>
 			<div class="user-info">
diff --git a/src/admin/wallet/index.html b/src/admin/wallet/index.html
index 98438dbc..57b3bf55 100644
--- a/src/admin/wallet/index.html
+++ b/src/admin/wallet/index.html
@@ -28,7 +28,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/website-pages/datatable.html b/src/admin/website-pages/datatable.html
index 5043912f..38bcb966 100644
--- a/src/admin/website-pages/datatable.html
+++ b/src/admin/website-pages/datatable.html
@@ -40,7 +40,7 @@
 				<li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
 				<!-- fullscreen toogle and icon transform-->
-				<li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+				<li class="margin-right:15px"><a fullscreen></a></li>
 
 				<!-- Render Module Form -->
 				<li class="margin-right:15px">
diff --git a/src/admin/website-pages/form.html b/src/admin/website-pages/form.html
index 7fff5d34..b474b461 100644
--- a/src/admin/website-pages/form.html
+++ b/src/admin/website-pages/form.html
@@ -48,7 +48,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/websites/form.html b/src/admin/websites/form.html
index 87b5ee7b..eea14708 100644
--- a/src/admin/websites/form.html
+++ b/src/admin/websites/form.html
@@ -42,7 +42,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">
diff --git a/src/admin/websites/list.html b/src/admin/websites/list.html
index e0285a24..c1bfe2f0 100644
--- a/src/admin/websites/list.html
+++ b/src/admin/websites/list.html
@@ -35,7 +35,7 @@
                 <li class="margin-right:15px"><a actions="parkModal"><i class="far fa-window-minimize"></i></a></li>
 
                 <!-- fullscreen toogle and icon transform-->
-                <li class="margin-right:15px"><a fullscreen><i toggle="fa-compress, fa-expand" class="fas fa-expand"></i></a></li>
+                <li class="margin-right:15px"><a fullscreen></a></li>
 
                 <!-- Render Module Form -->
                 <li class="margin-right:15px">