diff --git a/app/controllers/general.php b/app/controllers/general.php
index 0ac19d5897..445563301d 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -51,7 +51,11 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
     $port = \parse_url($request->getOrigin($referrer), PHP_URL_PORT);
 
     $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.((\in_array($origin, $clients))
-        ? $origin : 'localhost') . (!empty($port) ? ':'.$port : '');
+        ? $origin : 'localhost').(!empty($port) ? ':'.$port : '');
+    
+    $refDomain = (!$route->getLabel('origin', false))  // This route is publicly accessible
+        ? $refDomain
+        : (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.$origin.(!empty($port) ? ':'.$port : '');
 
     $selfDomain = new Domain($request->getHostname());
     $endDomain = new Domain((string)$origin);
@@ -110,7 +114,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         }
 
         $response->addHeader('Strict-Transport-Security', 'max-age='.(60 * 60 * 24 * 126)); // 126 days
-    }    
+    }
 
     $response
         ->addHeader('Server', 'Appwrite')
diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml
index 84a18521de..3f1e7decc9 100644
--- a/app/views/console/account/index.phtml
+++ b/app/views/console/account/index.phtml
@@ -29,6 +29,8 @@
                         <div class="box margin-bottom-xl">
                             <div>
                                 <form name="account.update"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Update Account Name"
@@ -58,6 +60,8 @@
                             <hr />
 
                             <form name="update-email"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Account Email"
@@ -99,6 +103,8 @@
                                 <h1>Update Password</h1>
 
                                 <form name="update-password"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Update Account Password"
@@ -129,6 +135,8 @@
                             <hr />
 
                             <form class="margin-top"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account Current Session"
@@ -163,6 +171,8 @@
                             <p>PLEASE NOTE: Account deletion is irreversible.</p>
 
                             <form class="inline"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account"
@@ -197,6 +207,8 @@
                         <span data-ls-if="true != {{session.current}}">
                             <!-- From remote session (-logout event) -->
                             <form class="pull-end"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account Session"
@@ -218,6 +230,8 @@
                         <span data-ls-if="true == {{session.current}}">
                             <!-- From current session (+logout event) -->
                             <form class="pull-end"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account Current Session"
@@ -254,6 +268,8 @@
             </div>
 
             <form class="inline margin-bottom-large"
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Delete Account Sessions"
diff --git a/app/views/console/comps/footer.phtml b/app/views/console/comps/footer.phtml
index 26493f30cb..be5696ce48 100644
--- a/app/views/console/comps/footer.phtml
+++ b/app/views/console/comps/footer.phtml
@@ -6,6 +6,7 @@ $version = $this->getParam('version', '').'.'.APP_CACHE_BUSTER;
     <ul class="copyright pull-start">
         <li>
             <a class="link-animation-enabled"
+                data-analytics
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="GitHub Link"
@@ -13,6 +14,7 @@ $version = $this->getParam('version', '').'.'.APP_CACHE_BUSTER;
         </li>
         <li>
             <a class="link-animation-enabled"
+                data-analytics
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="New GitHub Issue"
@@ -20,6 +22,7 @@ $version = $this->getParam('version', '').'.'.APP_CACHE_BUSTER;
         </li>
         <li>
             <a class="link-animation-enabled"
+                data-analytics
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="Docs Link"
diff --git a/app/views/console/comps/header.phtml b/app/views/console/comps/header.phtml
index 5aeb0c0bd9..631e89f5cc 100644
--- a/app/views/console/comps/header.phtml
+++ b/app/views/console/comps/header.phtml
@@ -51,6 +51,7 @@
                     <span class="link"><i class="icon-sun-inv force-dark pull-start"></i><i class="icon-moon-inv force-light pull-start"></i> &nbsp; Change Theme
                         <div class="pull-end switch-theme">
                             <button data-general-theme
+                                data-analytics
                                 data-analytics-event="click"
                                 data-analytics-category="console/header"
                                 data-analytics-label="Switch Theme">
@@ -67,6 +68,7 @@
 
     <nav class="project-only" data-ls-ui-open="" data-button-class="round icon-btn phones-only tablets-only" data-button-aria="Navigation" data-button-icon="icon-dot-3">
         <a class="logo" href="/console"
+            data-analytics
             data-analytics-event="click"
             data-analytics-category="console/navigation"
             data-analytics-label="Logo Link">
@@ -81,6 +83,7 @@
             <ul class="links">
                 <li>
                     <a data-ls-attrs="href=/console/home?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Home Link">
@@ -95,6 +98,7 @@
             <ul class="links">
                 <li>
                     <a data-ls-attrs="href=/console/database?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Database Link">
@@ -104,6 +108,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/storage?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Storage Link">
@@ -113,6 +118,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/users?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Users Link">
@@ -122,6 +128,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/functions?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Functions Link"
@@ -137,6 +144,7 @@
             <ul class="links">
                 <li>
                     <a data-ls-attrs="href=/console/tasks?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Tasks Link">
@@ -146,6 +154,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/webhooks?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Webhooks Links">
@@ -155,6 +164,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/keys?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="API Keys Link">
@@ -168,6 +178,7 @@
         <ul class="links bottom">
             <li>
                 <a data-ls-attrs="href=/console/settings?project={{router.params.project}}"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/navigation"
                     data-analytics-label="Settings Link">
@@ -194,6 +205,8 @@
 
     <form
         data-setup
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
         data-analytics-label="Create Project">
diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
index faab1fb441..2ff15e7ce3 100644
--- a/app/views/console/database/collection.phtml
+++ b/app/views/console/database/collection.phtml
@@ -174,6 +174,8 @@ $maxCells = 10;
                 <div class="row responsive margin-top-negative">
                     <div class="col span-8 margin-bottom">
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Update Database Collection"
@@ -340,6 +342,8 @@ $maxCells = 10;
                         </ul>
 
                         <form name="database.deleteCollection" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Database Collection"
@@ -363,6 +367,7 @@ $maxCells = 10;
                 <ul data-ls-loop="project-collection.rules" data-ls-as="rule" class="sortable">
                     <li data-forms-remove data-forms-move-up  data-forms-move-down>
                         <form
+                            data-analytics
                             data-analytics-event="splice-rule-{{$index}}"
                             data-analytics-category="console"
                             data-analytics-label="Spliced Collection Rule"
@@ -384,6 +389,8 @@ $maxCells = 10;
                     <h1>Add Rule</h1>
 
                     <form
+                        data-analytics
+                        data-analytics-activity
                         data-analytics-event="submit"
                         data-analytics-category="console"
                         data-analytics-label="Added Collection Rule"
diff --git a/app/views/console/database/document.phtml b/app/views/console/database/document.phtml
index 5ac9e841ea..f7b529d6c6 100644
--- a/app/views/console/database/document.phtml
+++ b/app/views/console/database/document.phtml
@@ -192,6 +192,8 @@ $collections = [];
                 <div class="row responsive margin-top-negative">
                     <div class="col span-8 margin-bottom">
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Update Database Document"
@@ -288,6 +290,8 @@ $collections = [];
 
                         <div data-ls-if="({{project-document.$id}})">
                             <form name="database.deleteDocument" class="margin-bottom"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Collection Document"
diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml
index 69c5c12fab..8ec46a13ad 100644
--- a/app/views/console/database/index.phtml
+++ b/app/views/console/database/index.phtml
@@ -18,6 +18,8 @@
                 <h1>New Collection</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create Database Collection"
diff --git a/app/views/console/functions/function.phtml b/app/views/console/functions/function.phtml
index e1203dd027..993e810120 100644
--- a/app/views/console/functions/function.phtml
+++ b/app/views/console/functions/function.phtml
@@ -52,6 +52,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                 </p>
 
                                 <form data-ls-if="{{project-function.tag}} !== ''" name="functions.createExecution" class="margin-top"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Create Function Execution"
@@ -94,6 +96,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                     <ul data-ls-loop="project-function-tags.tags" data-ls-as="tag" class="list">
                                         <li class="clear">
                                             <form data-ls-if="{{tag.$id}} !== {{project-function.tag}}" name="functions.updateTag" class="pull-end"
+                                                data-analytics
+                                                data-analytics-activity
                                                 data-analytics-event="submit"
                                                 data-analytics-category="console"
                                                 data-analytics-label="Create Function Execution"
@@ -116,6 +120,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                                 <span class="pull-start" data-ls-bind="Created {{tag.dateCreated|timeSince}} &nbsp; | &nbsp; {{tag.size|humanFileSize}}"></span>
 
                                                 <form data-ls-if="{{tag.$id}} !== {{project-function.tag}}" name="functions.deleteTag" class="pull-start"
+                                                    data-analytics
+                                                    data-analytics-activity
                                                     data-analytics-event="submit"
                                                     data-analytics-category="console"
                                                     data-analytics-label="Delete Function Tag"
@@ -147,6 +153,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                 <h1>Deploy a New Tag</h1>
 
                                 <form
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Create Function Tag"
@@ -221,6 +229,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                         </ul>
 
                         <form name="functions.delete" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Function"
@@ -469,6 +479,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                         <label>&nbsp;</label>
 
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Update Function"
@@ -525,7 +537,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                     <hr class="margin-bottom margin-top-no" />
 
                                     <fieldset name="vars" data-cast-to="object">
-                                        <div data-ls-loop="project-function.vars" data-ls-as="var" id="project-vars">
+                                        <div data-ls-loop="project-function.vars" data-ls-as="var" id="project-vars" style="visibility: visible;">
                                             <div class="margin-bottom-small">
                                                 <div data-forms-remove class="row thin">
                                                     <div class="col span-10">
@@ -571,6 +583,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                         </ul>
 
                         <form name="functions.delete" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Function"
diff --git a/app/views/console/functions/index.phtml b/app/views/console/functions/index.phtml
index fea8efafd6..2aec5b6493 100644
--- a/app/views/console/functions/index.phtml
+++ b/app/views/console/functions/index.phtml
@@ -90,6 +90,8 @@ $environments = $this->getParam('environments', []);
                         <h1>Add Function</h1>
 
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Create Project Function"
diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index 0fc6838eb6..55118bec41 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -30,6 +30,10 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
         <div class="pull-end">
 
             <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '24h'"
+                data-analytics
+                data-analytics-event="click"
+                data-analytics-category="console"
+                data-analytics-label="Usage 24h"
                 data-service="projects.getUsage"
                 data-event="submit"
                 data-name="usage"
@@ -41,6 +45,10 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '24h'" disabled>24h</button>
 
             <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '30d'"
+                data-analytics
+                data-analytics-event="click"
+                data-analytics-category="console"
+                data-analytics-label="Usage 30d"
                 data-service="projects.getUsage"
                 data-event="submit"
                 data-name="usage"
@@ -51,6 +59,10 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '30d'" disabled>30d</button>
 
             <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '90d'"
+                data-analytics
+                data-analytics-event="click"
+                data-analytics-category="console"
+                data-analytics-label="Usage 90d"
                 data-service="projects.getUsage"
                 data-event="submit"
                 data-name="usage"
@@ -140,6 +152,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 </div>
 
                 <form class="pull-end margin-end"
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Delete Project Platform"
@@ -191,7 +205,11 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     </div>
 
     <div class="pull-end desktops-only tablets-only">
-        <a data-ls-attrs="href=/console/keys?project={{router.params.project}}">Manage Your Server API Keys</a>
+        <a data-analytics
+            data-analytics-event="click"
+            data-analytics-category="console"
+            data-analytics-label="API Keys Link"
+            data-ls-attrs="href=/console/keys?project={{router.params.project}}">Manage Your Server API Keys</a>
     </div>
 
     <div class="drop-list pull-start" data-ls-ui-open="" data-button-aria="Choose Platform" data-button-text="Add Platform" data-button-class="button" data-blur="1">
@@ -221,6 +239,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     <h1>New Web App</h1>
 
     <form
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
         data-analytics-label="Create Project Platform (Web)"
@@ -259,6 +279,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
 <script type="text/html" id="template-web-update">
     <form
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
         data-analytics-label="Update Project Platform (Web)"
@@ -297,6 +319,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             <h2 style="display: none">&nbsp;&nbsp;iOS&nbsp;&nbsp;</h2>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Platform (Flutter / iOS)"
@@ -329,6 +353,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             <h2 style="display: none">&nbsp;&nbsp;Android&nbsp;&nbsp;</h2>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Platform (Flutter / Android)"
@@ -361,9 +387,11 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
 <script type="text/html" id="template-ios-update">
     <form
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
-        data-analytics-label="Update Project Platform (iOS)"
+        data-analytics-label="Update Project Platform (Flutter / iOS)"
         data-service="projects.updatePlatform"
         data-scope="console"
         data-event="submit"
@@ -391,9 +419,10 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
 <script type="text/html" id="template-android-update">
     <form
+        data-analytics
         data-analytics-event="submit"
         data-analytics-category="console"
-        data-analytics-label="Update Project Platform (Android)"
+        data-analytics-label="Update Project Platform (Flutter / Android)"
         data-service="projects.updatePlatform"
         data-scope="console"
         data-event="submit"
diff --git a/app/views/console/index.phtml b/app/views/console/index.phtml
index 0a60e3fef1..fc0ce3f155 100644
--- a/app/views/console/index.phtml
+++ b/app/views/console/index.phtml
@@ -93,23 +93,28 @@ $home = $this->getParam('home', '');
                 <p class="text-fade">Join Appwrite growing developers community channels.</p>
         
                 <a href="<?php echo APP_SOCIAL_TWITTER; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Twitter"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/home"
                     data-analytics-label="Twitter Link"><i class="icon-twitter"></i></a>
                 <a href="<?php echo APP_SOCIAL_FACEBOOK; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Facebook"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/home"
                     data-analytics-label="Facebook Link"><i class="icon-facebook"></i></a>
                 <a href="<?php echo APP_SOCIAL_LINKEDIN; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Linkedin"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/home"
                     data-analytics-label="Linkedin Link"><i class="icon-linkedin"></i></a>
                 <a href="<?php echo APP_SOCIAL_DISCORD; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> Discord Server"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/home"
                     data-analytics-label="Discord Link"><i class="icon-discord"></i></a>
                 <a href="<?php echo APP_SOCIAL_GITHUB; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Github"
-                    data-analytics-event="click"
+                    data-analytics
+                    data-analytics-type="click"
                     data-analytics-category="console/home"
                     data-analytics-label="GitHub Link"><i class="icon-github-circled"></i></a>
             </div>
diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml
index c0c7f1216f..3f729aebcd 100644
--- a/app/views/console/keys/index.phtml
+++ b/app/views/console/keys/index.phtml
@@ -33,6 +33,8 @@ $scopes = $this->getParam('scopes', []);
                     <h1>Update API Key</h1>
 
                     <form
+                        data-analytics
+                        data-analytics-activity
                         data-analytics-event="submit"
                         data-analytics-category="console"
                         data-analytics-label="Update Project Key"
@@ -75,6 +77,8 @@ $scopes = $this->getParam('scopes', []);
                 </div>
 
                 <form class="pull-end margin-end"
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Delete Project Key"
@@ -131,9 +135,11 @@ $scopes = $this->getParam('scopes', []);
             <h1>Add API Keys</h1>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
-                data-analytics-label="Create Project Platform"
+                data-analytics-label="Create Project Key"
                 data-service="projects.createKey"
                 data-scope="console"
                 data-event="submit"
diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index 49809cf927..5eedb6388a 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -33,6 +33,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
 
                         <div class="box margin-bottom-large">
                             <form
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Project"
@@ -87,6 +89,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                             <p>PLEASE NOTE: Project deletion is irreversible.</p>
 
                             <form class="inline"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Project"
@@ -281,6 +285,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                                     <li>
                                                         Confirm and verify your CNAME record values:
                                                         <form class="strip"
+                                                            data-analytics
+                                                            data-analytics-activity
                                                             data-analytics-event="submit"
                                                             data-analytics-category="console"
                                                             data-analytics-label="Update Domain Verification"
@@ -313,6 +319,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                         </td>
                                         <td data-title="">
                                             <form class="pull-end"
+                                                data-analytics
+                                                data-analytics-activity
                                                 data-analytics-event="submit"
                                                 data-analytics-category="console"
                                                 data-analytics-label="Delete Project Domain"
@@ -345,6 +353,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                 <h1>Add Domain</h1>
 
                                 <form
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Create Project Domain"
@@ -388,9 +398,11 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                         <ul data-ls-loop="members.memberships" data-ls-as="member" class="list">
                             <li class="clear">
                                 <form class="pull-end"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
-                                    data-analytics-label="Delete Team Membership"
+                                    data-analytics-label="Delete Project Membership"
                                     data-service="teams.deleteMembership"
                                     data-scope="console"
                                     data-event="submit"
@@ -409,9 +421,11 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                 
                                 <div data-ls-if="false === {{member.confirm}}" class="pull-end margin-end">
                                     <form class="pull-end"
+                                        data-analytics
+                                        data-analytics-activity
                                         data-analytics-event="submit"
                                         data-analytics-category="console"
-                                        data-analytics-label="Create Team Membership (resend)"
+                                        data-analytics-label="Create Project Membership (resend)"
                                         data-service="teams.deleteMembership"
                                         data-scope="console"
                                         data-event="submit"
@@ -462,9 +476,11 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                         <h1>Invite Member</h1>
 
                         <form name="teams.createTeamMembership"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
-                            data-analytics-label="Create Team Membership"
+                            data-analytics-label="Create Project Membership"
                             data-service="teams.createMembership"
                             data-scope="console"
                             data-event="submit"
diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml
index d924912324..934189f93c 100644
--- a/app/views/console/storage/index.phtml
+++ b/app/views/console/storage/index.phtml
@@ -23,6 +23,8 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                 <h1>Upload File</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create Storage File"
@@ -124,6 +126,8 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                             <div class="row responsive modalize">
                                                 <div class="col span-8">
                                                     <form class="strip"
+                                                        data-analytics
+                                                        data-analytics-activity
                                                         data-analytics-event="submit"
                                                         data-analytics-category="console"
                                                         data-analytics-label="Update Storage File"
@@ -153,6 +157,8 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                                     </form>
 
                                                     <form class="strip"
+                                                        data-analytics
+                                                        data-analytics-activity
                                                         data-analytics-event="submit"
                                                         data-analytics-category="console"
                                                         data-analytics-label="Delete File"
diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml
index 3d27971d45..b4c17128a1 100644
--- a/app/views/console/tasks/index.phtml
+++ b/app/views/console/tasks/index.phtml
@@ -78,6 +78,8 @@
                             <h1>Update Task</h1>
 
                             <form
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Project Task"
@@ -202,6 +204,8 @@
                         </div>
 
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Project Task"
@@ -238,6 +242,8 @@
             <h1>Add Task</h1>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Task"
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 9d97b05037..3ad6aeda97 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -23,6 +23,8 @@ $providers = $this->getParam('providers', []);
                 <h1>Create User</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create User"
@@ -176,6 +178,8 @@ $providers = $this->getParam('providers', []);
                 <h1>Create Team</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create Team"
@@ -319,6 +323,8 @@ $providers = $this->getParam('providers', []);
                                 <h1><?php echo $this->escape($name); ?> OAuth2 Settings</h1>
 
                                 <form
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Update Project OAuth2"
diff --git a/app/views/console/users/team.phtml b/app/views/console/users/team.phtml
index a04bdef011..659fe3bd5a 100644
--- a/app/views/console/users/team.phtml
+++ b/app/views/console/users/team.phtml
@@ -39,6 +39,8 @@
 
                         <div class="box margin-bottom-large">
                             <form
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Team"
@@ -88,6 +90,8 @@
                                     <ul data-ls-loop="project-members.memberships" data-ls-as="member" class="list">
                                         <li class="clear">
                                             <form class="pull-end"
+                                                data-analytics
+                                                data-analytics-activity
                                                 data-analytics-event="submit"
                                                 data-analytics-category="console"
                                                 data-analytics-label="Delete Team Membership"
@@ -125,6 +129,8 @@
                                 <h1>Add Member</h1>
 
                                 <form name="teams.createTeamMembership"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Create Team Membership"
@@ -204,6 +210,8 @@
                         </ul>
 
                         <form name="teams.delete" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Team"
diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml
index f4a8eea5fd..048d870071 100644
--- a/app/views/console/users/user.phtml
+++ b/app/views/console/users/user.phtml
@@ -104,6 +104,8 @@
                             <p>PLEASE NOTE: User deletion is irreversible.</p>
                         
                             <form class="inline"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete User"
@@ -136,6 +138,8 @@
 
                         <div data-ls-if="{{user.status}} !== <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update User Status"
@@ -149,12 +153,14 @@
                                 data-failure-param-alert-text="Failed to block user"
                                 data-failure-param-alert-classname="error">
 
-                                <button name="status" type="submit" class="danger fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>">Block Account</button>
+                                <button name="status" type="submit" class="danger fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" data-cast-to="integer">Block Account</button>
                             </form>
                         </div>
 
                         <div data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update User Status"
@@ -168,7 +174,7 @@
                                 data-failure-param-alert-text="Failed to activate user"
                                 data-failure-param-alert-classname="error">
 
-                                <button name="status" type="submit" class="fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_ACTIVATED; ?>">Activate Account</button>
+                                <button name="status" type="submit" class="fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_ACTIVATED; ?>" data-cast-to="integer">Activate Account</button>
                             </form>
                         </div>
                     </div>
@@ -192,6 +198,8 @@
                             <ul data-ls-loop="sessions.sessions" data-ls-as="session" class="list">
                                 <li class="clear">
                                     <form class="pull-end"
+                                        data-analytics
+                                        data-analytics-activity
                                         data-analytics-event="submit"
                                         data-analytics-category="console"
                                         data-analytics-label="Delete User Session"
@@ -222,6 +230,8 @@
                         </div>
 
                         <form class="inline margin-bottom-large"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete User Sessions"
diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml
index 6625bf7a45..b913928e7a 100644
--- a/app/views/console/webhooks/index.phtml
+++ b/app/views/console/webhooks/index.phtml
@@ -37,6 +37,8 @@ $events = array_keys($this->getParam('events', []));
                     <h1>Update Webhook</h1>
 
                     <form
+                        data-analytics
+                        data-analytics-activity
                         data-analytics-event="submit"
                         data-analytics-category="console"
                         data-analytics-label="Update Project Webhook"
@@ -116,6 +118,8 @@ $events = array_keys($this->getParam('events', []));
                 </div>
 
                 <form class="pull-end margin-end"
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Delete Project Webhook"
@@ -154,6 +158,8 @@ $events = array_keys($this->getParam('events', []));
             <h1>Add Webhook</h1>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Webhook"
diff --git a/app/views/home/auth/join.phtml b/app/views/home/auth/join.phtml
index e5c0f6e72d..a857a29d59 100644
--- a/app/views/home/auth/join.phtml
+++ b/app/views/home/auth/join.phtml
@@ -1,5 +1,7 @@
 <section class="zone medium">
     <form class="box margin-top-large"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Update Team Membership Status"
diff --git a/app/views/home/auth/recovery.phtml b/app/views/home/auth/recovery.phtml
index ca0db5c92a..575227a158 100644
--- a/app/views/home/auth/recovery.phtml
+++ b/app/views/home/auth/recovery.phtml
@@ -6,6 +6,8 @@
     <small class="pull-end text-size-small">* All fields are required</small>
 
     <form name="account.createRecovery"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Create Account Recovery"
diff --git a/app/views/home/auth/recovery/reset.phtml b/app/views/home/auth/recovery/reset.phtml
index 87f10a5360..6ccefc419c 100644
--- a/app/views/home/auth/recovery/reset.phtml
+++ b/app/views/home/auth/recovery/reset.phtml
@@ -9,6 +9,8 @@
     <br />
 
     <form name="recovery-reset"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Update Account Recovery"
diff --git a/app/views/home/auth/signin.phtml b/app/views/home/auth/signin.phtml
index d516caeae7..405256a602 100644
--- a/app/views/home/auth/signin.phtml
+++ b/app/views/home/auth/signin.phtml
@@ -17,6 +17,8 @@
         <p>Login using email and password</p>
 
         <form name="account.createSession"
+            data-analytics
+            data-analytics-activity
             data-analytics-event="submit"
             data-analytics-category="home"
             data-analytics-label="Create Account Session"
diff --git a/app/views/home/auth/signup.phtml b/app/views/home/auth/signup.phtml
index e815a81220..b5aac01436 100644
--- a/app/views/home/auth/signup.phtml
+++ b/app/views/home/auth/signup.phtml
@@ -8,6 +8,8 @@
     <small class="pull-end text-size-small">* All fields are required</small>
 
     <form name="account.create"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Create Account"
diff --git a/gulpfile.js b/gulpfile.js
index 7e8ae0d02c..28204f0d08 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,6 +17,7 @@ const configApp  = {
         'public/scripts/init.js',
 
         'public/scripts/services/alerts.js',
+        'public/scripts/services/api.js',
         'public/scripts/services/console.js',
         'public/scripts/services/date.js',
         'public/scripts/services/env.js',
@@ -34,6 +35,7 @@ const configApp  = {
         'public/scripts/views/service.js',
 
         'public/scripts/views/analytics/event.js',
+        'public/scripts/views/analytics/activity.js',
         'public/scripts/views/analytics/pageview.js',
 
         'public/scripts/views/forms/clone.js',
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 6db3918c64..3c01912937 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2084,7 +2084,7 @@ paths=expression.getPaths();let prv=element.$lsSkip;element.$lsSkip=!result;if(!
 else{element.style.removeProperty('display');element.style.removeProperty('visibility');}
 if(prv===true&&element.$lsSkip===false){view.render(element)}};check();for(let i=0;i<paths.length;i++){let path=paths[i].split('.');while(path.length){container.bind(element,path.join('.'),check);path.pop();}}}});window.ls.container.get('view').add({selector:'data-ls-loop',template:false,nested:false,controller:function(element,view,container,window,expression){let expr=expression.parse(element.getAttribute('data-ls-loop'));let as=element.getAttribute('data-ls-as');let key=element.getAttribute('data-ls-key')||'$index';let limit=parseInt(expression.parse(element.getAttribute('data-limit')||'')||-1);let debug=element.getAttribute('data-debug')||false;let echo=function(){let array=container.path(expr);let counter=0;array=(!array)?[]:array;let watch=!!(array&&array.__proxy);while(element.hasChildNodes()){element.removeChild(element.lastChild);element.lastChild=null;}
 if(array instanceof Array&&typeof array!=='object'){throw new Error('Reference value must be array or object. '+(typeof array)+' given');}
-let children=[];element.$lsSkip=true;for(let prop in array){if(counter==limit){break;}
+let children=[];element.$lsSkip=true;element.style.visibility=(0===array.length&&element.style.visibility=='')?'hidden':'visible';for(let prop in array){if(counter==limit){break;}
 counter++;if(!array.hasOwnProperty(prop)){continue;}
 children[prop]=template.cloneNode(true);element.appendChild(children[prop]);(index=>{let context=expr+'.'+index;container.addNamespace(as,context);if(debug){console.info('debug-ls-loop','index',index);console.info('debug-ls-loop','context',context);console.info('debug-ls-loop','context-path',container.path(context).name);console.info('debug-ls-loop','namespaces',container.namespaces);}
 container.set(as,container.path(context),true,watch);container.set(key,index,true,false);view.render(children[prop]);container.removeNamespace(as);})(prop);}
@@ -2095,7 +2095,19 @@ return;}
 http.get(source).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});};check(true);for(let i=0;i<paths.length;i++){let path=paths[i].split('.');while(path.length){container.bind(element,path.join('.'),check);path.pop();}}}});window.ls.error=function(){return function(error){window.console.error(error);if(window.location.pathname!=='/console'){window.location='/console';}};};window.addEventListener("error",function(event){console.error("ERROR-EVENT:",event.error.message,event.error.stack);});document.addEventListener("account.deleteSession",function(){window.location="/auth/signin";});document.addEventListener("account.create",function(){let container=window.ls.container;let form=container.get('serviceForm');let sdk=container.get('console');let promise=sdk.account.createSession(form.email,form.password);container.set("serviceForm",{},true,true);promise.then(function(){window.location='/console';},function(error){window.location='/auth/signup?failure=1';});});(function(window){"use strict";window.ls.container.set('alerts',function(window){return{list:[],ids:0,counter:0,max:5,add:function(message,time){var scope=this;message.id=scope.ids++;message.remove=function(){scope.remove(message.id);};scope.counter++;scope.list.unshift(message);if(scope.counter>scope.max){scope.list.pop();scope.counter--;}
 if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
 return message.id;},remove:function(id){let scope=this;for(let index=0;index<scope.list.length;index++){let obj=scope.list[index];if(obj.id===parseInt(id)){scope.counter--;if(typeof obj.callback==="function"){obj.callback();}
-scope.list.splice(index,1);};}}};},true,true);})(window);(function(window){"use strict";window.ls.container.set('console',function(window){var sdk=new window.Appwrite();sdk.setEndpoint(APP_ENV.API).setProject('console').setLocale(APP_ENV.LOCALE);return sdk;},true);})(window);(function(window){"use strict";window.ls.container.set('date',function(){function format(format,timestamp){var jsdate,f
+scope.list.splice(index,1);};}}};},true,true);})(window);(function(window){"use strict";window.ls.container.set('appwrite',function(window,env){let config={endpoint:'https://appwrite.io/v1',};let http=function(document,env){let globalParams=[],globalHeaders=[];let addParam=function(url,param,value){let a=document.createElement('a'),regex=/(?:\?|&amp;|&)+([^=]+)(?:=([^&]*))*/g;let match,str=[];a.href=url;param=encodeURIComponent(param);while(match=regex.exec(a.search))if(param!==match[1])str.push(match[1]+(match[2]?"="+match[2]:""));str.push(param+(value?"="+encodeURIComponent(value):""));a.search=str.join("&");return a.href;};let buildQuery=function(params){let str=[];for(let p in params){if(params.hasOwnProperty(p)){str.push(encodeURIComponent(p)+"="+encodeURIComponent(params[p]));}}
+return str.join("&");};let addGlobalHeader=function(key,value){globalHeaders[key]={key:key.toLowerCase(),value:value.toLowerCase()};};let addGlobalParam=function(key,value){globalParams.push({key:key,value:value});};addGlobalHeader('content-type','');let call=function(method,path,headers={},params={},progress=null){let i;path=config.endpoint+path;if(-1===['GET','POST','PUT','DELETE','TRACE','HEAD','OPTIONS','CONNECT','PATCH'].indexOf(method)){throw new Error('var method must contain a valid HTTP method name');}
+if(typeof path!=='string'){throw new Error('var path must be of type string');}
+if(typeof headers!=='object'){throw new Error('var headers must be of type object');}
+for(i=0;i<globalParams.length;i++){path=addParam(path,globalParams[i].key,globalParams[i].value);}
+for(let key in globalHeaders){if(globalHeaders.hasOwnProperty(key)){if(!headers[globalHeaders[key].key]){headers[globalHeaders[key].key]=globalHeaders[key].value;}}}
+if(method==='GET'){for(let param in params){if(param.hasOwnProperty(key)){path=addParam(path,key,params[key]);}}}
+switch(headers['content-type']){case'application/json':params=JSON.stringify(params);break;case'multipart/form-data':let formData=new FormData();for(let param in params){if(param.hasOwnProperty(key)){formData.append(key,param[key]);}}
+params=formData;break;}
+return new Promise(function(resolve,reject){let request=new XMLHttpRequest(),key;request.withCredentials=true;request.open(method,path,true);for(key in headers){if(headers.hasOwnProperty(key)){request.setRequestHeader(key,headers[key]);}}
+request.onload=function(){if(4===request.readyState&&399>=request.status){let data=request.response;let contentType=this.getResponseHeader('content-type');contentType=contentType.substring(0,contentType.indexOf(';'));switch(contentType){case'application/json':data=JSON.parse(data);break;}
+resolve(data);}else{reject(new Error(request.statusText));}};if(progress){request.addEventListener('progress',progress);request.upload.addEventListener('progress',progress,false);}
+request.onerror=function(){reject(new Error("Network Error"));};request.send(params);})};return{'get':function(path,headers={},params={}){return call('GET',path+((params.length>0)?'?'+buildQuery(params):''),headers,{});},'post':function(path,headers={},params={},progress=null){return call('POST',path,headers,params,progress);},'put':function(path,headers={},params={},progress=null){return call('PUT',headers,params,progress);},'patch':function(path,headers={},params={},progress=null){return call('PATCH',path,headers,params,progress);},'delete':function(path,headers={},params={},progress=null){return call('DELETE',path,headers,params,progress);},'addGlobalParam':addGlobalParam,'addGlobalHeader':addGlobalHeader}}(window.document);let analytics={create:function(id,source,activity,url){return http.post('/analytics',{'content-type':'application/json'},{id:id,source:source,activity:activity,url:url,version:env.VERSION,setup:env.SETUP});},};return{analytics:analytics,};},true);})(window);(function(window){"use strict";window.ls.container.set('console',function(window){var sdk=new window.Appwrite();sdk.setEndpoint(APP_ENV.API).setProject('console').setLocale(APP_ENV.LOCALE);return sdk;},true);})(window);(function(window){"use strict";window.ls.container.set('date',function(){function format(format,timestamp){var jsdate,f
 var txtWords=['Sun','Mon','Tues','Wednes','Thurs','Fri','Satur','January','February','March','April','May','June','July','August','September','October','November','December']
 var formatChr=/\\?(.?)/gi
 var formatChrCb=function(t,s){return f[t]?f[t]():s}
@@ -2291,9 +2303,12 @@ running=false;element.style.backgroud='transparent';element.classList.add("load-
 parsedFailure[i].charAt(0).toUpperCase()+
 parsedFailure[i].slice(1),{}));}
 element.$lsSkip=false;view.render(element);});};let events=event.trim().split(",");for(let y=0;y<events.length;y++){if(""===events[y]){continue;}
-switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
-ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
-var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
+switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics",controller:function(element){let action=element.getAttribute("data-analytics-event")||"click";let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
+element.addEventListener(action,function(){let category=element.getAttribute("data-analytics-category")||"undefined";let label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
+ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-activity",controller:function(window,element,appwrite,account){let action=element.getAttribute("data-analytics-event")||"click";let activity=element.getAttribute("data-analytics-label")||"None";let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
+element.addEventListener(action,function(){let email=account?.email||element.elements['email'].value||'';appwrite.analytics.create(email,'console',activity,window.location.href)});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
+let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
+let project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
 if(target){target=document.getElementById(target);}
 button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
 clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
@@ -2310,7 +2325,7 @@ code.innerHTML=value;Prism.highlightElement(code);div.scrollTop=0;};element.addE
 function syncA(){element.value=picker.value;update();}
 function syncB(){picker.value=element.value;}
 element.parentNode.insertBefore(preview,element);update();syncB();}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-copy",controller:function(element,alerts,document,window){var button=window.document.createElement("i");button.type="button";button.className="icon-docs note copy";button.style.cursor="pointer";element.parentNode.insertBefore(button,element.nextSibling);var copy=function(event){let disabled=element.disabled;element.disabled=false;element.focus();element.select();document.execCommand("Copy");if(document.selection){document.selection.empty();}else if(window.getSelection){window.getSelection().removeAllRanges();}
-element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""},3000);};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
+element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""});};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
 str.push(v!==null&&typeof v==="object"?serialize(v,k):encodeURIComponent(k)+"="+encodeURIComponent(v));}}
 return str.join("&");};let parse=function(filter){if(filter===""){return null;}
 let operatorsMap=["!=",">=","<=","=",">","<"];let operator=null;for(let key=0;key<operatorsMap.length;key++){if(filter.indexOf(operatorsMap[key])>-1){operator=operatorsMap[key];}}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index 93dad8c00d..531a2d5208 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -129,7 +129,7 @@ paths=expression.getPaths();let prv=element.$lsSkip;element.$lsSkip=!result;if(!
 else{element.style.removeProperty('display');element.style.removeProperty('visibility');}
 if(prv===true&&element.$lsSkip===false){view.render(element)}};check();for(let i=0;i<paths.length;i++){let path=paths[i].split('.');while(path.length){container.bind(element,path.join('.'),check);path.pop();}}}});window.ls.container.get('view').add({selector:'data-ls-loop',template:false,nested:false,controller:function(element,view,container,window,expression){let expr=expression.parse(element.getAttribute('data-ls-loop'));let as=element.getAttribute('data-ls-as');let key=element.getAttribute('data-ls-key')||'$index';let limit=parseInt(expression.parse(element.getAttribute('data-limit')||'')||-1);let debug=element.getAttribute('data-debug')||false;let echo=function(){let array=container.path(expr);let counter=0;array=(!array)?[]:array;let watch=!!(array&&array.__proxy);while(element.hasChildNodes()){element.removeChild(element.lastChild);element.lastChild=null;}
 if(array instanceof Array&&typeof array!=='object'){throw new Error('Reference value must be array or object. '+(typeof array)+' given');}
-let children=[];element.$lsSkip=true;for(let prop in array){if(counter==limit){break;}
+let children=[];element.$lsSkip=true;element.style.visibility=(0===array.length&&element.style.visibility=='')?'hidden':'visible';for(let prop in array){if(counter==limit){break;}
 counter++;if(!array.hasOwnProperty(prop)){continue;}
 children[prop]=template.cloneNode(true);element.appendChild(children[prop]);(index=>{let context=expr+'.'+index;container.addNamespace(as,context);if(debug){console.info('debug-ls-loop','index',index);console.info('debug-ls-loop','context',context);console.info('debug-ls-loop','context-path',container.path(context).name);console.info('debug-ls-loop','namespaces',container.namespaces);}
 container.set(as,container.path(context),true,watch);container.set(key,index,true,false);view.render(children[prop]);container.removeNamespace(as);})(prop);}
@@ -140,7 +140,19 @@ return;}
 http.get(source).then(function(element){return function(data){element.innerHTML=data;view.render(element);element.dispatchEvent(new CustomEvent('template-loaded',{bubbles:true,cancelable:false}));}}(element),function(){throw new Error('Failed loading template');});};check(true);for(let i=0;i<paths.length;i++){let path=paths[i].split('.');while(path.length){container.bind(element,path.join('.'),check);path.pop();}}}});window.ls.error=function(){return function(error){window.console.error(error);if(window.location.pathname!=='/console'){window.location='/console';}};};window.addEventListener("error",function(event){console.error("ERROR-EVENT:",event.error.message,event.error.stack);});document.addEventListener("account.deleteSession",function(){window.location="/auth/signin";});document.addEventListener("account.create",function(){let container=window.ls.container;let form=container.get('serviceForm');let sdk=container.get('console');let promise=sdk.account.createSession(form.email,form.password);container.set("serviceForm",{},true,true);promise.then(function(){window.location='/console';},function(error){window.location='/auth/signup?failure=1';});});(function(window){"use strict";window.ls.container.set('alerts',function(window){return{list:[],ids:0,counter:0,max:5,add:function(message,time){var scope=this;message.id=scope.ids++;message.remove=function(){scope.remove(message.id);};scope.counter++;scope.list.unshift(message);if(scope.counter>scope.max){scope.list.pop();scope.counter--;}
 if(time>0){window.setTimeout(function(message){return function(){scope.remove(message.id)}}(message),time);}
 return message.id;},remove:function(id){let scope=this;for(let index=0;index<scope.list.length;index++){let obj=scope.list[index];if(obj.id===parseInt(id)){scope.counter--;if(typeof obj.callback==="function"){obj.callback();}
-scope.list.splice(index,1);};}}};},true,true);})(window);(function(window){"use strict";window.ls.container.set('console',function(window){var sdk=new window.Appwrite();sdk.setEndpoint(APP_ENV.API).setProject('console').setLocale(APP_ENV.LOCALE);return sdk;},true);})(window);(function(window){"use strict";window.ls.container.set('date',function(){function format(format,timestamp){var jsdate,f
+scope.list.splice(index,1);};}}};},true,true);})(window);(function(window){"use strict";window.ls.container.set('appwrite',function(window,env){let config={endpoint:'https://appwrite.io/v1',};let http=function(document,env){let globalParams=[],globalHeaders=[];let addParam=function(url,param,value){let a=document.createElement('a'),regex=/(?:\?|&amp;|&)+([^=]+)(?:=([^&]*))*/g;let match,str=[];a.href=url;param=encodeURIComponent(param);while(match=regex.exec(a.search))if(param!==match[1])str.push(match[1]+(match[2]?"="+match[2]:""));str.push(param+(value?"="+encodeURIComponent(value):""));a.search=str.join("&");return a.href;};let buildQuery=function(params){let str=[];for(let p in params){if(params.hasOwnProperty(p)){str.push(encodeURIComponent(p)+"="+encodeURIComponent(params[p]));}}
+return str.join("&");};let addGlobalHeader=function(key,value){globalHeaders[key]={key:key.toLowerCase(),value:value.toLowerCase()};};let addGlobalParam=function(key,value){globalParams.push({key:key,value:value});};addGlobalHeader('content-type','');let call=function(method,path,headers={},params={},progress=null){let i;path=config.endpoint+path;if(-1===['GET','POST','PUT','DELETE','TRACE','HEAD','OPTIONS','CONNECT','PATCH'].indexOf(method)){throw new Error('var method must contain a valid HTTP method name');}
+if(typeof path!=='string'){throw new Error('var path must be of type string');}
+if(typeof headers!=='object'){throw new Error('var headers must be of type object');}
+for(i=0;i<globalParams.length;i++){path=addParam(path,globalParams[i].key,globalParams[i].value);}
+for(let key in globalHeaders){if(globalHeaders.hasOwnProperty(key)){if(!headers[globalHeaders[key].key]){headers[globalHeaders[key].key]=globalHeaders[key].value;}}}
+if(method==='GET'){for(let param in params){if(param.hasOwnProperty(key)){path=addParam(path,key,params[key]);}}}
+switch(headers['content-type']){case'application/json':params=JSON.stringify(params);break;case'multipart/form-data':let formData=new FormData();for(let param in params){if(param.hasOwnProperty(key)){formData.append(key,param[key]);}}
+params=formData;break;}
+return new Promise(function(resolve,reject){let request=new XMLHttpRequest(),key;request.withCredentials=true;request.open(method,path,true);for(key in headers){if(headers.hasOwnProperty(key)){request.setRequestHeader(key,headers[key]);}}
+request.onload=function(){if(4===request.readyState&&399>=request.status){let data=request.response;let contentType=this.getResponseHeader('content-type');contentType=contentType.substring(0,contentType.indexOf(';'));switch(contentType){case'application/json':data=JSON.parse(data);break;}
+resolve(data);}else{reject(new Error(request.statusText));}};if(progress){request.addEventListener('progress',progress);request.upload.addEventListener('progress',progress,false);}
+request.onerror=function(){reject(new Error("Network Error"));};request.send(params);})};return{'get':function(path,headers={},params={}){return call('GET',path+((params.length>0)?'?'+buildQuery(params):''),headers,{});},'post':function(path,headers={},params={},progress=null){return call('POST',path,headers,params,progress);},'put':function(path,headers={},params={},progress=null){return call('PUT',headers,params,progress);},'patch':function(path,headers={},params={},progress=null){return call('PATCH',path,headers,params,progress);},'delete':function(path,headers={},params={},progress=null){return call('DELETE',path,headers,params,progress);},'addGlobalParam':addGlobalParam,'addGlobalHeader':addGlobalHeader}}(window.document);let analytics={create:function(id,source,activity,url){return http.post('/analytics',{'content-type':'application/json'},{id:id,source:source,activity:activity,url:url,version:env.VERSION,setup:env.SETUP});},};return{analytics:analytics,};},true);})(window);(function(window){"use strict";window.ls.container.set('console',function(window){var sdk=new window.Appwrite();sdk.setEndpoint(APP_ENV.API).setProject('console').setLocale(APP_ENV.LOCALE);return sdk;},true);})(window);(function(window){"use strict";window.ls.container.set('date',function(){function format(format,timestamp){var jsdate,f
 var txtWords=['Sun','Mon','Tues','Wednes','Thurs','Fri','Satur','January','February','March','April','May','June','July','August','September','October','November','December']
 var formatChr=/\\?(.?)/gi
 var formatChrCb=function(t,s){return f[t]?f[t]():s}
@@ -336,9 +348,12 @@ running=false;element.style.backgroud='transparent';element.classList.add("load-
 parsedFailure[i].charAt(0).toUpperCase()+
 parsedFailure[i].slice(1),{}));}
 element.$lsSkip=false;view.render(element);});};let events=event.trim().split(",");for(let y=0;y<events.length;y++){if(""===events[y]){continue;}
-switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
-ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
-var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
+switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics",controller:function(element){let action=element.getAttribute("data-analytics-event")||"click";let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
+element.addEventListener(action,function(){let category=element.getAttribute("data-analytics-category")||"undefined";let label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
+ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-activity",controller:function(window,element,appwrite,account){let action=element.getAttribute("data-analytics-event")||"click";let activity=element.getAttribute("data-analytics-label")||"None";let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
+element.addEventListener(action,function(){let email=account?.email||element.elements['email'].value||'';appwrite.analytics.create(email,'console',activity,window.location.href)});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
+let doNotTrack=window.navigator.doNotTrack;if(doNotTrack=='1'){return;}
+let project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
 if(target){target=document.getElementById(target);}
 button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
 clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
@@ -355,7 +370,7 @@ code.innerHTML=value;Prism.highlightElement(code);div.scrollTop=0;};element.addE
 function syncA(){element.value=picker.value;update();}
 function syncB(){picker.value=element.value;}
 element.parentNode.insertBefore(preview,element);update();syncB();}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-copy",controller:function(element,alerts,document,window){var button=window.document.createElement("i");button.type="button";button.className="icon-docs note copy";button.style.cursor="pointer";element.parentNode.insertBefore(button,element.nextSibling);var copy=function(event){let disabled=element.disabled;element.disabled=false;element.focus();element.select();document.execCommand("Copy");if(document.selection){document.selection.empty();}else if(window.getSelection){window.getSelection().removeAllRanges();}
-element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""},3000);};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
+element.disabled=disabled;element.blur();alerts.add({text:"Copied to clipboard",class:""});};button.addEventListener("click",copy);}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document",controller:function(element,container,search){var formsDocument=(element.dataset["formsDocument"]||'');var searchButton=(element.dataset["search"]||0);let path=container.scope(searchButton);element.addEventListener('click',function(){search.selected=element.value;search.path=path;document.dispatchEvent(new CustomEvent(formsDocument,{bubbles:false,cancelable:true}));});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-document-preview",controller:function(element,container,search){element.addEventListener('change',function(){console.log(element.value);});}});})(window);(function(window){window.ls.container.get("view").add({selector:"data-forms-filter",controller:function(document,container,expression,element,form,di){let name=element.dataset["formsFilter"]||"";let events=element.dataset["event"]||"";let serialize=function(obj,prefix){let str=[],p;for(p in obj){if(obj.hasOwnProperty(p)){let k=prefix?prefix+"["+p+"]":p,v=obj[p];if(v===""){continue;}
 str.push(v!==null&&typeof v==="object"?serialize(v,k):encodeURIComponent(k)+"="+encodeURIComponent(v));}}
 return str.join("&");};let parse=function(filter){if(filter===""){return null;}
 let operatorsMap=["!=",">=","<=","=",">","<"];let operator=null;for(let key=0;key<operatorsMap.length;key++){if(filter.indexOf(operatorsMap[key])>-1){operator=operatorsMap[key];}}
diff --git a/public/scripts/dependencies/litespeed.js b/public/scripts/dependencies/litespeed.js
index 4ea4c8784e..10f4bf1a16 100644
--- a/public/scripts/dependencies/litespeed.js
+++ b/public/scripts/dependencies/litespeed.js
@@ -129,7 +129,7 @@ paths=expression.getPaths();let prv=element.$lsSkip;element.$lsSkip=!result;if(!
 else{element.style.removeProperty('display');element.style.removeProperty('visibility');}
 if(prv===true&&element.$lsSkip===false){view.render(element)}};check();for(let i=0;i<paths.length;i++){let path=paths[i].split('.');while(path.length){container.bind(element,path.join('.'),check);path.pop();}}}});window.ls.container.get('view').add({selector:'data-ls-loop',template:false,nested:false,controller:function(element,view,container,window,expression){let expr=expression.parse(element.getAttribute('data-ls-loop'));let as=element.getAttribute('data-ls-as');let key=element.getAttribute('data-ls-key')||'$index';let limit=parseInt(expression.parse(element.getAttribute('data-limit')||'')||-1);let debug=element.getAttribute('data-debug')||false;let echo=function(){let array=container.path(expr);let counter=0;array=(!array)?[]:array;let watch=!!(array&&array.__proxy);while(element.hasChildNodes()){element.removeChild(element.lastChild);element.lastChild=null;}
 if(array instanceof Array&&typeof array!=='object'){throw new Error('Reference value must be array or object. '+(typeof array)+' given');}
-let children=[];element.$lsSkip=true;for(let prop in array){if(counter==limit){break;}
+let children=[];element.$lsSkip=true;element.style.visibility=(0===array.length&&element.style.visibility=='')?'hidden':'visible';for(let prop in array){if(counter==limit){break;}
 counter++;if(!array.hasOwnProperty(prop)){continue;}
 children[prop]=template.cloneNode(true);element.appendChild(children[prop]);(index=>{let context=expr+'.'+index;container.addNamespace(as,context);if(debug){console.info('debug-ls-loop','index',index);console.info('debug-ls-loop','context',context);console.info('debug-ls-loop','context-path',container.path(context).name);console.info('debug-ls-loop','namespaces',container.namespaces);}
 container.set(as,container.path(context),true,watch);container.set(key,index,true,false);view.render(children[prop]);container.removeNamespace(as);})(prop);}
diff --git a/public/scripts/services/api.js b/public/scripts/services/api.js
new file mode 100644
index 0000000000..521e38609f
--- /dev/null
+++ b/public/scripts/services/api.js
@@ -0,0 +1,201 @@
+(function (window) {
+    "use strict";
+
+    window.ls.container.set('appwrite', function (window, env) {
+        let config = {
+            endpoint: 'https://appwrite.io/v1',
+        };
+
+        let http = function (document, env) {
+            let globalParams = [],
+                globalHeaders = [];
+
+            let addParam = function (url, param, value) {
+                let a = document.createElement('a'), regex = /(?:\?|&amp;|&)+([^=]+)(?:=([^&]*))*/g;
+                let match, str = [];
+                a.href = url;
+                param = encodeURIComponent(param);
+
+                while (match = regex.exec(a.search)) if (param !== match[1]) str.push(match[1] + (match[2] ? "=" + match[2] : ""));
+
+                str.push(param + (value ? "=" + encodeURIComponent(value) : ""));
+
+                a.search = str.join("&");
+
+                return a.href;
+            };
+
+            /**
+             * @param {Object} params
+             * @returns {string}
+             */
+            let buildQuery = function (params) {
+                let str = [];
+
+                for (let p in params) {
+                    if (params.hasOwnProperty(p)) {
+                        str.push(encodeURIComponent(p) + "=" + encodeURIComponent(params[p]));
+                    }
+                }
+
+                return str.join("&");
+            };
+
+            let addGlobalHeader = function (key, value) {
+                globalHeaders[key] = { key: key.toLowerCase(), value: value.toLowerCase() };
+            };
+
+            let addGlobalParam = function (key, value) {
+                globalParams.push({ key: key, value: value });
+            };
+
+            addGlobalHeader('content-type', '');
+
+            /**
+             * @param {string} method
+             * @param {string} path string
+             * @param {Object} headers
+             * @param {Object} params
+             * @param {function} progress
+             * @returns {Promise}
+             */
+            let call = function (method, path, headers = {}, params = {}, progress = null) {
+                let i;
+
+                path = config.endpoint + path;
+
+                if (-1 === ['GET', 'POST', 'PUT', 'DELETE', 'TRACE', 'HEAD', 'OPTIONS', 'CONNECT', 'PATCH'].indexOf(method)) {
+                    throw new Error('var method must contain a valid HTTP method name');
+                }
+
+                if (typeof path !== 'string') {
+                    throw new Error('var path must be of type string');
+                }
+
+                if (typeof headers !== 'object') {
+                    throw new Error('var headers must be of type object');
+                }
+
+                for (i = 0; i < globalParams.length; i++) { // Add global params to URL
+                    path = addParam(path, globalParams[i].key, globalParams[i].value);
+                }
+
+                for (let key in globalHeaders) { // Add Global Headers
+                    if (globalHeaders.hasOwnProperty(key)) {
+                        if (!headers[globalHeaders[key].key]) {
+                            headers[globalHeaders[key].key] = globalHeaders[key].value;
+                        }
+                    }
+                }
+
+                if (method === 'GET') {
+                    for (let param in params) {
+                        if (param.hasOwnProperty(key)) {
+                            path = addParam(path, key, params[key]);
+                        }
+                    }
+                }
+
+                switch (headers['content-type']) { // Parse request by content type
+                    case 'application/json':
+                        params = JSON.stringify(params);
+                        break;
+
+                    case 'multipart/form-data':
+                        let formData = new FormData();
+                        for (let param in params) {
+                            if (param.hasOwnProperty(key)) {
+                                formData.append(key, param[key]);
+                            }
+                        }
+
+                        params = formData;
+                        break;
+                }
+
+                return new Promise(function (resolve, reject) {
+
+                    let request = new XMLHttpRequest(), key;
+
+                    request.withCredentials = true;
+                    request.open(method, path, true);
+
+                    for (key in headers) { // Set Headers
+                        if (headers.hasOwnProperty(key)) {
+                            request.setRequestHeader(key, headers[key]);
+                        }
+                    }
+
+                    request.onload = function () {
+                        if (4 === request.readyState && 399 >= request.status) {
+                            let data = request.response;
+                            let contentType = this.getResponseHeader('content-type');
+                            contentType = contentType.substring(0, contentType.indexOf(';'));
+
+                            switch (contentType) {
+                                case 'application/json':
+                                    data = JSON.parse(data);
+                                    break;
+                            }
+
+                            resolve(data);
+
+                        } else {
+                            reject(new Error(request.statusText));
+                        }
+                    };
+
+                    if (progress) {
+                        request.addEventListener('progress', progress);
+                        request.upload.addEventListener('progress', progress, false);
+                    }
+
+                    // Handle network errors
+                    request.onerror = function () {
+                        reject(new Error("Network Error"));
+                    };
+
+                    request.send(params);
+                })
+            };
+
+            return {
+                'get': function (path, headers = {}, params = {}) {
+                    return call('GET', path + ((params.length > 0) ? '?' + buildQuery(params) : ''), headers, {});
+                },
+                'post': function (path, headers = {}, params = {}, progress = null) {
+                    return call('POST', path, headers, params, progress);
+                },
+                'put': function (path, headers = {}, params = {}, progress = null) {
+                    return call('PUT', headers, params, progress);
+                },
+                'patch': function (path, headers = {}, params = {}, progress = null) {
+                    return call('PATCH', path, headers, params, progress);
+                },
+                'delete': function (path, headers = {}, params = {}, progress = null) {
+                    return call('DELETE', path, headers, params, progress);
+                },
+                'addGlobalParam': addGlobalParam,
+                'addGlobalHeader': addGlobalHeader
+            }
+        }(window.document);
+
+        let analytics = {
+            create: function (id, source, activity, url) {
+                return http.post('/analytics', { 'content-type': 'application/json' }, {
+                    id: id,
+                    source: source,
+                    activity: activity,
+                    url: url,
+                    version: env.VERSION,
+                    setup: env.SETUP
+                });
+            },
+        };
+
+        return {
+            analytics: analytics,
+        };
+    }, true);
+
+})(window);
\ No newline at end of file
diff --git a/public/scripts/views/analytics/activity.js b/public/scripts/views/analytics/activity.js
new file mode 100644
index 0000000000..274ee0f95d
--- /dev/null
+++ b/public/scripts/views/analytics/activity.js
@@ -0,0 +1,22 @@
+(function(window) {
+  "use strict";
+
+  window.ls.container.get("view").add({
+    selector: "data-analytics-activity",
+    controller: function(window, element, appwrite, account) {
+      let action = element.getAttribute("data-analytics-event") || "click";
+      let activity = element.getAttribute("data-analytics-label") || "None";
+      let doNotTrack = window.navigator.doNotTrack;
+
+      if(doNotTrack == '1') {
+        return;
+      }
+      
+      element.addEventListener(action, function() {
+        let email = account?.email || element.elements['email'].value || '';
+  
+        appwrite.analytics.create(email, 'console', activity, window.location.href)
+      });
+    }
+  });
+})(window);
diff --git a/public/scripts/views/analytics/event.js b/public/scripts/views/analytics/event.js
index 0ca7bfe7c9..c1a18098ae 100644
--- a/public/scripts/views/analytics/event.js
+++ b/public/scripts/views/analytics/event.js
@@ -2,14 +2,19 @@
   "use strict";
 
   window.ls.container.get("view").add({
-    selector: "data-analytics-event",
+    selector: "data-analytics",
     controller: function(element) {
-      var action = element.getAttribute("data-analytics-event") || "click";
+      let action = element.getAttribute("data-analytics-event") || "click";
+      let doNotTrack = window.navigator.doNotTrack;
+
+      if(doNotTrack == '1') {
+        return;
+      }
 
       element.addEventListener(action, function() {
-        var category =
+        let category =
           element.getAttribute("data-analytics-category") || "undefined";
-        var label = element.getAttribute("data-analytics-label") || "undefined";
+        let label = element.getAttribute("data-analytics-label") || "undefined";
 
         if (!ga) {
           console.error("Google Analytics ga object is not available");
diff --git a/public/scripts/views/analytics/pageview.js b/public/scripts/views/analytics/pageview.js
index e09f5346f9..b36b841ce3 100644
--- a/public/scripts/views/analytics/pageview.js
+++ b/public/scripts/views/analytics/pageview.js
@@ -7,8 +7,14 @@
       if (!ga) {
         console.error("Google Analytics ga object is not available");
       }
+      
+      let doNotTrack = window.navigator.doNotTrack;
 
-      var project = router.params["project"] || 'None';
+      if(doNotTrack == '1') {
+        return;
+      }
+
+      let project = router.params["project"] || 'None';
 
       ga("set", "page", window.location.pathname);