diff --git a/backend/src/appenlight/static/js/appenlight.js b/backend/src/appenlight/static/js/appenlight.js
index 5594949..2886332 100644
--- a/backend/src/appenlight/static/js/appenlight.js
+++ b/backend/src/appenlight/static/js/appenlight.js
@@ -2703,6 +2703,15 @@ angular.module('appenlight.components', [
     'appenlight.components.jiraIntegrationConfigView',
     'appenlight.components.slackIntegrationConfigView',
     'appenlight.components.webhooksIntegrationConfigView',
+    'appenlight.components.adminView',
+    'appenlight.components.adminApplicationsListView',
+    'appenlight.components.adminUsersListView',
+    'appenlight.components.adminUsersCreateView',
+    'appenlight.components.adminGroupsListView',
+    'appenlight.components.adminGroupsCreateView',
+    'appenlight.components.adminConfigurationView',
+    'appenlight.components.adminSystemView',
+    'appenlight.components.adminPartitionsView',
     'appenlight.components.settingsView'
 ]);
 angular.module('appenlight.directives', [
@@ -2988,3642 +2997,3426 @@ function kickstartAE(initialUserData) {
   );
 
 
-  $templateCache.put('components/views/applications-integrations-view/applications-integrations-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.application && $state.is('applications.integrations')\"></ng-include>\n" +
-    "\n" +
-    "<ui-view>\n" +
-    "    <div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.application\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "        <div class=\"panel-body\">\n" +
+  $templateCache.put('components/views/admin-applications-list-view/admin-applications-list-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.applications\"></ng-include>\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'bitbucket'})\">\n" +
-    "                <span class=\"fa fa-fw fa-bitbucket fa-3x pull-left\"></span>\n" +
-    "                <strong>Bitbucket</strong>\n" +
+    "<div class=\"panel panel-default\" ng-if=\"!$ctrl.loading.applications\">\n" +
+    "    <div class=\"panel-heading\">\n" +
     "\n" +
-    "                <p>Send issues and reports to Bitbucket</p>\n" +
-    "            </a>\n" +
+    "        Currently active applications: {{$ctrl.applications.length}}\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'campfire'})\">\n" +
-    "                <span class=\"fa fa-fw fa-comment fa-3x pull-left\"></span>\n" +
-    "                <strong>Campfire</strong>\n" +
+    "    </div>\n" +
     "\n" +
-    "                <p>Receive reports and alerts in your Campfire rooms</p>\n" +
-    "            </a>\n" +
+    "    <table st-table=\"displayedCollection\" st-safe-src=\"$ctrl.applications\" class=\"table table-striped\">\n" +
+    "        <thead>\n" +
+    "        <tr>\n" +
+    "            <th st-sort=\"resource_name\"><a>Application name</a></th>\n" +
+    "            <th st-sort=\"owner_user_name\"><a>Owner User</a></th>\n" +
+    "            <th st-sort=\"owner_group_name\"><a>Owner Group</a></th>\n" +
+    "            <th class=\"options\"></th>\n" +
+    "        </tr>\n" +
+    "        <tr>\n" +
+    "            <th><input st-search=\"resource_name\" placeholder=\"search for application\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "            <th><input st-search=\"owner_user_name\" placeholder=\"search for user\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "            <th><input st-search=\"owner_group_name\" placeholder=\"search for group\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "            <th></th>\n" +
+    "        </tr>\n" +
+    "        </thead>\n" +
+    "        <tbody>\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'flowdock'})\">\n" +
-    "                <span class=\"fa fa-fw fa-envelope fa-3x pull-left\"></span>\n" +
-    "                <strong>Flowdock</strong>\n" +
+    "        <tr ng-repeat=\"resource in displayedCollection track by resource.resource_id\">\n" +
+    "            <td> {{resource.resource_name}}</td>\n" +
+    "            <td>{{resource.owner_user_name}}</td>\n" +
+    "            <td>{{resource.owner_group_name}}</td>\n" +
+    "            <td>\n" +
+    "                <a class=\"btn btn-default btn-sm\" data-ui-sref=\"applications.update({resourceId:resource.resource_id})\" data-toggle=\"tooltip\" title=\"Update application\"><span class=\"fa fa-cog\"></span></a>\n" +
+    "            </td>\n" +
+    "        </tr>\n" +
+    "        <tfoot>\n" +
+    "        <tr>\n" +
+    "            <td colspan=\"4\" class=\"text-center\">\n" +
+    "                <div st-pagination=\"\" st-items-by-page=\"100\" st-displayed-pages=\"7\"></div>\n" +
+    "            </td>\n" +
+    "        </tr>\n" +
+    "        </tfoot>\n" +
+    "        </tbody>\n" +
+    "    </table>\n" +
     "\n" +
-    "                <p>Receive reports and alerts on your Flowdock team\n" +
-    "                    inbox</p>\n" +
-    "            </a>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/admin-configuration-view/admin-configuration-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.config\"></ng-include>\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'github'})\">\n" +
-    "                <span class=\"fa fa-fw fa-github fa-3x pull-left\"></span>\n" +
-    "                <strong>Github</strong>\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.config\">\n" +
+    "    <div class=\"panel-heading\">\n" +
+    "        <h3 class=\"panel-title\">Basic Configuration</h3>\n" +
+    "    </div>\n" +
+    "    <div class=\"panel-body\">\n" +
+    "        <h2>Visual</h2>\n" +
+    "        <form class=\"form-horizontal\">\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    Footer HTML\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <textarea class=\"form-control\" type=\"text\" ng-model=\"$ctrl.configs.global.template_footer_html.value\" style=\"min-height: 150px\"></textarea>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </form>\n" +
     "\n" +
-    "                <p>Send issues and reports to Github</p>\n" +
-    "            </a>\n" +
+    "        <h2>Functional</h2>\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'hipchat'})\">\n" +
-    "                <span class=\"fa fa-fw fa-comment fa-3x pull-left\"></span>\n" +
-    "                <strong>HipChat</strong>\n" +
+    "        <form class=\"form-horizontal\">\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    Show user groups to non-admin users\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <button type=\"button\" class=\"btn btn-default\" ng-model=\"$ctrl.configs.global.list_groups_to_non_admins.value\" uib-btn-checkbox>\n" +
+    "                        Enable\n" +
+    "                    </button>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </form>\n" +
     "\n" +
-    "                <p>Receive reports and alerts in your Hipchat chanels</p>\n" +
-    "            </a>\n" +
+    "        <h2>Global Rate Limiting</h2>\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'jira'})\">\n" +
-    "                <span class=\"fa fa-fw fa-ticket fa-3x pull-left\"></span>\n" +
-    "                <strong>Jira</strong>\n" +
+    "        <form class=\"form-horizontal\">\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    Ignore reports per minute/per application\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input class=\"form-control\" type=\"number\" ng-model=\"$ctrl.configs.global.per_application_reports_rate_limit.value\" />\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "                <p>Send issues and reports to Jira</p>\n" +
-    "            </a>\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    Ignore logs per minute/per application\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input class=\"form-control\" type=\"number\" ng-model=\"$ctrl.configs.global.per_application_logs_rate_limit.value\" />\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'slack'})\">\n" +
-    "                <span class=\"fa fa-fw fa-comment fa-3x pull-left\"></span>\n" +
-    "                <strong>Slack</strong>\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    Ignore metrics per minute/per application\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input class=\"form-control\" type=\"number\" ng-model=\"$ctrl.configs.global.per_application_metrics_rate_limit.value\" />\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "                <p>Receive reports and alerts in your Slack chanels</p>\n" +
-    "            </a>\n" +
+    "        </form>\n" +
     "\n" +
-    "            <a class=\"btn btn-default integration\"\n" +
-    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'webhooks'})\">\n" +
-    "                <span class=\"fa fa-fw fa-cloud-upload fa-3x pull-left\"></span>\n" +
-    "                <strong>Webhooks</strong>\n" +
+    "        <hr/>\n" +
     "\n" +
-    "                <p>Notify third party API's of your reports and alerts</p>\n" +
-    "            </a>\n" +
-    "        </div>\n" +
+    "        <a class=\"btn btn-primary\" ng-click=\"$ctrl.save()\">Save configuration</a>\n" +
     "    </div>\n" +
-    "</ui-view>\n"
-  );
-
-
-  $templateCache.put('components/views/applications-list-view/applications-list-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.applications\"></ng-include>\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.applications\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\" ng-if=\"$ctrl.applications.length === 0 \">\n" +
+    "</div>\n" +
     "\n" +
-    "        <p>You have to create a new application first.</p>\n" +
     "\n" +
+    "<div class=\"panel panel-default\">\n" +
+    "    <div class=\"panel-heading\">\n" +
+    "        <h3 class=\"panel-title\">Plugin Configuration</h3>\n" +
+    "    </div>\n" +
+    "    <div class=\"panel-body\">\n" +
+    "        <plugin-config section=\"'admin.config'\">\n" +
+    "        </plugin-config>\n" +
     "    </div>\n" +
-    "\n" +
-    "    <table class=\"table table-striped\" ng-if=\"$ctrl.applications.length > 0\">\n" +
-    "        <thead>\n" +
-    "        <tr>\n" +
-    "            <th class=\"resource_name\">Resource Name</th>\n" +
-    "            <th class=\"domains\">Domains</th>\n" +
-    "            <th class=\"options\">Options</th>\n" +
-    "        </tr>\n" +
-    "        </thead>\n" +
-    "        <tbody>\n" +
-    "        <tr class=\"r{{$index+1}}\" ng-repeat=\"application in $ctrl.applications\">\n" +
-    "            <td>{{application.resource_name}}</td>\n" +
-    "            <td>{{application.domains}}</td>\n" +
-    "            <td class=\"options\">\n" +
-    "                <a class=\"btn btn-default\" data-ui-sref=\"applications.update({resourceId:application.resource_id})\" data-toggle=\"tooltip\" title=\"Update application\"><span class=\"fa fa-cog\"></span> Update</a>\n" +
-    "                <a class=\"btn btn-default\" data-ui-sref=\"applications.integrations({resourceId:application.resource_id})\" data-toggle=\"tooltip\" title=\"Manage Integrations\"><span class=\"fa fa-wrench\"></span> Integrations</a>\n" +
-    "            </td>\n" +
-    "        </tr>\n" +
-    "        </tbody>\n" +
-    "    </table>\n" +
-    "\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/applications-purge-logs-view/applications-purge-logs-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.applications\"></ng-include>\n" +
+  $templateCache.put('components/views/admin-groups-create-view/admin-groups-create-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.group\"></ng-include>\n" +
+    "\n" +
+    "<div ng-show=\"!$ctrl.loading.group\">\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.applications\">\n" +
     "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
     "        <div class=\"panel-body\">\n" +
-    "\n" +
-    "            <form method=\"post\" class=\"form-horizontal\" name=\"$ctrl.form\" ng-submit=\"$ctrl.purgeLogs()\">\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <label class=\"control-label col-sm-3 col-lg-2\">Application:</label>\n" +
-    "\n" +
-    "                    <div class=\"col-sm-9 col-lg-10 form-inline\">\n" +
-    "                        <select ng-model=\"$ctrl.selectedResource\" ng-change=\"$ctrl.getCommonKeys()\"\n" +
-    "                                ng-options=\"r.resource_id as r.resource_name for r in $ctrl.applications\" class=\"form-control\"></select>\n" +
+    "            <form name=\"$ctrl.groupForm\" class=\"form-horizontal\" ng-submit=\"$ctrl.createGroup()\">\n" +
+    "                <div class=\"form-group\" id=\"row-group_name\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.groupForm.ae_validation.group_name\"></data-form-errors>\n" +
+    "                    <label for=\"group_name\" id=\"label-group_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Group name\n" +
+    "                        <span class=\"required\">*</span>\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"group_name\" name=\"group_name\" type=\"text\" ng-model=\"$ctrl.group.group_name\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <label class=\"control-label col-sm-3 col-lg-2\">Namespace:</label>\n" +
-    "\n" +
-    "                    <div class=\"col-sm-9 col-lg-10\">\n" +
-    "                        <input type=\"text\" name=\"namespace\" ng-model=\"$ctrl.namespace\"\n" +
-    "                               placeholder=\"Namespace to filter on\" uib-typeahead=\"ns for ns in $ctrl.commonNamespaces\"\n" +
-    "                               class=\"form-control\">\n" +
+    "                <div class=\"form-group\" id=\"row-description\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.groupForm.ae_validation.description\"></data-form-errors>\n" +
+    "                    <label for=\"description\" id=\"label-description\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Description\n" +
+    "                        <span class=\"required\">*</span>\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"description\" name=\"description\" type=\"text\" ng-model=\"$ctrl.group.description\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
     "\n" +
-    "                    <div class=\"col-sm-8 col-lg-9 \">\n" +
-    "                        <input class=\"form-control btn btn-primary\" name=\"submit\" type=\"submit\" value=\"Purge logs meeting the criteria\">\n" +
+    "                <div class=\"form-group\" id=\"row-submit\">\n" +
+    "                    <label for=\"submit\" id=\"label-submit\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"{{$ctrl.$state.params.groupId ? 'Update' : 'Add'}} Group\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "\n" +
     "            </form>\n" +
     "        </div>\n" +
     "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/applications-update-view/applications-update-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.application\"></ng-include>\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.application\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel panel-default\" ng-if=\"$ctrl.group.id\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            <h3 class=\"panel-title\">Permissions summary</h3>\n" +
+    "        </div>\n" +
     "        <div class=\"panel-body\">\n" +
+    "            <h3>Direct application permissions</h3>\n" +
     "\n" +
-    "            <div class=\"row\" ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "                <div class=\"col-sm-6\">\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li ng-repeat=\"perm in $ctrl.resourcePermissions.group.application\" class=\"animate-repeat list-group-item\">\n" +
+    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
     "\n" +
-    "                    <uib-tabset>\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                API keys\n" +
-    "                            </uib-tab-heading>\n" +
+    "                    <div class=\"pull-right\">\n" +
     "\n" +
-    "                            <p><strong>PRIVATE API KEY:</strong></p>\n" +
-    "                            <p>\n" +
-    "                            <div class=\"well well-sm\">{{ $ctrl.resource.api_key }}</div>\n" +
-    "                            </p>\n" +
-    "                            <p><strong>PUBLIC API KEY</strong> (for javascript clients):</p>\n" +
-    "                            <p>\n" +
-    "                            <div class=\"well well-sm\">{{ $ctrl.resource.public_key }}</div>\n" +
-    "                            </p>\n" +
-    "                            <p><small>Your key will be used to identify to which application your data\n" +
-    "                                belongs to please keep them private at all times.</small></p>\n" +
-    "\n" +
-    "                        </uib-tab>\n" +
-    "\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                <span class=\"btn btn-danger btn-xs\"><span class=\"fa fa-exclamation-triangle\"></span></span> Regenerate API keys\n" +
-    "                            </uib-tab-heading>\n" +
-    "                            <p>Are you sure you want to regenerate API KEY for this application?</p>\n" +
-    "                            <p>All client application keys will need to be updated.</p>\n" +
-    "                            <form ng-submit=\"$ctrl.regenerateAPIKeys()\" name=\"$ctrl.regenerateAPIKeysForm\" class=\"form-inline\">\n" +
-    "                                <data-form-errors errors=\"$ctrl.regenerateAPIKeysForm.ae_validation.password\"></data-form-errors>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                <input type=\"password\" name=\"confirm\"\n" +
-    "                                       placeholder=\"Enter your password to proceed\" class=\"form-control\" ng-model=\"$ctrl.regenerateAPIKeysPassword\">\n" +
-    "                                <input type=\"submit\" class=\"btn btn-danger\" value=\"Confirm\">\n" +
-    "                                </div>\n" +
-    "                            </form>\n" +
-    "                        </uib-tab>\n" +
-    "                    </uib-tabset>\n" +
-    "                </div>\n" +
-    "                <div class=\"col-sm-6 text-center\">\n" +
-    "                    <h2 class=\"m-t-0\">How to connect your application?</h2>\n" +
-    "                    <p>Visit our <a href=\"{{AeConfig.urls.docs}}\"><strong>developer documentation</strong></a> for step-by-step integration instructions.</p>\n" +
-    "                    <div class=\"clearfix\"></div>\n" +
-    "                    <p class=\"text-center\">\n" +
-    "                        <a href=\"{{AeConfig.urls.docs}}\"><img src=\"/static/appenlight/images/logos/django_small.png\" alt=\"Django Logo\">\n" +
-    "                            <img src=\"/static/appenlight/images/logos/pyramid_small.png\" alt=\"Pyramid Logo\">\n" +
-    "                            <img src=\"/static/appenlight/images/logos/flask_small.png\" alt=\"Flask Logo\"></a>\n" +
+    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
     "\n" +
-    "                        <a href=\"{{AeConfig.urls.docs}}\"><img src=\"/static/appenlight/images/logos/js_small.png\" alt=\"Javascript Logo\">\n" +
-    "                            <img src=\"/static/appenlight/images/logos/nodejs.png\" alt=\"Node.js\"></a>\n" +
-    "                        <img src=\"/static/appenlight/images/logos/ruby_small.png\" alt=\"Ruby Logo\">\n" +
-    "                        <img src=\"/static/appenlight/images/logos/php_small.png\" alt=\"PHP Logo\">\n" +
+    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Application\" data-ui-sref=\"applications.update({resourceId:perm.self.resource_id})\">\n" +
+    "                            <span class=\"fa fa-cog\"></span>\n" +
     "                        </a>\n" +
-    "\n" +
-    "                    </p>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "\n" +
-    "            <hr ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "\n" +
-    "            <form method=\"post\" class=\"form-horizontal\" name=\"$ctrl.BasicForm\" ng-submit=\"$ctrl.updateBasicForm()\" novalidate>\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.resource_name\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Application name\n" +
-    "                            <span class=\"required\">*</span>\n" +
-    "                        </label>\n" +
-    "\n" +
-    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
-    "                            <input class=\"form-control\"  name=\"resource_name\" placeholder=\"Application Name\" type=\"text\" ng-model=\"$ctrl.resource.resource_name\">\n" +
-    "                        </div>\n" +
-    "\n" +
-    "\n" +
     "                    </div>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
     "\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.domains\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Domain names for CORS headers\n" +
-    "                        </label>\n" +
-    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
-    "                            <textarea class=\"form-control\"  name=\"domains\"  ng-model=\"$ctrl.resource.domains\"></textarea>\n" +
-    "                            <p class=\"description\">Required for Javascript error tracking (one line one domain, skip http:// part)</p>\n" +
-    "                        </div>\n" +
-    "\n" +
+    "            <h3>Direct dashboard permissions</h3>\n" +
     "\n" +
-    "                    </div>\n" +
-    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.default_grouping\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Default grouping for errors\n" +
-    "                        </label>\n" +
-    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
-    "                            <select class=\"form-control\"  name=\"default_grouping\" ng-model=\"$ctrl.resource.default_grouping\" ng-options=\"i[0] as i[1] for i in $ctrl.groupingOptions\"></select>\n" +
-    "                        </div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li ng-repeat=\"perm in $ctrl.resourcePermissions.group.dashboard\" class=\"animate-repeat list-group-item\">\n" +
+    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
     "\n" +
-    "                    </div>\n" +
-    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.error_report_threshold\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Alert on error reports\n" +
-    "                            <span class=\"required\">*</span>\n" +
-    "                        </label>\n" +
-    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
-    "                            <input class=\"form-control\"  name=\"error_report_threshold\" type=\"text\" ng-model=\"$ctrl.resource.error_report_threshold\">\n" +
-    "                            <p class=\"description\">Application requires to send at least this amount of error reports per minute to open alert</p>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.slow_report_threshold\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Alert on slow reports\n" +
-    "                            <span class=\"required\">*</span>\n" +
-    "                        </label>\n" +
+    "                    <div class=\"pull-right\">\n" +
+    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
     "\n" +
-    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
-    "                            <input class=\"form-control\"  name=\"slow_report_threshold\" type=\"text\" ng-model=\"$ctrl.resource.slow_report_threshold\">\n" +
-    "                            <p class=\"description\">Application requires to send at least this amount of slow reports per minute to open alert</p>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.allow_permanent_storage\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Permanent logs\n" +
-    "                        </label>\n" +
-    "                        <div class=\" col-sm-8 col-lg-9\">\n" +
-    "                            <input class=\"form-control\"  name=\"allow_permanent_storage\" type=\"checkbox\"  ng-model=\"$ctrl.resource.allow_permanent_storage\">\n" +
-    "                            <p class=\"description\">Allow permanent storage of logs in separate DB partitions (only administrator can enable this feature)</p>\n" +
-    "                        </div>\n" +
+    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Dashboard\" data-ui-sref=\"dashboard.update({resourceId:perm.self.resource_id})\">\n" +
+    "                            <span class=\"fa fa-cog\"></span>\n" +
+    "                        </a>\n" +
     "                    </div>\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "\n" +
-    "                        </label>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
     "\n" +
-    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
-    "                            <input class=\"form-control btn btn-primary\"  name=\"submit\" type=\"submit\" value=\"{{$ctrl.resource.resource_id? 'Update' : 'Create'}} Application\">\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "            </form>\n" +
     "        </div>\n" +
+    "\n" +
     "    </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "\n" +
+    "    <div class=\"panel panel-default\" ng-if=\"$ctrl.group.id\">\n" +
     "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">Plugins</h3>\n" +
+    "            <h3 class=\"panel-title\">User list</h3>\n" +
     "        </div>\n" +
     "        <div class=\"panel-body\">\n" +
     "\n" +
-    "        <plugin-config resource=\"$ctrl.resource\"\n" +
-    "                       section=\"'application.update'\"\n" +
-    "                       ng-if=\"$ctrl.resource.resource_id\">\n" +
-    "        </plugin-config>\n" +
+    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"$ctrl.addUser()\">\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <input placeholder=\"Username or email\" type=\"text\" class=\"autocomplete form-control\" ng-model=\"$ctrl.form.autocompleteUser\" uib-typeahead=\"u for u in $ctrl.searchUsers($viewValue) | limitTo:8\" typeahead-loading=\"searchingUsers\" typeahead-wait-ms=\"250\"/>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <button class=\"btn btn-info\" ng-disabled=\"!$ctrl.form.autocompleteUser\"><span class=\"fa fa-user\"></span> Add user</button>\n" +
+    "                </div>\n" +
+    "            </form>\n" +
     "\n" +
     "        </div>\n" +
-    "    </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default m-t-1\" ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">API Testing</h3>\n" +
-    "        </div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <p>Please be sure to add at least one <a data-ui-sref=\"user.alert_channels.email\"><strong>email alert channel</strong></a> for your account.</p>\n" +
-    "            <p>This will enable AppEnlight to send you notification emails about errors inside your $ctrl.</p>\n" +
-    "            <p><strong>After this is done you can use this CURL commands to test APIs:</strong></p>\n" +
-    "            <p>(Please note that the data like execution times is semi randomly generated)</p>\n" +
-    "            <uib-tabset>\n" +
-    "                <uib-tab>\n" +
-    "                    <uib-tab-heading>\n" +
-    "                        Log API\n" +
-    "                    </uib-tab-heading>\n" +
+    "        <table st-table=\"displayedCollection\" st-safe-src=\"$ctrl.users\" class=\"table table-striped\">\n" +
+    "            <thead>\n" +
+    "            <tr>\n" +
+    "                <th st-sort=\"user_name\"><a>Username</a></th>\n" +
+    "                <th st-sort=\"email\"><a>Email</a></th>\n" +
+    "                <th st-sort=\"status\"><a>Status</a></th>\n" +
+    "                <th st-sort=\"first_name\"><a>First Name</a></th>\n" +
+    "                <th st-sort=\"last_name\"><a>Last Name</a></th>\n" +
+    "                <th st-sort=\"last_login_date\"><a>Last login</a></th>\n" +
+    "                <th class=\"options\" style=\"width: 130px\"></th>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <th><input st-search=\"user_name\" placeholder=\"search for user name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th><input st-search=\"email\" placeholder=\"search for email\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th></th>\n" +
+    "                <th><input st-search=\"first_name\" placeholder=\"search for first name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th><input st-search=\"last_name\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th><input st-search=\"last_login_date\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th></th>\n" +
+    "            </tr>\n" +
+    "            </thead>\n" +
+    "            <tbody>\n" +
     "\n" +
-    "                    <div class=\"codehilite\">\n" +
-    "                    <pre class=\"m-a-0\">\n" +
-    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/logs?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
-    "    [\n" +
-    "      {\n" +
-    "      \"log_level\": \"WARNING\",\n" +
-    "      \"message\": \"OMG ValueError happened\",\n" +
-    "      \"namespace\": \"some.namespace.indicator\",\n" +
-    "      \"request_id\": \"SOME_UUID\",\n" +
-    "      \"permanent\": false,\n" +
-    "      \"primary_key\": \"random_key\",\n" +
-    "      \"server\": \"some.server.hostname\",\n" +
-    "      \"date\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
-    "      \"tags\": [[\"tag1\",\"value\"], [\"tag2\", 5]]\n" +
-    "      },\n" +
-    "      {\n" +
-    "      \"log_level\": \"ERROR\",\n" +
-    "      \"message\": \"OMG ValueError happened2\",\n" +
-    "      \"namespace\": \"some.namespace.indicator\",\n" +
-    "      \"request_id\": \"SOME_UUID\",\n" +
-    "      \"permanent\": false,\n" +
-    "      \"server\": \"some.server.hostname\",\n" +
-    "      \"date\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\"\n" +
-    "      }\n" +
-    "    ]'\n" +
-    "                    </pre>\n" +
-    "                    </div>\n" +
+    "            <tr ng-repeat=\"user in displayedCollection\">\n" +
+    "                <td><img src=\"{{user.gravatar_url}}\" class=\"avatar\"> {{user.user_name}}</td>\n" +
+    "                <td>{{user.email}}</td>\n" +
+    "                <td class=\"text-center\"><span class=\"fa\" ng-class=\"{'fa-check-circle':user.status, 'fa-times':!user.status}\"></span></td>\n" +
+    "                <td>{{user.first_name}}</td>\n" +
+    "                <td>{{user.last_name}}</td>\n" +
+    "                <td><span data-uib-tooltip=\"{{user.last_login_date}}\">{{user.last_login_date | isoToRelativeTime}}</span></td>\n" +
+    "                <td>\n" +
+    "                    <a class=\"btn btn-default btn-sm\" data-ui-sref=\"admin.user.update({userId:user.id})\"><span class=\"fa fa-cog\"></span></a>\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-danger btn-sm\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeUser(user)\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
+    "            </tr>\n" +
+    "            <tfoot>\n" +
+    "            <tr>\n" +
+    "                <td colspan=\"7\" class=\"text-center\">\n" +
+    "                    <div st-pagination=\"\" st-items-by-page=\"50\" st-displayed-pages=\"7\"></div>\n" +
+    "                </td>\n" +
+    "            </tr>\n" +
+    "            </tfoot>\n" +
+    "            </tbody>\n" +
+    "        </table>\n" +
     "\n" +
-    "                </uib-tab>\n" +
+    "    </div>\n" +
     "\n" +
-    "                <uib-tab>\n" +
-    "                    <uib-tab-heading>\n" +
-    "                        Report API\n" +
-    "                    </uib-tab-heading>\n" +
     "\n" +
-    "                    <div class=\"codehilite\">\n" +
-    "                    <pre class=\"m-a-0\">\n" +
-    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/reports?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
-    "    [{\n" +
-    "    \"client\": \"your-client-name-python\",\n" +
-    "    \"language\": \"python\",\n" +
-    "    \"view_name\": \"views/foo:bar\",\n" +
-    "    \"server\": \"SERVERNAME/INSTANCENAME\",\n" +
-    "    \"priority\": 5,\n" +
-    "    \"error\": \"OMG ValueError happened\",\n" +
-    "    \"occurences\":1,\n" +
-    "    \"http_status\": 500,\n" +
-    "    \"tags\": [[\"tag1\",\"value\"], [\"tag2\", 5]],\n" +
-    "    \"username\": \"USER\",\n" +
-    "    \"url\": \"HTTP://SOMEURL\",\n" +
-    "    \"ip\": \"127.0.0.1\",\n" +
-    "    \"start_time\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
-    "    \"end_time\": \"{{$ctrl.momentJs.utc().milliseconds(0).add(2, 'seconds').toISOString()}}\",\n" +
-    "    \"user_agent\": \"BROWSER_AGENT\",\n" +
-    "    \"extra\": [[\"message\",\"CUSTOM MESSAGE\"], [\"custom_value\", \"some payload\"]],\n" +
-    "    \"request_id\": \"SOME_UUID\",\n" +
-    "    \"request\": {\"REQUEST_METHOD\": \"GET\",\n" +
-    "             \"PATH_INFO\": \"/FOO/BAR\",\n" +
-    "             \"POST\": {\"FOO\":\"BAZ\",\"XXX\":\"YYY\"}\n" +
-    "             },\n" +
-    "    \"slow_calls\":[{\n" +
-    "                   \"start\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
-    "                   \"end\": \"{{$ctrl.momentJs.utc().milliseconds(0).add(1, 'seconds').toISOString()}}\",\n" +
-    "                   \"type\": \"sql\",\n" +
-    "                   \"subtype\": \"postgresql\",\n" +
-    "                   \"parameters\": [\"QPARAM1\",\"QPARAM2\",\"QPARAMX\"],\n" +
-    "                   \"statement\": \"QUERY\"\n" +
-    "                   }],\n" +
-    "    \"request_stats\": {\n" +
-    "                    \"main\": 2.50779,\n" +
-    "                    \"nosql\": 0.01008,\n" +
-    "                    \"nosql_calls\": 17.0,\n" +
-    "                    \"remote\": 0.0,\n" +
-    "                    \"remote_calls\": 0.0,\n" +
-    "                    \"sql\": 1,\n" +
-    "                    \"sql_calls\": 1.0,\n" +
-    "                    \"tmpl\": 0.0,\n" +
-    "                    \"tmpl_calls\": 0.0,\n" +
-    "                    \"custom\": 0.0,\n" +
-    "                    \"custom_calls\": 0.0\n" +
-    "                },\n" +
-    "    \"traceback\": [\n" +
-    "                {\"cline\": \"return foo_bar_baz(1,2,3)\",\n" +
-    "                \"file\": \"somedir/somefile.py\",\n" +
-    "                \"fn\": \"somefunction\",\n" +
-    "                \"line\": 454,\n" +
-    "                \"vars\": [[\"a_list\",\n" +
-    "                         [\"1\",2,\"4\",\"5\",6]],\n" +
-    "                         [\"b\", {\"1\": \"2\", \"ccc\": \"ddd\", \"1\": \"a\"}],\n" +
-    "                         [\"obj\", \"object object at 0x7f0030853dc0\"]]\n" +
-    "                        },\n" +
-    "                        {\"cline\": \"OMG ValueError happened\",\n" +
-    "                        \"file\": \"\",\n" +
-    "                        \"fn\": \"\",\n" +
-    "                        \"line\": \"\",\n" +
-    "                        \"vars\": []}\n" +
-    "                        ]\n" +
-    "                        }]'\n" +
-    "                    </pre>\n" +
-    "                    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/admin-groups-list-view/admin-groups-list-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.groups\"></ng-include>\n" +
     "\n" +
-    "                </uib-tab>\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.groups\">\n" +
     "\n" +
-    "                <uib-tab>\n" +
+    "    <table st-table=\"displayedCollection\" st-safe-src=\"$ctrl.groups\" class=\"table table-striped\">\n" +
+    "        <thead>\n" +
+    "        <tr>\n" +
+    "            <th st-sort=\"group_name\"><a>Group name</a></th>\n" +
+    "            <th st-sort=\"description\"><a>Description</a></th>\n" +
+    "            <th st-sort=\"members\"><a>Member count</a></th>\n" +
+    "            <th class=\"options\"></th>\n" +
+    "        </tr>\n" +
+    "        <tr>\n" +
+    "            <th><input st-search=\"group_name\" placeholder=\"search for group name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "            <th><input st-search=\"description\" placeholder=\"search for description\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "            <th></th>\n" +
+    "            <th></th>\n" +
+    "        </tr>\n" +
+    "        </thead>\n" +
+    "        <tbody>\n" +
     "\n" +
-    "                <uib-tab-heading>\n" +
-    "                    Metrics API\n" +
-    "                </uib-tab-heading>\n" +
+    "        <tr ng-repeat=\"group in displayedCollection track by group.id\">\n" +
+    "            <td>{{group.group_name}}</td>\n" +
+    "            <td>{{group.description}}</td>\n" +
+    "            <td>{{group.member_count}}</td>\n" +
+    "            <td>\n" +
+    "                <a class=\"btn btn-default btn-sm\" data-ui-sref=\"admin.group.update({groupId:group.id})\"><span class=\"fa fa-cog\"></span></a>\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-danger btn-sm\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeGroup(group)\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
+    "        </tr>\n" +
+    "        <tfoot>\n" +
+    "        <tr>\n" +
+    "            <td colspan=\"4\" class=\"text-center\">\n" +
+    "                <div st-pagination=\"\" st-items-by-page=\"100\" st-displayed-pages=\"7\"></div>\n" +
+    "            </td>\n" +
+    "        </tr>\n" +
+    "        </tfoot>\n" +
+    "        </tbody>\n" +
+    "    </table>\n" +
     "\n" +
-    "                <div class=\"codehilite\">\n" +
-    "                    <pre class=\"m-a-0\">\n" +
-    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/general_metrics?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
-    "        [{\n" +
-    "        \"namespace\": \"some.monitor\",\n" +
-    "        \"timestamp\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
-    "        \"server_name\": \"server.name\",\n" +
-    "        \"tags\": [[\"value1\", 15.7], [\"value2\", 26]]}]'\n" +
-    "                    </pre>\n" +
-    "                </div>\n" +
+    "</div>\n" +
+    "\n"
+  );
+
+
+  $templateCache.put('components/views/admin-partitions-view/admin-partitions-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.partitions\"></ng-include>\n" +
     "\n" +
-    "                </uib-tab>\n" +
+    "<div ng-show=\"!$ctrl.loading.partitions\">\n" +
     "\n" +
-    "                <uib-tab>\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            DELETE Daily Partitions\n" +
+    "        </div>\n" +
     "\n" +
-    "                    <uib-tab-heading>\n" +
-    "                        Request Stats API\n" +
-    "                    </uib-tab-heading>\n" +
+    "        <form name=\"$ctrl.dailyPartitionsForm\"\n" +
+    "              novalidate ng-submit=\"$ctrl.partitionsDelete('dailyPartitions')\"\n" +
+    "              class=\"form-inline\"\n" +
+    "              ng-class=\"{'has-error':$ctrl.dailyPartitionsForm.$invalid}\">\n" +
     "\n" +
-    "                    <div class=\"codehilite\">\n" +
-    "                    <pre class=\"m-a-0\">\n" +
-    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/request_stats?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
-    "        [{\"server\": \"some.server.hostname\",\n" +
-    "          \"timestamp\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
-    "          \"metrics\": [[\"dir/module:func\",\n" +
-    "               {\"custom\": 0.0,\n" +
-    "                \"custom_calls\": 0,\n" +
-    "                \"main\": 0.01664,\n" +
-    "                \"nosql\": 0.00061,\n" +
-    "                \"nosql_calls\": 23,\n" +
-    "                \"remote\": 0.0,\n" +
-    "                \"remote_calls\": 0,\n" +
-    "                \"requests\": 1,\n" +
-    "                \"sql\": 0.00105,\n" +
-    "                \"sql_calls\": 2,\n" +
-    "                \"tmpl\": 0.0,\n" +
-    "                \"tmpl_calls\": 0}],\n" +
-    "              [\"SomeView.function\",\n" +
-    "               {\"custom\": 0.0,\n" +
-    "                \"custom_calls\": 0,\n" +
-    "                \"main\": 0.647261,\n" +
-    "                \"nosql\": 0.306554,\n" +
-    "                \"nosql_calls\": 140,\n" +
-    "                \"remote\": 0.0,\n" +
-    "                \"remote_calls\": 0,\n" +
-    "                \"requests\": 28,\n" +
-    "                \"sql\": 0.0,\n" +
-    "                \"sql_calls\": 0,\n" +
-    "                \"tmpl\": 0.0,\n" +
-    "                \"tmpl_calls\": 0}]]\n" +
-    "                }]'\n" +
-    "                    </pre>\n" +
-    "                    </div>\n" +
+    "            <div class=\"panel-body\">\n" +
     "\n" +
-    "                </uib-tab>\n" +
+    "                <input type=\"text\" name=\"confirm\"\n" +
+    "                       placeholder=\"Enter CONFIRM to proceed\" class=\"form-control input-autosize\" confirm-validate required ng-model=\"$ctrl.dailyConfirm\">\n" +
+    "                <input type=\"submit\" class=\"btn btn-danger\" ng-disabled=\"$ctrl.dailyPartitionsForm.$invalid\">\n" +
+    "                <input type=\"checkbox\" ng-model=\"$ctrl.dailyChecked\" ng-change=\"$ctrl.setCheckedList('dailyPartitions')\"> Check All\n" +
     "\n" +
-    "            </uib-tabset>\n" +
+    "            </div>\n" +
     "\n" +
-    "        </div>\n" +
-    "    </div>\n" +
+    "            <table class=\"table table-striped\">\n" +
+    "                <tr>\n" +
+    "                    <th class=\"c1 date\">Date</th>\n" +
+    "                    <th class=\"c2 indices\">Indices</th>\n" +
+    "                </tr>\n" +
+    "                <tr class=\"r{{$index}}\" ng-repeat=\"row in $ctrl.dailyPartitions\">\n" +
+    "                    <td class=\"c1\">{{row[0]}}</td>\n" +
+    "                    <td class=\"c2\">\n" +
+    "                        <ul class=\"list-group\">\n" +
+    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].elasticsearch\">\n" +
+    "                            <input name=\"es_index\" type=\"checkbox\" ng-model=\"partition.checked\"> ES: {{partition.name}}\n" +
+    "                        </li>\n" +
+    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].pg\">\n" +
+    "                            <input name=\"pg_index\" type=\"checkbox\" ng-model=\"partition.checked\"> PG: {{partition.name}}\n" +
+    "                        </li>\n" +
+    "                        </ul>\n" +
+    "                    </td>\n" +
+    "                </tr>\n" +
+    "            </table>\n" +
+    "        </form>\n" +
     "\n" +
-    "    <permissions-form resource=\"$ctrl.resource\" current-permissions=\"$ctrl.resource.current_permissions\"\n" +
-    "                      possible-permissions=\"$ctrl.resource.possible_permissions\" ng-if=\"$ctrl.resource.resource_id\"></permissions-form>\n" +
+    "    </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-info\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "    <div class=\"panel panel-default\">\n" +
     "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">Postprocessing</h3>\n" +
+    "            DELETE Permanent Partitions\n" +
     "        </div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <p>This section allows you influence the rating of report groups - if rule is matched once its not executed anymore</p>\n" +
-    "\n" +
-    "            <p>\n" +
-    "                <a class=\"btn btn-info\" ng-click=\"$ctrl.addRule()\"><span class=\"fa fa-plus-circle\"></span> Add rule</a>\n" +
-    "            </p>\n" +
     "\n" +
-    "            <post-process-action action=\"action\" resource=\"$ctrl.resource\" ng-repeat=\"action in $ctrl.resource.postprocessing_rules\"></post-process-action>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
+    "        <form name=\"$ctrl.permanentPartitionsForm\" novalidate\n" +
+    "              ng-submit=\"$ctrl.partitionsDelete('permanentPartitions')\"\n" +
+    "              class=\"form-inline\"\n" +
+    "              ng-class=\"{'has-error':$ctrl.permanentPartitionsForm.$invalid}\">\n" +
     "\n" +
-    "    <div class=\"panel panel-danger\" ng-show=\"$ctrl.resource.resource_id\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">Administration</h3>\n" +
-    "        </div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <h2>Transfer ownership</h2>\n" +
-    "            <p>Please note that by transfering ownership you WILL lose access to the application data and new owner needs to give you access permission</p>\n" +
-    "            <div class=\"confirmation_form\" ng-submit=\"$ctrl.transferApplication()\">\n" +
-    "                <form class=\"form-horizontal\" name=\"$ctrl.formTransfer\">\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.formTransfer.ae_validation.password\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Password\n" +
-    "                        </label>\n" +
-    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                            <input class=\"form-control\"  name=\"password\" type=\"password\" ng-model=\"$ctrl.formTransferModel.password\">\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.formTransfer.ae_validation.user_name\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            New owners username\n" +
-    "                        </label>\n" +
-    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                            <input class=\"form-control\"  name=\"user_name\" type=\"text\" ng-model=\"$ctrl.formTransferModel.user_name\">\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        </label>\n" +
-    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                            <button class=\"btn btn-danger\">\n" +
-    "                                <span class=\"fa fa-user-plus\"></span>\n" +
-    "                                Transfer ownership of application\n" +
-    "                            </button>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                </form>\n" +
-    "            </div>\n" +
     "\n" +
-    "            <hr/>\n" +
+    "            <div class=\"panel-body\">\n" +
     "\n" +
-    "            <h2>Remove application</h2>\n" +
-    "            <p><strong>This operation will wipe out all data from database - there is no undo.</strong></p>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <input type=\"text\" name=\"confirm\"\n" +
+    "                           placeholder=\"Enter CONFIRM to proceed\" class=\"form-control\" confirm-validate required ng-model=\"$ctrl.permConfirm\">\n" +
+    "                    <input type=\"submit\" class=\"btn btn-danger\" ng-disabled=\"$ctrl.permanentPartitionsForm.$invalid\">\n" +
+    "                    <input type=\"checkbox\" ng-model=\"$ctrl.permChecked\" ng-change=\"$ctrl.setCheckedList('permanentPartitions')\"> Check All\n" +
+    "                </div>\n" +
     "\n" +
-    "            <div class=\"confirmation_form\">\n" +
-    "                <form class=\"form-horizontal\" name=\"$ctrl.formDelete\" ng-submit=\"$ctrl.deleteApplication()\">\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <data-form-errors errors=\"$ctrl.formDelete.ae_validation.password\"></data-form-errors>\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                            Password\n" +
-    "                        </label>\n" +
-    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                            <input class=\"form-control\" name=\"password\" type=\"password\" ng-model=\"$ctrl.formDeleteModel.password\">\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                    <div class=\"form-group\">\n" +
-    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "            </div>\n" +
+    "\n" +
+    "            <table class=\"table table-striped\">\n" +
+    "                <tr>\n" +
+    "                    <th class=\"c1 date\">Date</th>\n" +
+    "                    <th class=\"c2 indices\">Indices</th>\n" +
+    "                </tr>\n" +
+    "                <tr class=\"r{{$index}}\" ng-repeat=\"row in $ctrl.permanentPartitions\">\n" +
+    "                    <td class=\"c1\">{{row[0]}}</td>\n" +
+    "                    <td class=\"c2\">\n" +
+    "                        <ul class=\"list-group\">\n" +
+    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].elasticsearch\">\n" +
+    "                            <input name=\"es_index\" type=\"checkbox\" ng-model=\"partition.checked\"> ES: {{partition.name}}\n" +
+    "                        </li>\n" +
+    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].pg\">\n" +
+    "                            <input name=\"pg_index\" type=\"checkbox\" ng-model=\"partition.checked\"> PG: {{partition.name}}\n" +
+    "                        </li>\n" +
+    "                        </ul>\n" +
+    "                    </td>\n" +
+    "                </tr>\n" +
+    "            </table>\n" +
+    "        </form>\n" +
     "\n" +
-    "                        </label>\n" +
-    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                            <button class=\"btn btn-danger\">\n" +
-    "                                <span class=\"fa fa-trash-o\"></span>\n" +
-    "                                Delete my application\n" +
-    "                            </button>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                </form>\n" +
-    "            </div>\n" +
-    "        </div>\n" +
     "    </div>\n" +
+    "\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/event-browser/event-browser.html',
-    "<div class=\"panel panel-default\">\n" +
-    "    <div class=\"panel-body\">\n" +
+  $templateCache.put('components/views/admin-system-view/admin-system-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.system\"></ng-include>\n" +
     "\n" +
-    "        <h1>Event history</h1>\n" +
+    "<div ng-if=\"$ctrl.loading.system == false\">\n" +
+    "    <div class=\"row\">\n" +
+    "        <div class=\"col-sm-12\">\n" +
+    "            <div class=\"panel panel-default\">\n" +
+    "                <div class=\"panel-heading\">\n" +
+    "                    <h3 class=\"panel-title\">\n" +
+    "                        System Info\n" +
+    "                    </h3>\n" +
+    "                </div>\n" +
+    "                <div class=\"panel-body\">\n" +
     "\n" +
-    "        <table class=\"table table-striped event-table\">\n" +
-    "            <tr ng-repeat=\"event in $ctrl.events track by event.id\">\n" +
-    "                <td class=\"text-center icons\">\n" +
-    "                    <span ng-if=\"event.event_type === 1\" class=\"fa fa-exclamation-triangle fa-2x\" style=\"color:orangered\"></span>\n" +
-    "                    <span ng-if=\"event.event_type === 3\" class=\"fa fa-clock-o fa-2x\" style=\"color:darkorange\"></span>\n" +
-    "                    <span ng-if=\"event.event_type === 7\" class=\"fa fa-question-circle fa-2x\" style=\"color:dimgrey\"></span>\n" +
-    "                    <span ng-if=\"event.event_type === 9\" class=\"fa fa-line-chart fa-2x\" style=\"color:green\"></span>\n" +
-    "                </td>\n" +
-    "                <td>\n" +
-    "                    <p>For <strong>{{ event.resource_name }}</strong></p>\n" +
+    "                    <p><strong>System Load:</strong>\n" +
+    "                        1min: {{$ctrl.systemLoad[0]}}, 5min: {{$ctrl.systemLoad[1]}}, 15min: {{$ctrl.systemLoad[2]}}\n" +
+    "                    </p>\n" +
+    "                    <p><strong>Awaiting tasks:</strong>\n" +
+    "                    <ul>\n" +
+    "                        <li>reports: {{$ctrl.queueStats.waiting_reports}}</li>\n" +
+    "                        <li>logs: {{$ctrl.queueStats.waiting_logs}}</li>\n" +
+    "                        <li>metrics: {{$ctrl.queueStats.waiting_metrics}}</li>\n" +
+    "                        <li>other: {{$ctrl.queueStats.waiting_other}}</li>\n" +
+    "                    </ul>\n" +
+    "                    </p>\n" +
+    "                    <p><strong>Queue stats from last minute:</strong>\n" +
+    "                    <ul>\n" +
+    "                        <li>Processed reports: {{$ctrl.queueStats.processed_reports}}</li>\n" +
+    "                        <li>Processed logs: {{$ctrl.queueStats.processed_logs}}</li>\n" +
+    "                        <li>Processed metrics: {{$ctrl.queueStats.processed_metrics}}</li>\n" +
+    "                    </ul>\n" +
+    "                    </p>\n" +
     "\n" +
-    "                    <p>{{ event.text }}</p>\n" +
-    "                    <small class=\"date\" data-uib-tooltip=\"{{event.start_date}}\"> created:\n" +
-    "                        <iso-to-relative-time time=\"{{event.start_date}}\"/>\n" +
-    "                    </small>\n" +
-    "                    <small class=\"date\" ng-show=\"event.end_date\" data-uib-tooltip=\"{{event.end_date}}\"> | closed:\n" +
-    "                        <iso-to-relative-time time=\"{{event.end_date}}\"/>\n" +
-    "                    </small>\n" +
-    "                </td>\n" +
-    "                <td class=\"options\">\n" +
+    "                    <p><strong>Disks:</strong>\n" +
+    "                    <ul>\n" +
+    "                        <li ng-repeat=\"disk in $ctrl.disks\">\n" +
+    "                            <strong>{{disk.device}}</strong> {{disk.free}}/{{disk.total}}, {{disk.percentage}}% used\n" +
+    "                        </li>\n" +
+    "                    </ul>\n" +
+    "                    </p>\n" +
     "\n" +
-    "                    <span class=\"dropdown pull-right\" ng-if=\"event.status === 1\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                      <a class=\"dropdown-toggle btn btn-danger\" data-uib-dropdown-toggle>\n" +
-    "                          <span class=\"fa fa-exclamation-circle\"></span>\n" +
-    "                      </a>\n" +
-    "                      <ul class=\"dropdown-menu\">\n" +
-    "                          <li>\n" +
-    "                              <a ng-click=\"$ctrl.closeEvent(event)\">Close event</a>\n" +
-    "                              <a>Do nothing</a>\n" +
-    "                          </li>\n" +
-    "                      </ul>\n" +
-    "                    </span>\n" +
+    "                    <p><strong>Process stats:</strong>\n" +
+    "                    <ul>\n" +
+    "                        <li>FD soft limits: {{$ctrl.selfInfo.fds.soft}}</li>\n" +
+    "                        <li>FD hard limits: {{$ctrl.selfInfo.fds.hard}}</li>\n" +
+    "                        <li>Memlock soft limits: {{$ctrl.selfInfo.memlock.soft}}</li>\n" +
+    "                        <li>Memlock hard limits: {{$ctrl.selfInfo.memlock.hard}}</li>\n" +
+    "                    </ul>\n" +
+    "                    </p>\n" +
     "\n" +
-    "                </td>\n" +
-    "            </tr>\n" +
-    "        </table>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </div>\n" +
     "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/index-dashboard/index-dashboard.html',
-    "<style type=\"text/css\">\n" +
-    "    #metrics_chart .c3-line {\n" +
-    "        stroke-width: 0px;\n" +
-    "    }\n" +
+    "    <div class=\"row\">\n" +
+    "        <div class=\"col-sm-12\">\n" +
     "\n" +
-    "    #metrics_chart .c3-area {\n" +
-    "        stroke-width: 0;\n" +
-    "        opacity: 0.75;\n" +
-    "    }\n" +
-    "</style>\n" +
+    "            <div class=\"panel panel-default\">\n" +
+    "                <div class=\"panel-body\">\n" +
     "\n" +
-    "<div class=\"row\">\n" +
-    "    <div class=\"col-sm-12 dashboard\" id=\"content\">\n" +
-    "        <div ng-if=\"!$ctrl.stateHolder.AeUser.applications.length\">\n" +
+    "                    <uib-tabset>\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Postgresql Tables\n" +
+    "                            </uib-tab-heading>\n" +
     "\n" +
-    "            <div ng-include=\"'templates/quickstart.html'\"></div>\n" +
+    "                            <table class=\"table table-striped\">\n" +
+    "                                <thead>\n" +
+    "                                <tr>\n" +
+    "                                    <th class=\"c1 tablename\">Table name</th>\n" +
+    "                                    <th class=\"c2 size_human\">Size</th>\n" +
+    "                                </tr>\n" +
+    "                                </thead>\n" +
+    "                                <tbody>\n" +
+    "                                <tr class=\"r{{$index}}\" ng-repeat=\"row in $ctrl.DBtables\">\n" +
+    "                                    <td class=\"c1\">{{row.table_name}}</td>\n" +
+    "                                    <td class=\"c2\">{{row.size_human}}</td>\n" +
+    "                                </tr>\n" +
+    "                                </tbody>\n" +
+    "                            </table>\n" +
     "\n" +
-    "        </div>\n" +
+    "                        </uib-tab>\n" +
     "\n" +
-    "        <div ng-if=\"$ctrl.stateHolder.AeUser.applications.length\">\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Elasticsearch Indices\n" +
+    "                            </uib-tab-heading>\n" +
     "\n" +
-    "            <div class=\"row\">\n" +
-    "                <div class=\"col-sm-6\">\n" +
-    "                    <div class=\"panel panel-default\">\n" +
-    "                        <div class=\"panel-body\">\n" +
-    "                            <form class=\"graph-type form-inline\">\n" +
-    "                                <select ng-model=\"$ctrl.resource\" ng-options=\"r.resource_id as r.resource_name for r in $ctrl.stateHolder.AeUser.applications\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
-    "                                        class=\"SelectField form-control input-sm slim-input\"></select>\n" +
+    "                            <table class=\"table table-striped\">\n" +
+    "                                <thead>\n" +
+    "                                <tr>\n" +
+    "                                    <th class=\"c1 tablename\">Index name</th>\n" +
+    "                                    <th class=\"c2 size_human\">Size</th>\n" +
+    "                                </tr>\n" +
+    "                                </thead>\n" +
+    "                                <tbody>\n" +
+    "                                <tr class=\"r{{$index}}\" ng-repeat=\"row in $ctrl.ESIndices\">\n" +
+    "                                    <td class=\"c1\">{{row.name}}</td>\n" +
+    "                                    <td class=\"c2\">{{row.size_human}}</td>\n" +
+    "                                </tr>\n" +
+    "                                </tbody>\n" +
+    "                            </table>\n" +
     "\n" +
-    "                                <select class=\"SelectField form-control input-sm slim-input\" ng-model=\"$ctrl.timeSpan\"\n" +
-    "                                        ng-options=\"i as i.label for i in $ctrl.timeOptions | objectToOrderedArray:'minutes'\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
-    "                                        class=\"SelectField\"></select>\n" +
+    "                        </uib-tab>\n" +
     "\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Processes\n" +
+    "                            </uib-tab-heading>\n" +
     "\n" +
-    "                                <div class=\"btn-group\">\n" +
-    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
-    "                                            uib-btn-radio=\"'requests_graphs'\" data-uib-tooltip=\"Requests per second\">\n" +
-    "                                        <span class=\"fa fa-line-chart\"></span>\n" +
-    "                                    </button>\n" +
-    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
-    "                                            uib-btn-radio=\"'response_graphs'\" data-uib-tooltip=\"Average response time\">\n" +
-    "                                        <span class=\"fa fa-random\"></span>\n" +
-    "                                    </button>\n" +
-    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
-    "                                            uib-btn-radio=\"'metrics_graphs'\" data-uib-tooltip=\"Time spent per request\">\n" +
-    "                                        <span class=\"fa fa-bar-chart-o\"></span>\n" +
-    "                                    </button>\n" +
-    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
-    "                                            uib-btn-radio=\"'report_graphs'\" data-uib-tooltip=\"Errors\">\n" +
-    "                                        <span class=\"fa fa-exclamation-triangle\"></span>\n" +
-    "                                    </button>\n" +
-    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
-    "                                            uib-btn-radio=\"'slow_report_graphs'\" data-uib-tooltip=\"Slow reports\">\n" +
-    "                                        <span class=\"fa fa-clock-o\"></span>\n" +
-    "                                    </button>\n" +
-    "                                </div>\n" +
-    "                            </form>\n" +
-    "                            <div class=\"clearfix\"></div>\n" +
+    "                            <table class=\"table table-striped\">\n" +
+    "                                <thead>\n" +
+    "                                <tr>\n" +
+    "                                    <th class=\"c1 tablename\">Owner</th>\n" +
+    "                                    <th class=\"c2 tablename\">PID</th>\n" +
+    "                                    <th class=\"c3 tablename\">CPU</th>\n" +
+    "                                    <th class=\"c4 tablename\">MEM</th>\n" +
+    "                                    <th class=\"c4 tablename\">Name</th>\n" +
+    "                                </tr>\n" +
+    "                                </thead>\n" +
+    "                                <tbody>\n" +
+    "                                <tr class=\"r{{$index}}\" ng-repeat-start=\"row in $ctrl.processInfo\">\n" +
+    "                                    <td class=\"c1\">{{row.owner}}</td>\n" +
+    "                                    <td class=\"c2\">{{row.pid}}</td>\n" +
+    "                                    <td class=\"c3\">{{row.cpu}}</td>\n" +
+    "                                    <td class=\"c4\">{{row.mem_usage}} ({{row.mem_percentage}}%)</td>\n" +
+    "                                    <td class=\"c5\"><strong>{{row.name}}</strong></td>\n" +
+    "                                </tr>\n" +
+    "                                <tr ng-repeat-end>\n" +
+    "                                    <td colspan=\"5\" class=\"word-wrap\">{{row.command}}</td>\n" +
+    "                                </tr>\n" +
+    "                                </tbody>\n" +
+    "                            </table>\n" +
     "\n" +
-    "                            <p ng-if=\"$ctrl.loading.series != false\" class=\"text-center\">\n" +
-    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
-    "                            </p>\n" +
+    "                        </uib-tab>\n" +
     "\n" +
-    "                            <div ng-if=\"$ctrl.loading.series == false\">\n" +
-    "                            <div ng-if=\"$ctrl.graphType.selected == 'requests_graphs'\">\n" +
-    "                                <c3chart data-domid=\"reponse_chart\" data-data=\"$ctrl.requestsChartData\" data-config=\"$ctrl.requestsChartConfig\" update=\"true\">\n" +
-    "                                </c3chart>\n" +
-    "                            </div>\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Python packages\n" +
+    "                            </uib-tab-heading>\n" +
     "\n" +
-    "                            <div ng-if=\"$ctrl.graphType.selected == 'response_graphs'\">\n" +
-    "                                <c3chart data-domid=\"reponse_chart\" data-data=\"$ctrl.responseChartData\" data-config=\"$ctrl.responseChartConfig\" update=\"true\">\n" +
-    "                                </c3chart>\n" +
-    "                            </div>\n" +
+    "                            <table class=\"table\">\n" +
+    "                                <tr ng-repeat=\"package in $ctrl.packages\">\n" +
+    "                                    <td>{{package.name}}</td>\n" +
+    "                                    <td>{{package.version}}</td>\n" +
+    "                                </tr>\n" +
+    "                            </table>\n" +
+    "                            </p>\n" +
     "\n" +
-    "                            <div ng-if=\"$ctrl.graphType.selected == 'metrics_graphs'\">\n" +
-    "                                <c3chart data-domid=\"metrics_chart\" data-data=\"$ctrl.metricsChartData\" data-config=\"$ctrl.metricsChartConfig\" update=\"true\">\n" +
-    "                                </c3chart>\n" +
-    "                            </div>\n" +
-    "                            <div ng-if=\"$ctrl.graphType.selected == 'report_graphs'\">\n" +
-    "                                <c3chart data-domid=\"reports_chart\" data-data=\"$ctrl.reportChartData\" data-config=\"$ctrl.reportChartConfig\" update=\"true\">\n" +
-    "                                </c3chart>\n" +
-    "                            </div>\n" +
+    "                        </uib-tab>\n" +
     "\n" +
-    "                            <div ng-if=\"$ctrl.graphType.selected == 'slow_report_graphs'\">\n" +
-    "                                <c3chart data-domid=\"slow_reports_chart\" data-data=\"$ctrl.reportSlowChartData\" data-config=\"$ctrl.reportSlowChartConfig\" update=\"true\">\n" +
-    "                                </c3chart>\n" +
-    "                            </div>\n" +
-    "\n" +
-    "                            <p ng-if=\"$ctrl.graphType.selected == 'requests_graphs'\" class=\"text-center\">\n" +
-    "                                <small>Average requests per second from all servers</small>\n" +
-    "                            </p>\n" +
+    "                    </uib-tabset>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/admin-users-create-view/admin-users-create-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.user\"></ng-include>\n" +
     "\n" +
-    "                            <p ng-if=\"$ctrl.graphType.selected == 'response_graphs'\" class=\"text-center\">\n" +
-    "                                <small>Average response time from all servers</small>\n" +
-    "                            </p>\n" +
+    "<div ng-show=\"!$ctrl.loading.user\">\n" +
     "\n" +
-    "                            <p ng-if=\"$ctrl.graphType.selected == 'metrics_graphs'\" class=\"text-center\">\n" +
-    "                                <small>Aggregated average time spent per request - broken to layers</small>\n" +
-    "                            </p>\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
-    "                            <p ng-if=\"$ctrl.graphType.selected == 'report_graphs'\" class=\"text-center\">\n" +
-    "                                <small>Aggregated reports sent by your application</small>\n" +
-    "                            </p>\n" +
+    "                <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\" ng-if=\"$ctrl.user.id\">\n" +
+    "                    <a class=\"btn btn-default\" data-uib-dropdown-toggle><span class=\"fa fa-user-secret\"></span> Re-login to user</a>\n" +
+    "                  <ul class=\"dropdown-menu\">\n" +
+    "                      <li><a>No</a></li>\n" +
+    "                      <li><a ng-click=\"$ctrl.reloginUser(user)\">Yes</a></li>\n" +
+    "                  </ul>\n" +
+    "                </span>\n" +
     "\n" +
-    "                            <p ng-if=\"$ctrl.graphType.selected == 'slow_report_graphs'\" class=\"text-center\">\n" +
-    "                                <small>Aggregated slow reports sent by your application</small>\n" +
-    "                            </p>\n" +
-    "                            </div>\n" +
-    "                        </div>\n" +
+    "            <form name=\"$ctrl.profileForm\" class=\"form-horizontal\" ng-submit=\"$ctrl.createUser()\">\n" +
+    "                <div class=\"form-group\" id=\"row-user_name\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.user_name\"></data-form-errors>\n" +
+    "                    <label for=\"user_name\" id=\"label-user_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        User name\n" +
+    "                        <span class=\"required\">*</span>\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"user_name\" name=\"user_name\" type=\"text\" ng-model=\"$ctrl.user.user_name\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "\n" +
+    "                <div class=\"form-group\" id=\"row-user_password\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.user_password\"></data-form-errors>\n" +
+    "                    <label for=\"user_password\" id=\"label-user_password\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Password\n" +
+    "                        <span class=\"required\">*</span>\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"user_password\" name=\"user_password\" type=\"password\" ng-model=\"$ctrl.user.user_password\">\n" +
     "\n" +
-    "                <div class=\"col-sm-6\">\n" +
-    "\n" +
-    "                    <div id=\"server-container\">\n" +
-    "\n" +
-    "                        <div ng-if=\"$ctrl.loading.apdex==false\" class=\"text-center m-b-1\">\n" +
-    "\n" +
-    "                            <a data-ui-sref=\"report.list({resource:$ctrl.resource, start_date:$ctrl.startDateFilter})\" class=\"combined-stat text-center\" id=\"error-rate\">\n" +
-    "                                <small>Exceptions</small>\n" +
-    "                                <br/>\n" +
-    "                                <strong>{{ $ctrl.exceptions|numberToThousands}}</strong>\n" +
-    "                                <span class=\"fa fa-chevron-right\"></span>\n" +
-    "                            </a><!--\n" +
-    "\n" +
-    "                    --><a data-ui-sref=\"report.list_slow({resource:$ctrl.resource, min_duration:4, start_date:$ctrl.startDateFilter})\" class=\"combined-stat text-center\" id=\"frustrating-requests\" data-uib-tooltip=\"Requests over 4s\">\n" +
-    "                            <small>Frustrating req.</small>\n" +
-    "                            <br/>\n" +
-    "                            <strong>{{$ctrl.frustratingRequests|numberToThousands}}</strong>\n" +
-    "                            <span class=\"fa fa-chevron-right\"></span>\n" +
-    "                        </a><!--\n" +
+    "                        <p class=\"m-t-1\"><a class=\"btn btn-info btn-sm\" ng-click=\"$ctrl.generatePassword()\"><span class=\"fa fa-lock\"></span> Generate password</a>\n" +
+    "                            <span ng-show=\"$ctrl.gen_pass.length > 0\">(generated password: {{$ctrl.gen_pass}})</span>\n" +
+    "                        </p>\n" +
     "\n" +
-    "                     --><a data-ui-sref=\"report.list_slow({resource:$ctrl.resource, min_duration:1, max_duration:4, start_date:$ctrl.startDateFilter})\" class=\"combined-stat text-center\" id=\"tolerated-requests\"\n" +
-    "                           data-uib-tooltip=\"Requests under 4s\">\n" +
-    "                            <small>Tolerated req.</small>\n" +
-    "                            <br/>\n" +
-    "                            <strong>{{$ctrl.toleratedRequests|numberToThousands}}</strong>\n" +
-    "                            <span class=\"fa fa-chevron-right\"></span>\n" +
-    "                        </a><!--\n" +
-    "                        \n" +
-    "                        --><a class=\"combined-stat text-center\" id=\"satisfying-requests\" data-uib-tooltip=\"Requests under 1s\">\n" +
-    "                            <small>Satisfying req.</small>\n" +
-    "                            <br/>\n" +
-    "                            <strong>{{$ctrl.satisfyingRequests|numberToThousands}}</strong>\n" +
-    "                        </a><!--\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "                    --><a data-ui-sref=\"uptime({resource:$ctrl.resource})\" class=\"combined-stat text-center\" id=\"uptime-stats\" data-uib-tooltip=\"Uptime\">\n" +
-    "                            <small>Uptime</small>\n" +
-    "                            <br/>\n" +
-    "                            <strong>{{$ctrl.uptimeStats}}%</strong>\n" +
-    "                            <span class=\"fa fa-chevron-right\"></span>\n" +
-    "                        </a>\n" +
     "\n" +
-    "                            <div class=\"clearfix\"></div>\n" +
-    "                        </div>\n" +
+    "                <div class=\"form-group\" id=\"row-email\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.email\"></data-form-errors>\n" +
+    "                    <label for=\"email\" id=\"label-email\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Email Address\n" +
+    "                        <span class=\"required\">*</span>\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"email\" name=\"email\" type=\"text\" ng-model=\"$ctrl.user.email\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "                        <div id=\"apdex-rate\" class=\"m-b-1 panel panel-default\">\n" +
-    "                            <table class=\"servers table table-striped\">\n" +
-    "                                <thead>\n" +
-    "                                <tr>\n" +
-    "                                    <th></th>\n" +
-    "                                    <th>Server</th>\n" +
-    "                                    <th>Apdex\n" +
-    "                                <span class=\"fa fa-question-circle\"\n" +
-    "                                      data-uib-tooltip=\"Application Performance Index - measures viewer satisfaction based on response times and error rates\"></span>\n" +
-    "                                    </th>\n" +
-    "                                    <th>rpm</th>\n" +
-    "                                    <th>avg. response</th>\n" +
-    "                                </tr>\n" +
-    "                                </thead>\n" +
-    "                                <tbody>\n" +
-    "                                <tr ng-if=\"$ctrl.loading.apdex!=false\" class=\"text-center\">\n" +
-    "                                    <td colspan=\"5\"><span class=\"fa fa-cog fa-spin fa-5x loader\"></span></td>\n" +
-    "                                </tr>\n" +
-    "                                <tr ng-repeat=\"server in $ctrl.apdexStats\" class=\"{{ server | apdexValue }}\"\n" +
-    "                                    ng-if=\"$ctrl.loading.apdex==false\">\n" +
-    "                                    <td><span class=\"fa fa-hdd-o\"></span></td>\n" +
-    "                                    <td>\n" +
-    "                                        <small><strong>{{ server.name }}</strong></small>\n" +
-    "                                    </td>\n" +
-    "                                    <td class=\"apdex\">\n" +
-    "                                        <small><strong>{{ server.apdex }} %</strong></small>\n" +
-    "                                    </td>\n" +
-    "                                    <td>\n" +
-    "                                        <small><strong>{{ server.rpm }}rpm</strong></small>\n" +
-    "                                    </td>\n" +
-    "                                    <td>\n" +
-    "                                        <small><strong>{{ server.avg_response_time }}s</strong></small>\n" +
-    "                                    </td>\n" +
-    "                                </tr>\n" +
-    "                                </tbody>\n" +
-    "                            </table>\n" +
+    "                <div class=\"form-group\" id=\"row-first_name\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.first_name\"></data-form-errors>\n" +
+    "                    <label for=\"first_name\" id=\"label-first_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        First Name\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"first_name\" name=\"first_name\" type=\"text\" ng-model=\"$ctrl.user.first_name\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\" id=\"row-last_name\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.last_name\"></data-form-errors>\n" +
+    "                    <label for=\"last_name\" id=\"label-last_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Last Name\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"last_name\" name=\"last_name\" type=\"text\" ng-model=\"$ctrl.user.last_name\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "                        </div>\n" +
+    "                <div class=\"form-group\" id=\"row-status\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.status\"></data-form-errors>\n" +
+    "                    <label for=\"status\" id=\"label-status\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Active\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input checked class=\"form-control\" id=\"status\" name=\"status\" type=\"checkbox\" ng-model=\"$ctrl.user.status\">\n" +
     "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
+    "                <div class=\"form-group\" id=\"row-submit\">\n" +
+    "                    <label for=\"submit\" id=\"label-submit\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"{{$ctrl.$state.params.userId ? 'Update' : 'Add'}} User\">\n" +
+    "                    </div>\n" +
     "                </div>\n" +
+    "            </form>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
     "\n" +
     "\n" +
-    "            </div>\n" +
+    "    <div class=\"panel panel-default\" ng-if=\"$ctrl.user.id\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            <h3 class=\"panel-title\">Permission Summary</h3>\n" +
+    "        </div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <h3>Direct application permissions</h3>\n" +
     "\n" +
-    "            <div class=\"row\">\n" +
-    "                <div class=\"col-sm-6\">\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li ng-repeat=\"perm in $ctrl.resourcePermissions.user.application\" class=\"animate-repeat list-group-item\">\n" +
+    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
+    "                    <div class=\"pull-right\">\n" +
     "\n" +
-    "                    <div class=\"panel panel-default\">\n" +
-    "                        <div class=\"panel-heading position-relative\">\n" +
-    "                            <h3 class=\"panel-title\"><span class=\"fa fa-exclamation-triangle\"></span> Newest errors (real-time)\n" +
-    "                            </h3>\n" +
-    "                            <a tooltip-append-to-body=\"true\" data-uib-tooltip=\"Play/Pause stream\" class=\"btn btn-primary btn-sm pause_stream\" ng-model=\"$ctrl.stream.paused\" uib-btn-checkbox>\n" +
-    "                                <span class=\"fa {{stream.paused ? 'fa-play' : 'fa-pause'}}\"></span>\n" +
-    "                            </a>\n" +
-    "                            <a tooltip-append-to-body=\"true\" data-uib-tooltip=\"Limit reports to current application\" class=\"btn btn-primary btn-sm limit_stream\" ng-model=\"$ctrl.stream.filtered\" uib-btn-checkbox>\n" +
-    "                                <span class=\"fa fa-lock\"></span>\n" +
-    "                            </a>\n" +
+    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
     "\n" +
+    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Application\" data-ui-sref=\"applications.update({resourceId:perm.self.resource_id})\">\n" +
+    "                            <span class=\"fa fa-cog\"></span>\n" +
+    "                        </a>\n" +
+    "                    </div>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
     "\n" +
-    "                        </div>\n" +
-    "                        <div class=\"panel-body\">\n" +
+    "            <h3>Direct dashboard permissions</h3>\n" +
     "\n" +
-    "                            <p ng-if=\"$ctrl.stream.reports.length === 0\">No new reports</p>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li ng-repeat=\"perm in $ctrl.resourcePermissions.user.dashboard\" class=\"animate-repeat list-group-item\">\n" +
+    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
+    "                    <div class=\"pull-right\">\n" +
     "\n" +
-    "                            <div small-report-list reports=\"$ctrl.stream.reports\" applications=\"$ctrl.applications\"></div>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
+    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
     "\n" +
-    "                <div class=\"col-sm-6\">\n" +
+    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Dashboard\" data-ui-sref=\"dashboard.update({resourceId:perm.self.resource_id})\">\n" +
+    "                            <span class=\"fa fa-cog\"></span>\n" +
+    "                        </a>\n" +
+    "                    </div>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
     "\n" +
-    "                    <div class=\"panel panel-default\">\n" +
-    "                        <div class=\"panel-heading\">\n" +
-    "                            <h3 class=\"panel-title\"><span class=\"fa fa-sort-amount-desc\"></span> Request breakdown over {{ $ctrl.timeSpan.label }}</h3>\n" +
-    "                        </div>\n" +
-    "                        <div class=\"panel-body\" id=\"view-breakdown-container\">\n" +
-    "                            <p ng-if=\"$ctrl.loading.requestsBreakdown!=false\" class=\"text-center\">\n" +
-    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
-    "                            </p>\n" +
+    "        </div>\n" +
     "\n" +
-    "                            <div class=\"report-list\">\n" +
-    "                                <div ng-if=\"$ctrl.loading.requestsBreakdown==false\" ng-repeat=\"view in $ctrl.requestsBreakdown\">\n" +
-    "                                    <div class=\"view-info\">\n" +
-    "                                        <div class=\"view-name\">\n" +
-    "                                            <div class=\"bar\" style=\"width: {{view.percentage}}%\">\n" +
-    "                                            </div>\n" +
-    "                                        </div>\n" +
-    "                                        <strong ng-if=\"view.latest_details.length\">\n" +
-    "                                            <a data-ui-sref=\"report.list_slow({view_name:view.view_name})\">{{view.view_name}}</a></strong>\n" +
-    "                                        <strong ng-if=\"!view.latest_details.length\">{{view.view_name}}</strong>\n" +
+    "    </div>\n" +
     "\n" +
-    "                                        <div class=\"stats\">\n" +
-    "                                            <small>\n" +
-    "                                                avg. response <strong>{{view.avg_response}}s</strong> in\n" +
-    "                            <span class=\"requests\"\n" +
-    "                                  data-uib-tooltip=\"Requests\"><strong>{{view.requests|numberToThousands}}</strong> requests</span>\n" +
     "\n" +
-    "                        <span ng-if=\"view.latest_details\">\n" +
-    "                        &nbsp;&nbsp; Latest reports:\n" +
-    "                            <a ng-repeat=\"d in view.latest_details\" target=\"_blank\" ui-sref=\"report.view_detail({groupId:d.group_id, reportId:d.report_id})\"> <strong>{{$index+1}}</strong></a>\n" +
-    "                        </span>\n" +
-    "                                            </small>\n" +
-    "                                        </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/admin-users-list-view/admin-users-list-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.users\"></ng-include>\n" +
     "\n" +
-    "                                    </div>\n" +
+    "<div ng-show=\"!$ctrl.loading.users\">\n" +
     "\n" +
-    "                                </div>\n" +
-    "                            </div>\n" +
+    "    <div class=\"panel panel-default\">\n" +
     "\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            {{$ctrl.activeUsers}} active out of {{$ctrl.users.length}} users\n" +
+    "        </div>\n" +
     "\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "\n" +
-    "                </div>\n" +
-    "\n" +
-    "            </div>\n" +
-    "\n" +
-    "            <div class=\"row\">\n" +
-    "                <div class=\"col-sm-6\">\n" +
-    "\n" +
-    "                    <div class=\"panel panel-default\">\n" +
-    "                        <div class=\"panel-heading\">\n" +
-    "                            <h3 class=\"panel-title\">\n" +
-    "                                <span class=\"fa fa-exclamation-triangle\"></span> Report groups trending over {{ $ctrl.timeSpan.label }}\n" +
-    "                            </h3>\n" +
-    "                        </div>\n" +
-    "                        <div class=\"panel-body\">\n" +
-    "                            <p ng-if=\"$ctrl.loading.reports != false\" class=\"text-center\">\n" +
-    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
-    "                            </p>\n" +
-    "\n" +
-    "                            <p ng-if=\"$ctrl.trendingReports.length == 0 && $ctrl.loading.reports == false\">\n" +
-    "                                No reports found\n" +
-    "                            </p>\n" +
-    "\n" +
-    "                            <div small-report-group-list groups=\"$ctrl.trendingReports\" applications=\"$ctrl.applications\" ng-if=\"$ctrl.loading.reports==false\"></div>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "\n" +
-    "                </div>\n" +
-    "\n" +
-    "                <div class=\"col-sm-6\">\n" +
-    "\n" +
-    "\n" +
-    "                    <div class=\"panel panel-default\">\n" +
-    "                        <div class=\"panel-heading\">\n" +
-    "                            <h3 class=\"panel-title\">\n" +
-    "                                Most common slow calls over {{ $ctrl.timeSpan.label }}\n" +
-    "                            </h3>\n" +
-    "                        </div>\n" +
-    "                        <div class=\"panel-body\">\n" +
-    "\n" +
-    "                            <div ng-if=\"$ctrl.loading.slowCalls!=false\" class=\"text-center\">\n" +
-    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
-    "                            </div>\n" +
-    "\n" +
-    "                            <table id=\"slow-statements\" ng-if=\"$ctrl.loading.slowCalls==false\">\n" +
-    "                                <tbody>\n" +
-    "                                <tr ng-repeat=\"call in $ctrl.slowCalls\">\n" +
-    "                                    <td class=\"occurences\">\n" +
-    "                                        <span class=\"occurences\" data-uib-tooltip=\"Occurences\">{{call.occurences|numberToThousands}}</span>\n" +
-    "                                    </td>\n" +
-    "                                    <td class=\"ellipsis\">\n" +
-    "                                        <small title=\"{{call.statement}}\" class=\"statement\">{{call.statement}}</small>\n" +
-    "                                        <br/>\n" +
-    "                                        <span class=\"type\">{{call.statement_type}}</span>\n" +
-    "                                        <span class=\"subtype\">{{call.statement_subtype}}</span>\n" +
-    "                                        <span class=\"duration\" data-uib-tooltip=\"Average duration\">{{call.total_duration/call.occurences|round:2}}s</span>\n" +
-    "                        <span class=\"report-list\">\n" +
-    "                        Latest reports:\n" +
-    "                        <a ng-repeat=\"d in call.latest_details\" target=\"_blank\" ui-sref=\"report.view_detail({groupId:d.group_id, reportId:d.report_id})\"> <strong>{{$index+1}}</strong> </a>\n" +
-    "                        </span>\n" +
-    "                                    </td>\n" +
-    "                                </tr>\n" +
-    "                                </tbody>\n" +
-    "                            </table>\n" +
     "\n" +
+    "        <table st-table=\"displayedCollection\" st-safe-src=\"$ctrl.users\" class=\"table table-striped\">\n" +
+    "            <thead>\n" +
+    "            <tr>\n" +
+    "                <th class=\"user_name\" st-sort=\"user_name\"><a>Username</a></th>\n" +
+    "                <th class=\"email\" st-sort=\"email\"><a>Email</a></th>\n" +
+    "                <th class=\"status\" st-sort=\"status\"><a>Status</a></th>\n" +
+    "                <th st-sort=\"first_name\"><a>First Name</a></th>\n" +
+    "                <th st-sort=\"last_name\"><a>Last Name</a></th>\n" +
+    "                <th st-sort=\"last_login_date\"><a>Last login</a></th>\n" +
+    "                <th class=\"options\"></th>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <th><input st-search=\"user_name\" placeholder=\"search for user name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th><input st-search=\"email\" placeholder=\"search for email\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th></th>\n" +
+    "                <th><input st-search=\"first_name\" placeholder=\"search for first name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th><input st-search=\"last_name\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th><input st-search=\"last_login_date\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th></th>\n" +
+    "            </tr>\n" +
+    "            </thead>\n" +
+    "            <tbody>\n" +
     "\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
+    "            <tr ng-repeat=\"user in displayedCollection track by user.id\">\n" +
+    "                <td><img src=\"{{user.gravatar_url}}\" class=\"avatar\"> {{user.user_name}}</td>\n" +
+    "                <td class=\"word-wrap small\">{{user.email}}</td>\n" +
+    "                <td class=\"text-center\"><span class=\"fa\" ng-class=\"{'fa-check-circle':user.status, 'fa-times':!user.status}\"></span></td>\n" +
+    "                <td class=\"word-wrap small\">{{user.first_name}}</td>\n" +
+    "                <td class=\"word-wrap small\">{{user.last_name}}</td>\n" +
+    "                <td><span data-uib-tooltip=\"{{user.last_login_date}}\" class=\"small\">{{user.last_login_date | isoToRelativeTime}}</span></td>\n" +
+    "                <td>\n" +
+    "                    <a class=\"btn btn-default btn-sm\" data-ui-sref=\"admin.user.update({userId:user.id})\"><span class=\"fa fa-cog\"></span></a>\n" +
+    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                        <a class=\"btn btn-danger btn-sm\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                      <ul class=\"dropdown-menu\">\n" +
+    "                          <li><a>No</a></li>\n" +
+    "                          <li><a ng-click=\"$ctrl.removeUser(user)\">Yes</a></li>\n" +
+    "                      </ul>\n" +
+    "                    </span>\n" +
+    "            </tr>\n" +
+    "            <tfoot>\n" +
+    "            <tr>\n" +
+    "                <td colspan=\"6\" class=\"text-center\">\n" +
+    "                    <div st-pagination=\"\" st-items-by-page=\"100\" st-displayed-pages=\"7\"></div>\n" +
+    "                </td>\n" +
+    "            </tr>\n" +
+    "            </tfoot>\n" +
+    "            </tbody>\n" +
+    "        </table>\n" +
     "\n" +
     "\n" +
-    "                </div>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/admin-view/admin-view.html',
+    "<div class=\"row\">\n" +
+    "    <div class=\"col-sm-3\" id=\"menu\">\n" +
+    "        <div class=\"panel panel-default\">\n" +
+    "            <div class=\"panel-heading\">Users and groups</div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.user.list\"> Users</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.user.create\"> Create user</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.group.list\"> Groups</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.group.create\"> Create group</a></li>\n" +
+    "            </ul>\n" +
+    "        </div>\n" +
+    "        <div class=\"panel panel-default\">\n" +
+    "            <div class=\"panel-heading\">Resources</div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.application.list\"> List applications</a></li>\n" +
+    "            </ul>\n" +
+    "        </div>\n" +
     "\n" +
-    "            </div>\n" +
+    "        <div class=\"panel panel-default\">\n" +
+    "            <div class=\"panel-heading\">System</div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.configs.list\"> Config variables</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.system\"> System</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.partitions\"> Partition Management</a></li>\n" +
+    "            </ul>\n" +
     "        </div>\n" +
     "    </div>\n" +
+    "\n" +
+    "    <div class=\"col-sm-9\" ui-view></div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/integrations/bitbucket-integration-config-view/bitbucket-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
+  $templateCache.put('components/views/applications-integrations-view/applications-integrations-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.application && $state.is('applications.integrations')\"></ng-include>\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
+    "<ui-view>\n" +
+    "    <div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.application\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
-    "        <h1>Bitbucket Integration</h1>\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'bitbucket'})\">\n" +
+    "                <span class=\"fa fa-fw fa-bitbucket fa-3x pull-left\"></span>\n" +
+    "                <strong>Bitbucket</strong>\n" +
     "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
-    "            <div class=\"form-group\">\n" +
+    "                <p>Send issues and reports to Bitbucket</p>\n" +
+    "            </a>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">Repository</label>\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'campfire'})\">\n" +
+    "                <span class=\"fa fa-fw fa-comment fa-3x pull-left\"></span>\n" +
+    "                <strong>Campfire</strong>\n" +
     "\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                <p>Receive reports and alerts in your Campfire rooms</p>\n" +
+    "            </a>\n" +
     "\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.repo_name\"></data-form-errors>\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'flowdock'})\">\n" +
+    "                <span class=\"fa fa-fw fa-envelope fa-3x pull-left\"></span>\n" +
+    "                <strong>Flowdock</strong>\n" +
     "\n" +
-    "                    <div class=\"input-group\">\n" +
-    "                        <div class=\"input-group-addon\">https://bitbucket.org/</div>\n" +
-    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.user_name\" placeholder=\"user\" type=\"text\">\n" +
-    "                        <div class=\"input-group-addon\">/</div>\n" +
-    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.repo_name\" placeholder=\"repo_name\" type=\"text\">\n" +
-    "                    </div>\n" +
+    "                <p>Receive reports and alerts on your Flowdock team\n" +
+    "                    inbox</p>\n" +
+    "            </a>\n" +
     "\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "            <div class=\"form-group\">\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'github'})\">\n" +
+    "                <span class=\"fa fa-fw fa-github fa-3x pull-left\"></span>\n" +
+    "                <strong>Github</strong>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
+    "                <p>Send issues and reports to Github</p>\n" +
+    "            </a>\n" +
     "\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input type=\"submit\" class=\"btn btn-primary\" value=\"Use this repo\">\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "        </form>\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'hipchat'})\">\n" +
+    "                <span class=\"fa fa-fw fa-comment fa-3x pull-left\"></span>\n" +
+    "                <strong>HipChat</strong>\n" +
     "\n" +
-    "        <p class=\"m-t-1\">Remember you first need to\n" +
-    "            <strong>\n" +
-    "                <a data-ui-sref=\"user.profile.identities\">authorize your user account</a></strong>\n" +
-    "            with Bitbucket before we can send issues on your behalf.</p>\n" +
+    "                <p>Receive reports and alerts in your Hipchat chanels</p>\n" +
+    "            </a>\n" +
     "\n" +
-    "        <p>Every user will have to authorize AppEnlight to access Bitbucket to be able to post issues.</p>\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'jira'})\">\n" +
+    "                <span class=\"fa fa-fw fa-ticket fa-3x pull-left\"></span>\n" +
+    "                <strong>Jira</strong>\n" +
+    "\n" +
+    "                <p>Send issues and reports to Jira</p>\n" +
+    "            </a>\n" +
+    "\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'slack'})\">\n" +
+    "                <span class=\"fa fa-fw fa-comment fa-3x pull-left\"></span>\n" +
+    "                <strong>Slack</strong>\n" +
+    "\n" +
+    "                <p>Receive reports and alerts in your Slack chanels</p>\n" +
+    "            </a>\n" +
+    "\n" +
+    "            <a class=\"btn btn-default integration\"\n" +
+    "               data-ui-sref=\"applications.integrations.edit({resourceId:$ctrl.resource.resource_id, integration:'webhooks'})\">\n" +
+    "                <span class=\"fa fa-fw fa-cloud-upload fa-3x pull-left\"></span>\n" +
+    "                <strong>Webhooks</strong>\n" +
     "\n" +
+    "                <p>Notify third party API's of your reports and alerts</p>\n" +
+    "            </a>\n" +
+    "        </div>\n" +
     "    </div>\n" +
-    "</div>\n"
+    "</ui-view>\n"
   );
 
 
-  $templateCache.put('components/views/integrations/campfire-integration-config-view/campfire-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
+  $templateCache.put('components/views/applications-list-view/applications-list-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.applications\"></ng-include>\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.applications\">\n" +
     "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
-    "        <h1>Campfire Integration</h1>\n" +
-    "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+    "    <div class=\"panel-body\" ng-if=\"$ctrl.applications.length === 0 \">\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
+    "        <p>You have to create a new application first.</p>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">Account name</label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
+    "    </div>\n" +
     "\n" +
-    "                    <div class=\"input-group\">\n" +
-    "                        <div class=\"input-group-addon\">http://</div>\n" +
-    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.account\" placeholder=\"account\">\n" +
-    "                        <div class=\"input-group-addon\">.campfirenow.com</div>\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">API Token</label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.api_token\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.api_token\" placeholder=\"Your API token\">\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">Room ID list</label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.rooms\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.rooms\" placeholder=\"Room ID list\">\n" +
-    "                    <p>\n" +
-    "                        <small>Room ID list separated by comma</small>\n" +
-    "                    </p>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <input type=\"submit\" class=\"btn btn-primary\" value=\"Connect to Campfire\">\n" +
-    "\n" +
-    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                        <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                      <ul class=\"dropdown-menu\">\n" +
-    "                          <li><a>No</a></li>\n" +
-    "                          <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                      </ul>\n" +
-    "                    </span>\n" +
-    "\n" +
-    "                <div class=\"btn-group\" uib-dropdown>\n" +
-    "                    <button id=\"single-button\" type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
-    "                        Test integration <span class=\"caret\"></span>\n" +
-    "                    </button>\n" +
-    "                    <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
-    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
-    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
-    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
-    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
-    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
-    "                    </ul>\n" +
-    "                </div>\n" +
-    "\n" +
-    "            </div>\n" +
-    "\n" +
-    "        </form>\n" +
+    "    <table class=\"table table-striped\" ng-if=\"$ctrl.applications.length > 0\">\n" +
+    "        <thead>\n" +
+    "        <tr>\n" +
+    "            <th class=\"resource_name\">Resource Name</th>\n" +
+    "            <th class=\"domains\">Domains</th>\n" +
+    "            <th class=\"options\">Options</th>\n" +
+    "        </tr>\n" +
+    "        </thead>\n" +
+    "        <tbody>\n" +
+    "        <tr class=\"r{{$index+1}}\" ng-repeat=\"application in $ctrl.applications\">\n" +
+    "            <td>{{application.resource_name}}</td>\n" +
+    "            <td>{{application.domains}}</td>\n" +
+    "            <td class=\"options\">\n" +
+    "                <a class=\"btn btn-default\" data-ui-sref=\"applications.update({resourceId:application.resource_id})\" data-toggle=\"tooltip\" title=\"Update application\"><span class=\"fa fa-cog\"></span> Update</a>\n" +
+    "                <a class=\"btn btn-default\" data-ui-sref=\"applications.integrations({resourceId:application.resource_id})\" data-toggle=\"tooltip\" title=\"Manage Integrations\"><span class=\"fa fa-wrench\"></span> Integrations</a>\n" +
+    "            </td>\n" +
+    "        </tr>\n" +
+    "        </tbody>\n" +
+    "    </table>\n" +
     "\n" +
-    "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/integrations/flowdock-integration-config-view/flowdock-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
-    "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
-    "\n" +
-    "        <h1>Flowdock Integration</h1>\n" +
-    "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+  $templateCache.put('components/views/applications-purge-logs-view/applications-purge-logs-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.applications\"></ng-include>\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
+    "<div ng-show=\"!$ctrl.loading.applications\">\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">API Token</label>\n" +
+    "            <form method=\"post\" class=\"form-horizontal\" name=\"$ctrl.form\" ng-submit=\"$ctrl.purgeLogs()\">\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <label class=\"control-label col-sm-3 col-lg-2\">Application:</label>\n" +
     "\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.api_token\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.api_token\" placeholder=\"Your API token\" type=\"text\">\n" +
+    "                    <div class=\"col-sm-9 col-lg-10 form-inline\">\n" +
+    "                        <select ng-model=\"$ctrl.selectedResource\" ng-change=\"$ctrl.getCommonKeys()\"\n" +
+    "                                ng-options=\"r.resource_id as r.resource_name for r in $ctrl.applications\" class=\"form-control\"></select>\n" +
+    "                    </div>\n" +
     "                </div>\n" +
     "\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <label class=\"control-label col-sm-3 col-lg-2\">Namespace:</label>\n" +
     "\n" +
-    "            </div>\n" +
-    "\n" +
-    "            <div class=\"form-group\">\n" +
-    "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
-    "\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "\n" +
-    "                    <input type=\"submit\" class=\"btn btn-primary\" value=\"Connect to Flowdock\">\n" +
-    "\n" +
-    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                        <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                      <ul class=\"dropdown-menu\">\n" +
-    "                          <li><a>No</a></li>\n" +
-    "                          <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                      </ul>\n" +
-    "                    </span>\n" +
-    "                    <div class=\"btn-group\" uib-dropdown>\n" +
-    "                        <button id=\"single-button\" type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
-    "                            Test integration <span class=\"caret\"></span>\n" +
-    "                        </button>\n" +
-    "                        <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
-    "                        </ul>\n" +
+    "                    <div class=\"col-sm-9 col-lg-10\">\n" +
+    "                        <input type=\"text\" name=\"namespace\" ng-model=\"$ctrl.namespace\"\n" +
+    "                               placeholder=\"Namespace to filter on\" uib-typeahead=\"ns for ns in $ctrl.commonNamespaces\"\n" +
+    "                               class=\"form-control\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "            </div>\n" +
     "\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
     "\n" +
-    "        </form>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9 \">\n" +
+    "                        <input class=\"form-control btn btn-primary\" name=\"submit\" type=\"submit\" value=\"Purge logs meeting the criteria\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
+    "            </form>\n" +
+    "        </div>\n" +
     "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/integrations/github-integration-config-view/github-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
-    "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.application && !$ctrl.loading.integration\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
+  $templateCache.put('components/views/applications-update-view/applications-update-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.application\"></ng-include>\n" +
     "\n" +
-    "        <h1>Github Integration</h1>\n" +
+    "<div ng-show=\"!$ctrl.loading.application\">\n" +
     "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
+    "            <div class=\"row\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "                <div class=\"col-sm-6\">\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
+    "                    <uib-tabset>\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                API keys\n" +
+    "                            </uib-tab-heading>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">Repository</label>\n" +
+    "                            <p><strong>PRIVATE API KEY:</strong></p>\n" +
+    "                            <p>\n" +
+    "                            <div class=\"well well-sm\">{{ $ctrl.resource.api_key }}</div>\n" +
+    "                            </p>\n" +
+    "                            <p><strong>PUBLIC API KEY</strong> (for javascript clients):</p>\n" +
+    "                            <p>\n" +
+    "                            <div class=\"well well-sm\">{{ $ctrl.resource.public_key }}</div>\n" +
+    "                            </p>\n" +
+    "                            <p><small>Your key will be used to identify to which application your data\n" +
+    "                                belongs to please keep them private at all times.</small></p>\n" +
     "\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        </uib-tab>\n" +
     "\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.repo_name\"></data-form-errors>\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                <span class=\"btn btn-danger btn-xs\"><span class=\"fa fa-exclamation-triangle\"></span></span> Regenerate API keys\n" +
+    "                            </uib-tab-heading>\n" +
+    "                            <p>Are you sure you want to regenerate API KEY for this application?</p>\n" +
+    "                            <p>All client application keys will need to be updated.</p>\n" +
+    "                            <form ng-submit=\"$ctrl.regenerateAPIKeys()\" name=\"$ctrl.regenerateAPIKeysForm\" class=\"form-inline\">\n" +
+    "                                <data-form-errors errors=\"$ctrl.regenerateAPIKeysForm.ae_validation.password\"></data-form-errors>\n" +
+    "                                <div class=\"form-group\">\n" +
+    "                                <input type=\"password\" name=\"confirm\"\n" +
+    "                                       placeholder=\"Enter your password to proceed\" class=\"form-control\" ng-model=\"$ctrl.regenerateAPIKeysPassword\">\n" +
+    "                                <input type=\"submit\" class=\"btn btn-danger\" value=\"Confirm\">\n" +
+    "                                </div>\n" +
+    "                            </form>\n" +
+    "                        </uib-tab>\n" +
+    "                    </uib-tabset>\n" +
+    "                </div>\n" +
+    "                <div class=\"col-sm-6 text-center\">\n" +
+    "                    <h2 class=\"m-t-0\">How to connect your application?</h2>\n" +
+    "                    <p>Visit our <a href=\"{{AeConfig.urls.docs}}\"><strong>developer documentation</strong></a> for step-by-step integration instructions.</p>\n" +
+    "                    <div class=\"clearfix\"></div>\n" +
+    "                    <p class=\"text-center\">\n" +
+    "                        <a href=\"{{AeConfig.urls.docs}}\"><img src=\"/static/appenlight/images/logos/django_small.png\" alt=\"Django Logo\">\n" +
+    "                            <img src=\"/static/appenlight/images/logos/pyramid_small.png\" alt=\"Pyramid Logo\">\n" +
+    "                            <img src=\"/static/appenlight/images/logos/flask_small.png\" alt=\"Flask Logo\"></a>\n" +
     "\n" +
-    "                    <div class=\"input-group\">\n" +
-    "                        <div class=\"input-group-addon\">https://api.github.com/</div>\n" +
-    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.user_name\" placeholder=\"user\" type=\"text\">\n" +
-    "                        <div class=\"input-group-addon\">/</div>\n" +
-    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.repo_name\" placeholder=\"repo_name\" type=\"text\">\n" +
-    "                    </div>\n" +
+    "                        <a href=\"{{AeConfig.urls.docs}}\"><img src=\"/static/appenlight/images/logos/js_small.png\" alt=\"Javascript Logo\">\n" +
+    "                            <img src=\"/static/appenlight/images/logos/nodejs.png\" alt=\"Node.js\"></a>\n" +
+    "                        <img src=\"/static/appenlight/images/logos/ruby_small.png\" alt=\"Ruby Logo\">\n" +
+    "                        <img src=\"/static/appenlight/images/logos/php_small.png\" alt=\"PHP Logo\">\n" +
+    "                        </a>\n" +
     "\n" +
+    "                    </p>\n" +
     "                </div>\n" +
     "            </div>\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
+    "            <hr ng-show=\"$ctrl.resource.resource_id\">\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
+    "            <form method=\"post\" class=\"form-horizontal\" name=\"$ctrl.BasicForm\" ng-submit=\"$ctrl.updateBasicForm()\" novalidate>\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.resource_name\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Application name\n" +
+    "                            <span class=\"required\">*</span>\n" +
+    "                        </label>\n" +
     "\n" +
-    "                <input type=\"submit\" class=\"btn btn-primary\" value=\"Use this repo\">\n" +
+    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
+    "                            <input class=\"form-control\"  name=\"resource_name\" placeholder=\"Application Name\" type=\"text\" ng-model=\"$ctrl.resource.resource_name\">\n" +
+    "                        </div>\n" +
     "\n" +
-    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                        <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                      <ul class=\"dropdown-menu\">\n" +
-    "                          <li><a>No</a></li>\n" +
-    "                          <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                      </ul>\n" +
-    "                    </span>\n" +
     "\n" +
-    "            </div>\n" +
-    "        </form>\n" +
+    "                    </div>\n" +
     "\n" +
-    "        <p class=\"m-t-1\">Remember you first need to\n" +
-    "            <strong>\n" +
-    "                <a data-ui-sref=\"user.profile.identities\">authorize your user account</a></strong>\n" +
-    "            with Github before we can send issues on your behalf.</p>\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.domains\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Domain names for CORS headers\n" +
+    "                        </label>\n" +
+    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
+    "                            <textarea class=\"form-control\"  name=\"domains\"  ng-model=\"$ctrl.resource.domains\"></textarea>\n" +
+    "                            <p class=\"description\">Required for Javascript error tracking (one line one domain, skip http:// part)</p>\n" +
+    "                        </div>\n" +
     "\n" +
-    "        <p>Every user will have to authorize AppEnlight to access Github to be able to post issues.</p>\n" +
     "\n" +
-    "        <div class=\"panel panel-warning\">\n" +
-    "            <div class=\"panel-heading\">Private repository access</div>\n" +
-    "            <div class=\"panel-body\">\n" +
-    "                <p>If you need access to private repositories <a data-ui-sref=\"user.profile.identities\">profile page</a> allows you to require token including private repository permissions.</p>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.default_grouping\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Default grouping for errors\n" +
+    "                        </label>\n" +
+    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
+    "                            <select class=\"form-control\"  name=\"default_grouping\" ng-model=\"$ctrl.resource.default_grouping\" ng-options=\"i[0] as i[1] for i in $ctrl.groupingOptions\"></select>\n" +
+    "                        </div>\n" +
     "\n" +
-    "                <p>Registration page OAuth does NOT give you token with private repository access permissions.</p>\n" +
-    "            </div>\n" +
-    "        </div>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.error_report_threshold\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Alert on error reports\n" +
+    "                            <span class=\"required\">*</span>\n" +
+    "                        </label>\n" +
+    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
+    "                            <input class=\"form-control\"  name=\"error_report_threshold\" type=\"text\" ng-model=\"$ctrl.resource.error_report_threshold\">\n" +
+    "                            <p class=\"description\">Application requires to send at least this amount of error reports per minute to open alert</p>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.slow_report_threshold\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Alert on slow reports\n" +
+    "                            <span class=\"required\">*</span>\n" +
+    "                        </label>\n" +
     "\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/integrations/hipchat-integration-config-view/hipchat-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
+    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
+    "                            <input class=\"form-control\"  name=\"slow_report_threshold\" type=\"text\" ng-model=\"$ctrl.resource.slow_report_threshold\">\n" +
+    "                            <p class=\"description\">Application requires to send at least this amount of slow reports per minute to open alert</p>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.BasicForm.ae_validation.allow_permanent_storage\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Permanent logs\n" +
+    "                        </label>\n" +
+    "                        <div class=\" col-sm-8 col-lg-9\">\n" +
+    "                            <input class=\"form-control\"  name=\"allow_permanent_storage\" type=\"checkbox\"  ng-model=\"$ctrl.resource.allow_permanent_storage\">\n" +
+    "                            <p class=\"description\">Allow permanent storage of logs in separate DB partitions (only administrator can enable this feature)</p>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
+    "                        </label>\n" +
     "\n" +
-    "        <h1>Hipchat Integration</h1>\n" +
+    "                        <div class=\" col-sm-8 col-lg-9 \">\n" +
+    "                            <input class=\"form-control btn btn-primary\"  name=\"submit\" type=\"submit\" value=\"{{$ctrl.resource.resource_id? 'Update' : 'Create'}} Application\">\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "            </form>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
     "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+    "    <div class=\"panel panel-default\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            <h3 class=\"panel-title\">Plugins</h3>\n" +
+    "        </div>\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">API Token</label>\n" +
+    "        <plugin-config resource=\"$ctrl.resource\"\n" +
+    "                       section=\"'application.update'\"\n" +
+    "                       ng-if=\"$ctrl.resource.resource_id\">\n" +
+    "        </plugin-config>\n" +
     "\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.api_token\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.api_token\" placeholder=\"Your API token\" type=\"text\">\n" +
-    "                </div>\n" +
-    "            </div>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
+    "    <div class=\"panel panel-default m-t-1\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            <h3 class=\"panel-title\">API Testing</h3>\n" +
+    "        </div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <p>Please be sure to add at least one <a data-ui-sref=\"user.alert_channels.email\"><strong>email alert channel</strong></a> for your account.</p>\n" +
+    "            <p>This will enable AppEnlight to send you notification emails about errors inside your $ctrl.</p>\n" +
+    "            <p><strong>After this is done you can use this CURL commands to test APIs:</strong></p>\n" +
+    "            <p>(Please note that the data like execution times is semi randomly generated)</p>\n" +
+    "            <uib-tabset>\n" +
+    "                <uib-tab>\n" +
+    "                    <uib-tab-heading>\n" +
+    "                        Log API\n" +
+    "                    </uib-tab-heading>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">Room ID list</label>\n" +
+    "                    <div class=\"codehilite\">\n" +
+    "                    <pre class=\"m-a-0\">\n" +
+    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/logs?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
+    "    [\n" +
+    "      {\n" +
+    "      \"log_level\": \"WARNING\",\n" +
+    "      \"message\": \"OMG ValueError happened\",\n" +
+    "      \"namespace\": \"some.namespace.indicator\",\n" +
+    "      \"request_id\": \"SOME_UUID\",\n" +
+    "      \"permanent\": false,\n" +
+    "      \"primary_key\": \"random_key\",\n" +
+    "      \"server\": \"some.server.hostname\",\n" +
+    "      \"date\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
+    "      \"tags\": [[\"tag1\",\"value\"], [\"tag2\", 5]]\n" +
+    "      },\n" +
+    "      {\n" +
+    "      \"log_level\": \"ERROR\",\n" +
+    "      \"message\": \"OMG ValueError happened2\",\n" +
+    "      \"namespace\": \"some.namespace.indicator\",\n" +
+    "      \"request_id\": \"SOME_UUID\",\n" +
+    "      \"permanent\": false,\n" +
+    "      \"server\": \"some.server.hostname\",\n" +
+    "      \"date\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\"\n" +
+    "      }\n" +
+    "    ]'\n" +
+    "                    </pre>\n" +
+    "                    </div>\n" +
     "\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.rooms\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.rooms\" placeholder=\"Room ID list\" type=\"text\">\n" +
+    "                </uib-tab>\n" +
     "\n" +
-    "                    <p>\n" +
-    "                        <small>Room ID list separated by comma</small>\n" +
-    "                    </p>\n" +
-    "                </div>\n" +
+    "                <uib-tab>\n" +
+    "                    <uib-tab-heading>\n" +
+    "                        Report API\n" +
+    "                    </uib-tab-heading>\n" +
     "\n" +
-    "            </div>\n" +
+    "                    <div class=\"codehilite\">\n" +
+    "                    <pre class=\"m-a-0\">\n" +
+    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/reports?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
+    "    [{\n" +
+    "    \"client\": \"your-client-name-python\",\n" +
+    "    \"language\": \"python\",\n" +
+    "    \"view_name\": \"views/foo:bar\",\n" +
+    "    \"server\": \"SERVERNAME/INSTANCENAME\",\n" +
+    "    \"priority\": 5,\n" +
+    "    \"error\": \"OMG ValueError happened\",\n" +
+    "    \"occurences\":1,\n" +
+    "    \"http_status\": 500,\n" +
+    "    \"tags\": [[\"tag1\",\"value\"], [\"tag2\", 5]],\n" +
+    "    \"username\": \"USER\",\n" +
+    "    \"url\": \"HTTP://SOMEURL\",\n" +
+    "    \"ip\": \"127.0.0.1\",\n" +
+    "    \"start_time\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
+    "    \"end_time\": \"{{$ctrl.momentJs.utc().milliseconds(0).add(2, 'seconds').toISOString()}}\",\n" +
+    "    \"user_agent\": \"BROWSER_AGENT\",\n" +
+    "    \"extra\": [[\"message\",\"CUSTOM MESSAGE\"], [\"custom_value\", \"some payload\"]],\n" +
+    "    \"request_id\": \"SOME_UUID\",\n" +
+    "    \"request\": {\"REQUEST_METHOD\": \"GET\",\n" +
+    "             \"PATH_INFO\": \"/FOO/BAR\",\n" +
+    "             \"POST\": {\"FOO\":\"BAZ\",\"XXX\":\"YYY\"}\n" +
+    "             },\n" +
+    "    \"slow_calls\":[{\n" +
+    "                   \"start\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
+    "                   \"end\": \"{{$ctrl.momentJs.utc().milliseconds(0).add(1, 'seconds').toISOString()}}\",\n" +
+    "                   \"type\": \"sql\",\n" +
+    "                   \"subtype\": \"postgresql\",\n" +
+    "                   \"parameters\": [\"QPARAM1\",\"QPARAM2\",\"QPARAMX\"],\n" +
+    "                   \"statement\": \"QUERY\"\n" +
+    "                   }],\n" +
+    "    \"request_stats\": {\n" +
+    "                    \"main\": 2.50779,\n" +
+    "                    \"nosql\": 0.01008,\n" +
+    "                    \"nosql_calls\": 17.0,\n" +
+    "                    \"remote\": 0.0,\n" +
+    "                    \"remote_calls\": 0.0,\n" +
+    "                    \"sql\": 1,\n" +
+    "                    \"sql_calls\": 1.0,\n" +
+    "                    \"tmpl\": 0.0,\n" +
+    "                    \"tmpl_calls\": 0.0,\n" +
+    "                    \"custom\": 0.0,\n" +
+    "                    \"custom_calls\": 0.0\n" +
+    "                },\n" +
+    "    \"traceback\": [\n" +
+    "                {\"cline\": \"return foo_bar_baz(1,2,3)\",\n" +
+    "                \"file\": \"somedir/somefile.py\",\n" +
+    "                \"fn\": \"somefunction\",\n" +
+    "                \"line\": 454,\n" +
+    "                \"vars\": [[\"a_list\",\n" +
+    "                         [\"1\",2,\"4\",\"5\",6]],\n" +
+    "                         [\"b\", {\"1\": \"2\", \"ccc\": \"ddd\", \"1\": \"a\"}],\n" +
+    "                         [\"obj\", \"object object at 0x7f0030853dc0\"]]\n" +
+    "                        },\n" +
+    "                        {\"cline\": \"OMG ValueError happened\",\n" +
+    "                        \"file\": \"\",\n" +
+    "                        \"fn\": \"\",\n" +
+    "                        \"line\": \"\",\n" +
+    "                        \"vars\": []}\n" +
+    "                        ]\n" +
+    "                        }]'\n" +
+    "                    </pre>\n" +
+    "                    </div>\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input type=\"submit\" class=\"btn btn-primary\" value=\"Connect to Hipchat\">\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
+    "                </uib-tab>\n" +
     "\n" +
-    "                    <div class=\"btn-group\" uib-dropdown>\n" +
-    "                        <button id=\"single-button\" type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
-    "                            Test integration <span class=\"caret\"></span>\n" +
-    "                        </button>\n" +
-    "                        <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
-    "                        </ul>\n" +
-    "                    </div>\n" +
+    "                <uib-tab>\n" +
+    "\n" +
+    "                <uib-tab-heading>\n" +
+    "                    Metrics API\n" +
+    "                </uib-tab-heading>\n" +
     "\n" +
+    "                <div class=\"codehilite\">\n" +
+    "                    <pre class=\"m-a-0\">\n" +
+    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/general_metrics?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
+    "        [{\n" +
+    "        \"namespace\": \"some.monitor\",\n" +
+    "        \"timestamp\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
+    "        \"server_name\": \"server.name\",\n" +
+    "        \"tags\": [[\"value1\", 15.7], [\"value2\", 26]]}]'\n" +
+    "                    </pre>\n" +
     "                </div>\n" +
-    "            </div>\n" +
     "\n" +
-    "        </form>\n" +
+    "                </uib-tab>\n" +
     "\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/integrations/jira-integration-config-view/jira-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
-    "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
+    "                <uib-tab>\n" +
     "\n" +
-    "        <h1>Jira Integration</h1>\n" +
+    "                    <uib-tab-heading>\n" +
+    "                        Request Stats API\n" +
+    "                    </uib-tab-heading>\n" +
     "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+    "                    <div class=\"codehilite\">\n" +
+    "                    <pre class=\"m-a-0\">\n" +
+    "curl -H \"Content-Type: application/json\" -k {{AeConfig.urls.baseUrl}}api/request_stats?protocol_version=0.5\\&ampapi_key={{$ctrl.resource.api_key}} -d '\n" +
+    "        [{\"server\": \"some.server.hostname\",\n" +
+    "          \"timestamp\": \"{{$ctrl.momentJs.utc().milliseconds(0).toISOString()}}\",\n" +
+    "          \"metrics\": [[\"dir/module:func\",\n" +
+    "               {\"custom\": 0.0,\n" +
+    "                \"custom_calls\": 0,\n" +
+    "                \"main\": 0.01664,\n" +
+    "                \"nosql\": 0.00061,\n" +
+    "                \"nosql_calls\": 23,\n" +
+    "                \"remote\": 0.0,\n" +
+    "                \"remote_calls\": 0,\n" +
+    "                \"requests\": 1,\n" +
+    "                \"sql\": 0.00105,\n" +
+    "                \"sql_calls\": 2,\n" +
+    "                \"tmpl\": 0.0,\n" +
+    "                \"tmpl_calls\": 0}],\n" +
+    "              [\"SomeView.function\",\n" +
+    "               {\"custom\": 0.0,\n" +
+    "                \"custom_calls\": 0,\n" +
+    "                \"main\": 0.647261,\n" +
+    "                \"nosql\": 0.306554,\n" +
+    "                \"nosql_calls\": 140,\n" +
+    "                \"remote\": 0.0,\n" +
+    "                \"remote_calls\": 0,\n" +
+    "                \"requests\": 28,\n" +
+    "                \"sql\": 0.0,\n" +
+    "                \"sql_calls\": 0,\n" +
+    "                \"tmpl\": 0.0,\n" +
+    "                \"tmpl_calls\": 0}]]\n" +
+    "                }]'\n" +
+    "                    </pre>\n" +
+    "                    </div>\n" +
     "\n" +
-    "            <div class=\"form-group\" id=\"row-host_name\">\n" +
+    "                </uib-tab>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
-    "                    Server URL <span class=\"required\">*</span>\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.host_name\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" id=\"host_name\" name=\"host_name\" type=\"text\" ng-model=\"$ctrl.config.host_name\">\n" +
+    "            </uib-tabset>\n" +
     "\n" +
-    "                    <p>\n" +
-    "                        <small>https://servername.atlassian.net</small>\n" +
-    "                    </p>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
     "\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "            <div class=\"form-group\" id=\"row-user_name\">\n" +
+    "    <permissions-form resource=\"$ctrl.resource\" current-permissions=\"$ctrl.resource.current_permissions\"\n" +
+    "                      possible-permissions=\"$ctrl.resource.possible_permissions\" ng-if=\"$ctrl.resource.resource_id\"></permissions-form>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
-    "                    Username <span class=\"required\">*</span>\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "    <div class=\"panel panel-info\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            <h3 class=\"panel-title\">Postprocessing</h3>\n" +
+    "        </div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <p>This section allows you influence the rating of report groups - if rule is matched once its not executed anymore</p>\n" +
     "\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" id=\"user_name\" name=\"user_name\" type=\"text\" ng-model=\"$ctrl.config.user_name\">\n" +
+    "            <p>\n" +
+    "                <a class=\"btn btn-info\" ng-click=\"$ctrl.addRule()\"><span class=\"fa fa-plus-circle\"></span> Add rule</a>\n" +
+    "            </p>\n" +
     "\n" +
-    "                    <p>\n" +
-    "                        <small>user@email.com</small>\n" +
-    "                    </p>\n" +
+    "            <post-process-action action=\"action\" resource=\"$ctrl.resource\" ng-repeat=\"action in $ctrl.resource.postprocessing_rules\"></post-process-action>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
     "\n" +
-    "                </div>\n" +
+    "    <div class=\"panel panel-danger\" ng-show=\"$ctrl.resource.resource_id\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            <h3 class=\"panel-title\">Administration</h3>\n" +
+    "        </div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <h2>Transfer ownership</h2>\n" +
+    "            <p>Please note that by transfering ownership you WILL lose access to the application data and new owner needs to give you access permission</p>\n" +
+    "            <div class=\"confirmation_form\" ng-submit=\"$ctrl.transferApplication()\">\n" +
+    "                <form class=\"form-horizontal\" name=\"$ctrl.formTransfer\">\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.formTransfer.ae_validation.password\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Password\n" +
+    "                        </label>\n" +
+    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                            <input class=\"form-control\"  name=\"password\" type=\"password\" ng-model=\"$ctrl.formTransferModel.password\">\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.formTransfer.ae_validation.user_name\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            New owners username\n" +
+    "                        </label>\n" +
+    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                            <input class=\"form-control\"  name=\"user_name\" type=\"text\" ng-model=\"$ctrl.formTransferModel.user_name\">\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        </label>\n" +
+    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                            <button class=\"btn btn-danger\">\n" +
+    "                                <span class=\"fa fa-user-plus\"></span>\n" +
+    "                                Transfer ownership of application\n" +
+    "                            </button>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                </form>\n" +
     "            </div>\n" +
-    "            <div class=\"form-group\" id=\"row-password\">\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
-    "                    Password <span class=\"required\">*</span>\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.password\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" id=\"password\" name=\"password\" type=\"password\" ng-model=\"$ctrl.config.password\">\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "            <div class=\"form-group\" id=\"row-project\">\n" +
+    "            <hr/>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
-    "                    Project key <span class=\"required\">*</span>\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.project\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" id=\"project\" name=\"project\" type=\"text\" ng-model=\"$ctrl.config.project\">\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "            <div class=\"form-group\" id=\"row-submit\">\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Setup Jira\">\n" +
+    "            <h2>Remove application</h2>\n" +
+    "            <p><strong>This operation will wipe out all data from database - there is no undo.</strong></p>\n" +
     "\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
-    "                </div>\n" +
+    "            <div class=\"confirmation_form\">\n" +
+    "                <form class=\"form-horizontal\" name=\"$ctrl.formDelete\" ng-submit=\"$ctrl.deleteApplication()\">\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <data-form-errors errors=\"$ctrl.formDelete.ae_validation.password\"></data-form-errors>\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                            Password\n" +
+    "                        </label>\n" +
+    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                            <input class=\"form-control\" name=\"password\" type=\"password\" ng-model=\"$ctrl.formDeleteModel.password\">\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"form-group\">\n" +
+    "                        <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "\n" +
+    "                        </label>\n" +
+    "                        <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                            <button class=\"btn btn-danger\">\n" +
+    "                                <span class=\"fa fa-trash-o\"></span>\n" +
+    "                                Delete my application\n" +
+    "                            </button>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                </form>\n" +
     "            </div>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/event-browser/event-browser.html',
+    "<div class=\"panel panel-default\">\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "        </form>\n" +
+    "        <h1>Event history</h1>\n" +
+    "\n" +
+    "        <table class=\"table table-striped event-table\">\n" +
+    "            <tr ng-repeat=\"event in $ctrl.events track by event.id\">\n" +
+    "                <td class=\"text-center icons\">\n" +
+    "                    <span ng-if=\"event.event_type === 1\" class=\"fa fa-exclamation-triangle fa-2x\" style=\"color:orangered\"></span>\n" +
+    "                    <span ng-if=\"event.event_type === 3\" class=\"fa fa-clock-o fa-2x\" style=\"color:darkorange\"></span>\n" +
+    "                    <span ng-if=\"event.event_type === 7\" class=\"fa fa-question-circle fa-2x\" style=\"color:dimgrey\"></span>\n" +
+    "                    <span ng-if=\"event.event_type === 9\" class=\"fa fa-line-chart fa-2x\" style=\"color:green\"></span>\n" +
+    "                </td>\n" +
+    "                <td>\n" +
+    "                    <p>For <strong>{{ event.resource_name }}</strong></p>\n" +
+    "\n" +
+    "                    <p>{{ event.text }}</p>\n" +
+    "                    <small class=\"date\" data-uib-tooltip=\"{{event.start_date}}\"> created:\n" +
+    "                        <iso-to-relative-time time=\"{{event.start_date}}\"/>\n" +
+    "                    </small>\n" +
+    "                    <small class=\"date\" ng-show=\"event.end_date\" data-uib-tooltip=\"{{event.end_date}}\"> | closed:\n" +
+    "                        <iso-to-relative-time time=\"{{event.end_date}}\"/>\n" +
+    "                    </small>\n" +
+    "                </td>\n" +
+    "                <td class=\"options\">\n" +
     "\n" +
+    "                    <span class=\"dropdown pull-right\" ng-if=\"event.status === 1\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                      <a class=\"dropdown-toggle btn btn-danger\" data-uib-dropdown-toggle>\n" +
+    "                          <span class=\"fa fa-exclamation-circle\"></span>\n" +
+    "                      </a>\n" +
+    "                      <ul class=\"dropdown-menu\">\n" +
+    "                          <li>\n" +
+    "                              <a ng-click=\"$ctrl.closeEvent(event)\">Close event</a>\n" +
+    "                              <a>Do nothing</a>\n" +
+    "                          </li>\n" +
+    "                      </ul>\n" +
+    "                    </span>\n" +
     "\n" +
+    "                </td>\n" +
+    "            </tr>\n" +
+    "        </table>\n" +
     "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/integrations/slack-integration-config-view/slack-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
+  $templateCache.put('components/views/index-dashboard/index-dashboard.html',
+    "<style type=\"text/css\">\n" +
+    "    #metrics_chart .c3-line {\n" +
+    "        stroke-width: 0px;\n" +
+    "    }\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
+    "    #metrics_chart .c3-area {\n" +
+    "        stroke-width: 0;\n" +
+    "        opacity: 0.75;\n" +
+    "    }\n" +
+    "</style>\n" +
     "\n" +
-    "        <h1>Slack Integration</h1>\n" +
+    "<div class=\"row\">\n" +
+    "    <div class=\"col-sm-12 dashboard\" id=\"content\">\n" +
+    "        <div ng-if=\"!$ctrl.stateHolder.AeUser.applications.length\">\n" +
     "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+    "            <div ng-include=\"'templates/quickstart.html'\"></div>\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
+    "        </div>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
-    "                    API Token <span class=\"required\">*</span>\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.webhook_url\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.webhook_url\" placeholder=\"Webhook URL\" type=\"webhook_url\">\n" +
-    "                </div>\n" +
-    "            </div>\n" +
+    "        <div ng-if=\"$ctrl.stateHolder.AeUser.applications.length\">\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
+    "            <div class=\"row\">\n" +
+    "                <div class=\"col-sm-6\">\n" +
+    "                    <div class=\"panel panel-default\">\n" +
+    "                        <div class=\"panel-body\">\n" +
+    "                            <form class=\"graph-type form-inline\">\n" +
+    "                                <select ng-model=\"$ctrl.resource\" ng-options=\"r.resource_id as r.resource_name for r in $ctrl.stateHolder.AeUser.applications\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
+    "                                        class=\"SelectField form-control input-sm slim-input\"></select>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input type=\"submit\" class=\"btn btn-primary\"\n" +
-    "                           value=\"Connect to Slack\">\n" +
+    "                                <select class=\"SelectField form-control input-sm slim-input\" ng-model=\"$ctrl.timeSpan\"\n" +
+    "                                        ng-options=\"i as i.label for i in $ctrl.timeOptions | objectToOrderedArray:'minutes'\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
+    "                                        class=\"SelectField\"></select>\n" +
     "\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
     "\n" +
-    "                    <div class=\"btn-group\" uib-dropdown>\n" +
-    "                        <button type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
-    "                            Test integration <span class=\"caret\"></span>\n" +
-    "                        </button>\n" +
-    "                        <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
-    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
-    "                        </ul>\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "        </form>\n" +
+    "                                <div class=\"btn-group\">\n" +
+    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
+    "                                            uib-btn-radio=\"'requests_graphs'\" data-uib-tooltip=\"Requests per second\">\n" +
+    "                                        <span class=\"fa fa-line-chart\"></span>\n" +
+    "                                    </button>\n" +
+    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
+    "                                            uib-btn-radio=\"'response_graphs'\" data-uib-tooltip=\"Average response time\">\n" +
+    "                                        <span class=\"fa fa-random\"></span>\n" +
+    "                                    </button>\n" +
+    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
+    "                                            uib-btn-radio=\"'metrics_graphs'\" data-uib-tooltip=\"Time spent per request\">\n" +
+    "                                        <span class=\"fa fa-bar-chart-o\"></span>\n" +
+    "                                    </button>\n" +
+    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
+    "                                            uib-btn-radio=\"'report_graphs'\" data-uib-tooltip=\"Errors\">\n" +
+    "                                        <span class=\"fa fa-exclamation-triangle\"></span>\n" +
+    "                                    </button>\n" +
+    "                                    <button type=\"button\" class=\"btn btn-primary btn-sm\" ng-model=\"$ctrl.graphType.selected\" ng-change=\"$ctrl.updateSearchParams()\"\n" +
+    "                                            uib-btn-radio=\"'slow_report_graphs'\" data-uib-tooltip=\"Slow reports\">\n" +
+    "                                        <span class=\"fa fa-clock-o\"></span>\n" +
+    "                                    </button>\n" +
+    "                                </div>\n" +
+    "                            </form>\n" +
+    "                            <div class=\"clearfix\"></div>\n" +
     "\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/integrations/webhooks-integration-config-view/webhooks-integration-config-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
+    "                            <p ng-if=\"$ctrl.loading.series != false\" class=\"text-center\">\n" +
+    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
+    "                            </p>\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
-    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "    <div class=\"panel-body\">\n" +
+    "                            <div ng-if=\"$ctrl.loading.series == false\">\n" +
+    "                            <div ng-if=\"$ctrl.graphType.selected == 'requests_graphs'\">\n" +
+    "                                <c3chart data-domid=\"reponse_chart\" data-data=\"$ctrl.requestsChartData\" data-config=\"$ctrl.requestsChartConfig\" update=\"true\">\n" +
+    "                                </c3chart>\n" +
+    "                            </div>\n" +
     "\n" +
-    "        <h1>Webhooks Integration</h1>\n" +
+    "                            <div ng-if=\"$ctrl.graphType.selected == 'response_graphs'\">\n" +
+    "                                <c3chart data-domid=\"reponse_chart\" data-data=\"$ctrl.responseChartData\" data-config=\"$ctrl.responseChartConfig\" update=\"true\">\n" +
+    "                                </c3chart>\n" +
+    "                            </div>\n" +
     "\n" +
-    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
-    "            <div class=\"form-group\" id=\"row-reports_webhook\">\n" +
+    "                            <div ng-if=\"$ctrl.graphType.selected == 'metrics_graphs'\">\n" +
+    "                                <c3chart data-domid=\"metrics_chart\" data-data=\"$ctrl.metricsChartData\" data-config=\"$ctrl.metricsChartConfig\" update=\"true\">\n" +
+    "                                </c3chart>\n" +
+    "                            </div>\n" +
+    "                            <div ng-if=\"$ctrl.graphType.selected == 'report_graphs'\">\n" +
+    "                                <c3chart data-domid=\"reports_chart\" data-data=\"$ctrl.reportChartData\" data-config=\"$ctrl.reportChartConfig\" update=\"true\">\n" +
+    "                                </c3chart>\n" +
+    "                            </div>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
-    "                    Reports webhook <span class=\"required\">*</span>\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.reports_webhook\"></data-form-errors>\n" +
-    "                    <input class=\"form-control\" id=\"reports_webhook\" name=\"reports_webhook\" type=\"text\" ng-model=\"$ctrl.config.reports_webhook\">\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "            <div class=\"form-group\" id=\"row-alerts_webhook\">\n" +
+    "                            <div ng-if=\"$ctrl.graphType.selected == 'slow_report_graphs'\">\n" +
+    "                                <c3chart data-domid=\"slow_reports_chart\" data-data=\"$ctrl.reportSlowChartData\" data-config=\"$ctrl.reportSlowChartConfig\" update=\"true\">\n" +
+    "                                </c3chart>\n" +
+    "                            </div>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
-    "                    Alerts webhook <span class=\"required\">*</span>\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.alerts_webhook\"></data-form-errors>\n" +
-    "                    <input class=\"form-control StringField None\" id=\"alerts_webhook\" name=\"alerts_webhook\" type=\"text\" ng-model=\"$ctrl.config.alerts_webhook\">\n" +
-    "                </div>\n" +
+    "                            <p ng-if=\"$ctrl.graphType.selected == 'requests_graphs'\" class=\"text-center\">\n" +
+    "                                <small>Average requests per second from all servers</small>\n" +
+    "                            </p>\n" +
     "\n" +
+    "                            <p ng-if=\"$ctrl.graphType.selected == 'response_graphs'\" class=\"text-center\">\n" +
+    "                                <small>Average response time from all servers</small>\n" +
+    "                            </p>\n" +
     "\n" +
-    "            </div>\n" +
-    "            <div class=\"form-group\" id=\"row-submit\">\n" +
+    "                            <p ng-if=\"$ctrl.graphType.selected == 'metrics_graphs'\" class=\"text-center\">\n" +
+    "                                <small>Aggregated average time spent per request - broken to layers</small>\n" +
+    "                            </p>\n" +
     "\n" +
-    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Setup webhooks\">\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
+    "                            <p ng-if=\"$ctrl.graphType.selected == 'report_graphs'\" class=\"text-center\">\n" +
+    "                                <small>Aggregated reports sent by your application</small>\n" +
+    "                            </p>\n" +
+    "\n" +
+    "                            <p ng-if=\"$ctrl.graphType.selected == 'slow_report_graphs'\" class=\"text-center\">\n" +
+    "                                <small>Aggregated slow reports sent by your application</small>\n" +
+    "                            </p>\n" +
+    "                            </div>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
     "                </div>\n" +
-    "            </div>\n" +
-    "        </form>\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/logs-browser/logs-browser.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.isLoading.logs\"></ng-include>\n" +
     "\n" +
-    "<div ng-if=\"$ctrl.isLoading.logs === false\">\n" +
     "\n" +
-    "    <p class=\"search-params\">\n" +
-    "        <strong>Search params:</strong>\n" +
-    "        <span ng-repeat=\"tag in $ctrl.searchParams.tags\" class=\"tag\">\n" +
-    "            <strong>{{tag.type}}</strong>\n" +
-    "            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}\n" +
+    "                <div class=\"col-sm-6\">\n" +
     "\n" +
-    "            <a ng-click=\"$ctrl.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
-    "        </span>\n" +
-    "    </p>\n" +
+    "                    <div id=\"server-container\">\n" +
     "\n" +
-    "    <p>\n" +
+    "                        <div ng-if=\"$ctrl.loading.apdex==false\" class=\"text-center m-b-1\">\n" +
     "\n" +
-    "        <script type=\"text/ng-template\" id=\"SearchTypeAheadUrl.html\">\n" +
+    "                            <a data-ui-sref=\"report.list({resource:$ctrl.resource, start_date:$ctrl.startDateFilter})\" class=\"combined-stat text-center\" id=\"error-rate\">\n" +
+    "                                <small>Exceptions</small>\n" +
+    "                                <br/>\n" +
+    "                                <strong>{{ $ctrl.exceptions|numberToThousands}}</strong>\n" +
+    "                                <span class=\"fa fa-chevron-right\"></span>\n" +
+    "                            </a><!--\n" +
     "\n" +
-    "        </script>\n" +
+    "                    --><a data-ui-sref=\"report.list_slow({resource:$ctrl.resource, min_duration:4, start_date:$ctrl.startDateFilter})\" class=\"combined-stat text-center\" id=\"frustrating-requests\" data-uib-tooltip=\"Requests over 4s\">\n" +
+    "                            <small>Frustrating req.</small>\n" +
+    "                            <br/>\n" +
+    "                            <strong>{{$ctrl.frustratingRequests|numberToThousands}}</strong>\n" +
+    "                            <span class=\"fa fa-chevron-right\"></span>\n" +
+    "                        </a><!--\n" +
     "\n" +
-    "    <form class=\"form\">\n" +
-    "        <div class=\"typeahead-tags\">\n" +
-    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"$ctrl.filterTypeAhead\" placeholder=\"Start typing to filter logs for events, filter by servers, namespaces, levels.\"\n" +
-    "                   ng-keydown=\"$ctrl.typeAheadTag($event)\"\n" +
-    "                   uib-typeahead=\"tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:$ctrl.aheadFilter\"\n" +
-    "                   typeahead-min-length=\"1\" class=\"form-control\"\n" +
-    "                   typeahead-template-url=\"templates/directives/search_type_ahead.html\">\n" +
-    "        </div>\n" +
-    "    </form>\n" +
+    "                     --><a data-ui-sref=\"report.list_slow({resource:$ctrl.resource, min_duration:1, max_duration:4, start_date:$ctrl.startDateFilter})\" class=\"combined-stat text-center\" id=\"tolerated-requests\"\n" +
+    "                           data-uib-tooltip=\"Requests under 4s\">\n" +
+    "                            <small>Tolerated req.</small>\n" +
+    "                            <br/>\n" +
+    "                            <strong>{{$ctrl.toleratedRequests|numberToThousands}}</strong>\n" +
+    "                            <span class=\"fa fa-chevron-right\"></span>\n" +
+    "                        </a><!--\n" +
+    "                        \n" +
+    "                        --><a class=\"combined-stat text-center\" id=\"satisfying-requests\" data-uib-tooltip=\"Requests under 1s\">\n" +
+    "                            <small>Satisfying req.</small>\n" +
+    "                            <br/>\n" +
+    "                            <strong>{{$ctrl.satisfyingRequests|numberToThousands}}</strong>\n" +
+    "                        </a><!--\n" +
     "\n" +
-    "    <div class=\"well animate-show position-absolute increse-zindex\" ng-if=\"$ctrl.showDatePicker\" ng-model=\"$ctrl.pickerDate\" ng-change=\"$ctrl.pickerDateChanged()\">\n" +
-    "        <uib-datepicker></uib-datepicker>\n" +
-    "    </div>\n" +
+    "                    --><a data-ui-sref=\"uptime({resource:$ctrl.resource})\" class=\"combined-stat text-center\" id=\"uptime-stats\" data-uib-tooltip=\"Uptime\">\n" +
+    "                            <small>Uptime</small>\n" +
+    "                            <br/>\n" +
+    "                            <strong>{{$ctrl.uptimeStats}}%</strong>\n" +
+    "                            <span class=\"fa fa-chevron-right\"></span>\n" +
+    "                        </a>\n" +
     "\n" +
-    "    </p>\n" +
+    "                            <div class=\"clearfix\"></div>\n" +
+    "                        </div>\n" +
     "\n" +
-    "    <div class=\"panel\">\n" +
+    "                        <div id=\"apdex-rate\" class=\"m-b-1 panel panel-default\">\n" +
+    "                            <table class=\"servers table table-striped\">\n" +
+    "                                <thead>\n" +
+    "                                <tr>\n" +
+    "                                    <th></th>\n" +
+    "                                    <th>Server</th>\n" +
+    "                                    <th>Apdex\n" +
+    "                                <span class=\"fa fa-question-circle\"\n" +
+    "                                      data-uib-tooltip=\"Application Performance Index - measures viewer satisfaction based on response times and error rates\"></span>\n" +
+    "                                    </th>\n" +
+    "                                    <th>rpm</th>\n" +
+    "                                    <th>avg. response</th>\n" +
+    "                                </tr>\n" +
+    "                                </thead>\n" +
+    "                                <tbody>\n" +
+    "                                <tr ng-if=\"$ctrl.loading.apdex!=false\" class=\"text-center\">\n" +
+    "                                    <td colspan=\"5\"><span class=\"fa fa-cog fa-spin fa-5x loader\"></span></td>\n" +
+    "                                </tr>\n" +
+    "                                <tr ng-repeat=\"server in $ctrl.apdexStats\" class=\"{{ server | apdexValue }}\"\n" +
+    "                                    ng-if=\"$ctrl.loading.apdex==false\">\n" +
+    "                                    <td><span class=\"fa fa-hdd-o\"></span></td>\n" +
+    "                                    <td>\n" +
+    "                                        <small><strong>{{ server.name }}</strong></small>\n" +
+    "                                    </td>\n" +
+    "                                    <td class=\"apdex\">\n" +
+    "                                        <small><strong>{{ server.apdex }} %</strong></small>\n" +
+    "                                    </td>\n" +
+    "                                    <td>\n" +
+    "                                        <small><strong>{{ server.rpm }}rpm</strong></small>\n" +
+    "                                    </td>\n" +
+    "                                    <td>\n" +
+    "                                        <small><strong>{{ server.avg_response_time }}s</strong></small>\n" +
+    "                                    </td>\n" +
+    "                                </tr>\n" +
+    "                                </tbody>\n" +
+    "                            </table>\n" +
     "\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <c3chart data-domid=\"log_events_chart\" data-data=\"$ctrl.logEventsChartData\" data-config=\"$ctrl.logEventsChartConfig\">\n" +
-    "            </c3chart>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
     "\n" +
+    "                </div>\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
-    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"></uib-pagination>\n" +
-    "    </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
+    "            </div>\n" +
     "\n" +
-    "        <table class=\"table table-striped log-list\">\n" +
-    "            <caption>Logs</caption>\n" +
-    "            <thead>\n" +
-    "            <tr>\n" +
-    "                <th class=\"c1 resource\">Application</th>\n" +
-    "                <th class=\"c2 message\">Message</th>\n" +
-    "                <th class=\"c3 when\">When</th>\n" +
-    "            </tr>\n" +
-    "            </thead>\n" +
-    "            <tbody>\n" +
-    "            <tr ng-repeat=\"log in $ctrl.logsPage track by log.log_id\" class=\"{{$odd ? 'odd' : 'even'}}\">\n" +
-    "                <td class=\"c1\">\n" +
-    "                    <a class=\"tag application\" ng-click=\"$ctrl.addSearchTag({type:'resource', value:log.resource_id})\">\n" +
-    "                        <span class=\"name\">{{log.resource_name}}</span></a>\n" +
-    "                </td>\n" +
-    "                <td class=\"c2\">\n" +
-    "                    <a class=\"tag {{log.log_level|lowercase}}\" ng-click=\"$ctrl.addSearchTag({type:'level', value:log.log_level})\">\n" +
-    "                        <span class=\"name\">level:</span> {{log.log_level}}</a>\n" +
-    "                    <a class=\"tag\" ng-click=\"$ctrl.addSearchTag({type:'namespace', value:log.namespace})\">\n" +
-    "                        <span class=\"name\">namespace:</span> {{log.namespace}}</a>\n" +
-    "                    <a ng-repeat=\"(tag, value) in log.tags\" class=\"tag\" ng-click=\"$ctrl.addSearchTag({type:tag, value:value})\">\n" +
-    "                        <span class=\"name\">{{tag}}:</span> {{value}}</a>\n" +
-    "                    <div class=\"log\">{{log.message}}</div>\n" +
-    "                </td>\n" +
-    "                <td class=\"c3 when\">\n" +
-    "                    <a ng-click=\"$ctrl.filterId(log)\" data-uib-tooltip=\"{{log.timestamp}}\">\n" +
-    "                        <iso-to-relative-time time=\"{{log.timestamp}}\"/>\n" +
-    "                    </a>\n" +
-    "                </td>\n" +
-    "            </tr>\n" +
+    "            <div class=\"row\">\n" +
+    "                <div class=\"col-sm-6\">\n" +
     "\n" +
-    "            </tbody>\n" +
-    "        </table>\n" +
+    "                    <div class=\"panel panel-default\">\n" +
+    "                        <div class=\"panel-heading position-relative\">\n" +
+    "                            <h3 class=\"panel-title\"><span class=\"fa fa-exclamation-triangle\"></span> Newest errors (real-time)\n" +
+    "                            </h3>\n" +
+    "                            <a tooltip-append-to-body=\"true\" data-uib-tooltip=\"Play/Pause stream\" class=\"btn btn-primary btn-sm pause_stream\" ng-model=\"$ctrl.stream.paused\" uib-btn-checkbox>\n" +
+    "                                <span class=\"fa {{stream.paused ? 'fa-play' : 'fa-pause'}}\"></span>\n" +
+    "                            </a>\n" +
+    "                            <a tooltip-append-to-body=\"true\" data-uib-tooltip=\"Limit reports to current application\" class=\"btn btn-primary btn-sm limit_stream\" ng-model=\"$ctrl.stream.filtered\" uib-btn-checkbox>\n" +
+    "                                <span class=\"fa fa-lock\"></span>\n" +
+    "                            </a>\n" +
     "\n" +
-    "    </div>\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
-    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"></uib-pagination>\n" +
-    "    </div>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"panel-body\">\n" +
     "\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/report-view/report-view.html',
-    "<script type=\"text/ng-template\" id=\"slow_call.html\">\n" +
-    "    <table class=\"report-table\">\n" +
-    "        <tr>\n" +
-    "            <td class=\"table-label\">Type</td>\n" +
-    "            <td class=\"data\"><strong>{{call.type}}\n" +
-    "                ({{call.subtype}})\n" +
-    "            </strong></td>\n" +
-    "        </tr>\n" +
-    "        <tr>\n" +
-    "            <td class=\"table-label\">Duration</td>\n" +
-    "            <td class=\"data\"><strong class=\"textColor_1\">{{call.duration}}</strong></td>\n" +
-    "        </tr>\n" +
-    "        <tr>\n" +
-    "            <td class=\"table-label\">Start Time</td>\n" +
-    "            <td class=\"data\">{{call.timestamp}}</td>\n" +
-    "        </tr>\n" +
-    "        <tr>\n" +
-    "            <td class=\"table-label\">Statement</td>\n" +
-    "            <td class=\"data\">\n" +
-    "                <pre class=\"word-wrap\">{{call.statement}}</pre>\n" +
-    "            </td>\n" +
-    "        </tr>\n" +
-    "        <tr ng-if=\"call.location\">\n" +
-    "            <td class=\"table-label\">Location</td>\n" +
-    "            <td class=\"data\">{{call.location}}</td>\n" +
-    "        </tr>\n" +
-    "        <tr>\n" +
-    "            <td class=\"table-label\">Parameters</td>\n" +
-    "            <td class=\"\">\n" +
-    "                <div class=\"var-listing\" human-format vars=\"call.parameters\"></div>\n" +
-    "            </td>\n" +
-    "        </tr>\n" +
-    "    </table>\n" +
+    "                            <p ng-if=\"$ctrl.stream.reports.length === 0\">No new reports</p>\n" +
     "\n" +
-    "    <div ng-if=\"call.children.length > 0\" class=\"subcalls p-l-8\">\n" +
+    "                            <div small-report-list reports=\"$ctrl.stream.reports\" applications=\"$ctrl.applications\"></div>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "        <p><strong>\n" +
-    "            <small>Sub-calls</small>\n" +
-    "        </strong></p>\n" +
+    "                <div class=\"col-sm-6\">\n" +
     "\n" +
-    "        <div class=\"panel panel-default\">\n" +
-    "            <div ng-repeat=\"call in call.children\" ng-include=\"'slow_call.html'\" class=\"panel-body\"/>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
-    "    </div>\n" +
+    "                    <div class=\"panel panel-default\">\n" +
+    "                        <div class=\"panel-heading\">\n" +
+    "                            <h3 class=\"panel-title\"><span class=\"fa fa-sort-amount-desc\"></span> Request breakdown over {{ $ctrl.timeSpan.label }}</h3>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"panel-body\" id=\"view-breakdown-container\">\n" +
+    "                            <p ng-if=\"$ctrl.loading.requestsBreakdown!=false\" class=\"text-center\">\n" +
+    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
+    "                            </p>\n" +
     "\n" +
-    "</script>\n" +
+    "                            <div class=\"report-list\">\n" +
+    "                                <div ng-if=\"$ctrl.loading.requestsBreakdown==false\" ng-repeat=\"view in $ctrl.requestsBreakdown\">\n" +
+    "                                    <div class=\"view-info\">\n" +
+    "                                        <div class=\"view-name\">\n" +
+    "                                            <div class=\"bar\" style=\"width: {{view.percentage}}%\">\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <strong ng-if=\"view.latest_details.length\">\n" +
+    "                                            <a data-ui-sref=\"report.list_slow({view_name:view.view_name})\">{{view.view_name}}</a></strong>\n" +
+    "                                        <strong ng-if=\"!view.latest_details.length\">{{view.view_name}}</strong>\n" +
     "\n" +
-    "<script type=\"text/ng-template\" id=\"AssignReportCtrl.html\">\n" +
+    "                                        <div class=\"stats\">\n" +
+    "                                            <small>\n" +
+    "                                                avg. response <strong>{{view.avg_response}}s</strong> in\n" +
+    "                            <span class=\"requests\"\n" +
+    "                                  data-uib-tooltip=\"Requests\"><strong>{{view.requests|numberToThousands}}</strong> requests</span>\n" +
     "\n" +
-    "    <div class=\"modal-header\">\n" +
-    "        <h3>Assign users to report</h3>\n" +
-    "    </div>\n" +
-    "    <div class=\"modal-body\">\n" +
+    "                        <span ng-if=\"view.latest_details\">\n" +
+    "                        &nbsp;&nbsp; Latest reports:\n" +
+    "                            <a ng-repeat=\"d in view.latest_details\" target=\"_blank\" ui-sref=\"report.view_detail({groupId:d.group_id, reportId:d.report_id})\"> <strong>{{$index+1}}</strong></a>\n" +
+    "                        </span>\n" +
+    "                                            </small>\n" +
+    "                                        </div>\n" +
     "\n" +
-    "        <ng-include src=\"'templates/loader.html'\" ng-if=\"ctrl.loading\"></ng-include>\n" +
+    "                                    </div>\n" +
     "\n" +
-    "        <div class=\"row\" ng-if=\"!ctrl.loading\">\n" +
-    "            <div class=\"col-sm-6\">\n" +
-    "                <strong>Unassigned</strong>\n" +
+    "                                </div>\n" +
+    "                            </div>\n" +
     "\n" +
-    "                <div class=\"user-assignment\" ng-repeat=\"user in ctrl.unAssignedUsers\"\n" +
-    "                     ng-click=\"ctrl.reassignUser(user)\">\n" +
-    "                    <img ng-src=\"{{user.gravatar_url}}\"/>\n" +
-    "                    <strong>{{user.user_name}}</strong><br/>\n" +
-    "                    {{user.name}}\n" +
-    "                    <div class=\"clear\"></div>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
     "\n" +
-    "            <div class=\"col-sm-6\">\n" +
-    "                <strong>Assigned</strong>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
     "\n" +
-    "                <div class=\"user-assignment\" ng-repeat=\"user in ctrl.assignedUsers\" ng-click=\"ctrl.reassignUser(user)\">\n" +
-    "                    <img ng-src=\"{{user.gravatar_url}}\"/>\n" +
-    "                    {{user.user_name}}<br/>\n" +
-    "                    {{user.name}}\n" +
-    "                    <div class=\"clear\"></div>\n" +
     "                </div>\n" +
+    "\n" +
     "            </div>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
-    "    <div class=\"modal-footer\">\n" +
-    "        <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">OK</button>\n" +
-    "        <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
-    "    </div>\n" +
-    "</script>\n" +
     "\n" +
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.is_loading.report\"></ng-include>\n" +
+    "            <div class=\"row\">\n" +
+    "                <div class=\"col-sm-6\">\n" +
     "\n" +
-    "<div ng-if=\"!$ctrl.is_loading.report && $ctrl.report === null\">\n" +
-    "    <strong>OOPS something went wrong :(</strong>\n" +
-    "</div>\n" +
+    "                    <div class=\"panel panel-default\">\n" +
+    "                        <div class=\"panel-heading\">\n" +
+    "                            <h3 class=\"panel-title\">\n" +
+    "                                <span class=\"fa fa-exclamation-triangle\"></span> Report groups trending over {{ $ctrl.timeSpan.label }}\n" +
+    "                            </h3>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"panel-body\">\n" +
+    "                            <p ng-if=\"$ctrl.loading.reports != false\" class=\"text-center\">\n" +
+    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
+    "                            </p>\n" +
     "\n" +
-    "<div ng-if=\"$ctrl.report !== null && !$ctrl.is_loading.report\">\n" +
+    "                            <p ng-if=\"$ctrl.trendingReports.length == 0 && $ctrl.loading.reports == false\">\n" +
+    "                                No reports found\n" +
+    "                            </p>\n" +
     "\n" +
-    "    <div ng-if=\"$ctrl.stateHolder.AeUser.id\" class=\"row\">\n" +
-    "      <div class=\"col-lg-12\">\n" +
-    "        <a onclick=\"window.history.back()\" class=\"btn btn-default\" ng-if=\"$ctrl.window.history.length > 2\"><span class=\"fa fa-arrow-circle-o-left\"></span>\n" +
-    "            Go back</a>\n" +
-    "        <a class=\"btn btn-default\" ng-click=\"$ctrl.assignUsersModal()\" ng-if=\"$ctrl.reportType == 'report'\"><span\n" +
-    "                class=\"fa fa-flag\"></span> Assign report\n" +
-    "            to user</a>\n" +
+    "                            <div small-report-group-list groups=\"$ctrl.trendingReports\" applications=\"$ctrl.applications\" ng-if=\"$ctrl.loading.reports==false\"></div>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
     "\n" +
-    "        <a class=\"btn {{ $ctrl.report.group.fixed ? 'btn-success' : 'btn-default'}}\" ng-click=\"$ctrl.markFixed()\"\n" +
-    "           ng-if=\"$ctrl.reportType == 'report'\">\n" +
-    "            <span class=\"fa fa-check\"></span> Mark fixed</a>\n" +
+    "                </div>\n" +
     "\n" +
-    "        <span class=\"dropdown\" ng-if=\"$ctrl.report.application.integrations.length\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "          <a class=\"dropdown-toggle btn btn-default\" data-uib-dropdown-toggle>\n" +
-    "              <span class=\"fa fa-send\"></span> Integrations\n" +
-    "          </a>\n" +
-    "          <ul class=\"dropdown-menu\">\n" +
-    "              <li ng-repeat=\"choice in $ctrl.report.application.integrations\">\n" +
-    "                  <a ng-click=\"$ctrl.runIntegration(choice.name)\">{{choice.action}}</a>\n" +
-    "              </li>\n" +
-    "          </ul>\n" +
-    "        </span>\n" +
+    "                <div class=\"col-sm-6\">\n" +
     "\n" +
-    "        <a class=\"btn btn-default\" ng-click=\"$ctrl.markPublic()\">Make {{$ctrl.group.public ? 'private' : 'public'}}</a>\n" +
     "\n" +
-    "<span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "    <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Delete</a>\n" +
-    "  <ul class=\"dropdown-menu\">\n" +
-    "      <li><a>No</a></li>\n" +
-    "      <li><a ng-click=\"$ctrl.delete()\">Yes</a></li>\n" +
-    "  </ul>\n" +
-    "</span>\n" +
-    "      </div>\n" +
-    "    </div>\n" +
+    "                    <div class=\"panel panel-default\">\n" +
+    "                        <div class=\"panel-heading\">\n" +
+    "                            <h3 class=\"panel-title\">\n" +
+    "                                Most common slow calls over {{ $ctrl.timeSpan.label }}\n" +
+    "                            </h3>\n" +
+    "                        </div>\n" +
+    "                        <div class=\"panel-body\">\n" +
     "\n" +
-    "    <div class=\"row\">\n" +
-    "        <div class=\"col-lg-4\">\n" +
+    "                            <div ng-if=\"$ctrl.loading.slowCalls!=false\" class=\"text-center\">\n" +
+    "                                <span class=\"fa fa-cog fa-spin fa-5x loader\"></span>\n" +
+    "                            </div>\n" +
     "\n" +
-    "            <div class=\"panel panel-default m-t-1\">\n" +
-    "                <div class=\"panel-body\">\n" +
-    "\n" +
-    "                    <h3 class=\"m-t-0\">Report Information</h3>\n" +
-    "\n" +
-    "                    <table class=\"report-table with-ellipsis\">\n" +
-    "                        <tr>\n" +
-    "                            <td class=\"table-label\">Occurences</td>\n" +
-    "                            <td class=\"data\">{{$ctrl.report.group.occurences}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"$ctrl.report.http_status\">\n" +
-    "                            <td class=\"table-label\">HTTP status</td>\n" +
-    "                            <td class=\"data\">{{$ctrl.report.http_status}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"$ctrl.report.group.priority\">\n" +
-    "                            <td class=\"table-label\">Priority</td>\n" +
-    "                            <td class=\"data\">{{$ctrl.report.group.priority}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"$ctrl.report.group.public\">\n" +
-    "                            <td class=\"table-label\">Public URL</td>\n" +
-    "                            <td class=\"data\">\n" +
-    "                                <form>\n" +
-    "                                    <textarea class=\"TextAreaField form-control\" id=\"public-url\" onclick=\"this.select()\">{{$ctrl.$state.href($ctrl.$state.current.name, $ctrl.$state.params, {absolute: true})}}</textarea>\n" +
-    "                                </form>\n" +
-    "                            </td>\n" +
-    "                        </tr>\n" +
-    "                        <tr data-uib-tooltip=\"{{$ctrl.report.url}}\">\n" +
-    "                            <td class=\"table-label\">URL</td>\n" +
-    "                            <td class=\"data ellipsis\"><a href=\"{{$ctrl.report.url}}\">{{$ctrl.report.url}}</a></td>\n" +
-    "                        </tr>\n" +
-    "\n" +
-    "                        <tr ng-if=\"$ctrl.report.ip\">\n" +
-    "                            <td class=\"table-label\">Remote IP</td>\n" +
-    "                            <td class=\"data\">{{$ctrl.report.ip}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"$ctrl.report.user_agent\" data-uib-tooltip=\"{{$ctrl.report.user_agent}}\">\n" +
-    "                            <td class=\"table-label\">User Agent</td>\n" +
-    "                            <td class=\"data ellipsis\">{{$ctrl.report.user_agent}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"$ctrl.report.message\">\n" +
-    "                            <td class=\"table-label\">Message</td>\n" +
-    "                            <td class=\"data\">{{$ctrl.report.message}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"$ctrl.report.duration > 0\">\n" +
-    "                            <td class=\"table-label\">Duration</td>\n" +
-    "                            <td class=\"data\">\n" +
-    "                                <span>{{$ctrl.report.duration}}s</span>\n" +
-    "                            </td>\n" +
-    "                        </tr>\n" +
-    "                        <tr>\n" +
-    "                            <td class=\"table-label\">First occured</td>\n" +
-    "                            <td class=\"data\">\n" +
-    "                <span uib-tooltip=\"{{$ctrl.report.group.first_timestamp}}\"><iso-to-relative-time\n" +
-    "                        time=\"{{$ctrl.report.group.first_timestamp}}\"/></span>\n" +
-    "                            </td>\n" +
-    "                        </tr>\n" +
-    "                        <tr>\n" +
-    "                            <td class=\"table-label\">Last occured</td>\n" +
-    "                            <td class=\"data\">\n" +
-    "                <span uib-tooltip=\"{{$ctrl.report.group.last_timestamp}}\"><iso-to-relative-time\n" +
-    "                        time=\"{{$ctrl.report.group.last_timestamp}}\"/></span>\n" +
-    "                            </td>\n" +
-    "                        </tr>\n" +
-    "                    </table>\n" +
-    "\n" +
-    "                    <div ng-if=\"$ctrl.requestStats\">\n" +
-    "                        <h3>Performance stats</h3>\n" +
+    "                            <table id=\"slow-statements\" ng-if=\"$ctrl.loading.slowCalls==false\">\n" +
+    "                                <tbody>\n" +
+    "                                <tr ng-repeat=\"call in $ctrl.slowCalls\">\n" +
+    "                                    <td class=\"occurences\">\n" +
+    "                                        <span class=\"occurences\" data-uib-tooltip=\"Occurences\">{{call.occurences|numberToThousands}}</span>\n" +
+    "                                    </td>\n" +
+    "                                    <td class=\"ellipsis\">\n" +
+    "                                        <small title=\"{{call.statement}}\" class=\"statement\">{{call.statement}}</small>\n" +
+    "                                        <br/>\n" +
+    "                                        <span class=\"type\">{{call.statement_type}}</span>\n" +
+    "                                        <span class=\"subtype\">{{call.statement_subtype}}</span>\n" +
+    "                                        <span class=\"duration\" data-uib-tooltip=\"Average duration\">{{call.total_duration/call.occurences|round:2}}s</span>\n" +
+    "                        <span class=\"report-list\">\n" +
+    "                        Latest reports:\n" +
+    "                        <a ng-repeat=\"d in call.latest_details\" target=\"_blank\" ui-sref=\"report.view_detail({groupId:d.group_id, reportId:d.report_id})\"> <strong>{{$index+1}}</strong> </a>\n" +
+    "                        </span>\n" +
+    "                                    </td>\n" +
+    "                                </tr>\n" +
+    "                                </tbody>\n" +
+    "                            </table>\n" +
     "\n" +
-    "                        <div class=\"perf_stats\">\n" +
-    "                                <span class=\"stat\" ng-repeat=\"stat in $ctrl.requestStats\"\n" +
-    "                                      ng-if=\"stat.calls > 0 || stat.value > 0\"><strong>\n" +
-    "                                    <span class=\"{{stat.name}} bar\" style=\"width:10px\"></span> {{stat.calls}}\n" +
-    "                                    <span ng-if=\"stat.name!='main'\"><small>{{stat.name}} calls</small></span>\n" +
-    "                                    <span ng-if=\"stat.name=='main'\">\n" +
-    "                                        <span class=\"fa fa-question-circle\"\n" +
-    "                                              data-uib-tooltip=\"Execution time that didnt get assigned to other layers\"></span> Other</span>\n" +
-    "                                </strong>\n" +
-    "                                </span>\n" +
     "\n" +
-    "                            <div style=\"width: 100%; overflow:hidden\">\n" +
-    "                                <div class=\"{{stat.name}} bar\" style=\"width:{{stat.percent}}%; height: 25px\"\n" +
-    "                                     ng-repeat=\"stat in $ctrl.requestStats\"\n" +
-    "                                     data-uib-tooltip=\"{{stat.value}}s - Cumulative time spent in this request on all {{ stat.name }} calls\"></div>\n" +
-    "                                <div class=\"row\">\n" +
-    "                                    <div class=\"col-xs-6 text-left\">\n" +
-    "                                        <small>0s</small>\n" +
-    "                                    </div>\n" +
-    "                                    <div class=\"col-xs-6 text-right\">\n" +
-    "                                        <small>{{$ctrl.report.duration.toFixed(3)}}s</small>\n" +
-    "                                    </div>\n" +
-    "                                </div>\n" +
-    "                            </div>\n" +
     "                        </div>\n" +
     "                    </div>\n" +
     "\n" +
-    "                    <h3>Tags</h3>\n" +
-    "\n" +
-    "                    <table class=\"report-table with-tags\">\n" +
-    "                        <tr ng-repeat=\"(tag, value) in $ctrl.report.tags\">\n" +
-    "                            <td class=\"table-label\" ng-switch=\"tag\"><!--\n" +
-    "                        --><span ng-switch-when=\"user_name\">Username/UID</span><!--\n" +
-    "                        --><span ng-switch-when=\"view_name\">View Name</span><!--\n" +
-    "                        --><span ng-switch-when=\"server_name\">Server Name</span><!--\n" +
-    "                        --><span ng-switch-default>{{ tag }}</span>\n" +
-    "                            </td>\n" +
-    "                            <td class=\"data\"><a ng-click=\"$ctrl.searchTag(tag, value)\">{{ value }}</td>\n" +
-    "                        </tr>\n" +
-    "                    </table>\n" +
     "\n" +
     "                </div>\n" +
+    "\n" +
     "            </div>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/integrations/bitbucket-integration-config-view/bitbucket-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "        </div>\n" +
-    "        <div class=\"col-lg-8\">\n" +
-    "            <div class=\"frames\">\n" +
-    "                <p class=\"text-center\">Report history</p>\n" +
+    "        <h1>Bitbucket Integration</h1>\n" +
     "\n" +
-    "                <div class=\"panel\" ng-if=\"!$ctrl.is_loading.history\">\n" +
-    "                    <div class=\"panel-body\">\n" +
-    "                        <c3chart data-domid=\"report_history_chart\" data-data=\"$ctrl.reportHistoryData\" data-config=\"$ctrl.reportHistoryConfig\">\n" +
-    "                        </c3chart>\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "                <div class=\"row m-b-1\">\n" +
-    "                    <div class=\"col-sm-2 text-left\">\n" +
-    "                        <a class=\"switch_detail btn btn-sm btn-default {{$ctrl.report.group.previous_report ? '' : 'disabled'}}\"\n" +
-    "                           ng-click=\"$ctrl.previousDetail()\">\n" +
-    "                            <span class=\"fa fa-arrow-left\"></span>\n" +
-    "                            Prev. detail</a>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">Repository</label>\n" +
     "\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.repo_name\"></data-form-errors>\n" +
+    "\n" +
+    "                    <div class=\"input-group\">\n" +
+    "                        <div class=\"input-group-addon\">https://bitbucket.org/</div>\n" +
+    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.user_name\" placeholder=\"user\" type=\"text\">\n" +
+    "                        <div class=\"input-group-addon\">/</div>\n" +
+    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.repo_name\" placeholder=\"repo_name\" type=\"text\">\n" +
     "                    </div>\n" +
-    "                    <div class=\"col-sm-8 text-center\">\n" +
-    "                        <small>\n" +
-    "       <span uib-tooltip=\"{{$ctrl.report.start_time|isoToRelativeTime}}\" class=\"m-r-1\">\n" +
-    "           {{$ctrl.report.start_time.replace('T', ' ')}} UTC</span>\n" +
-    "                            <span class=\"text-muted\">ID: {{$ctrl.report.request_id}}</span>\n" +
-    "                        </small>\n" +
-    "                    </div>\n" +
-    "                    <div class=\"col-sm-2 text-right\">\n" +
-    "                        <a class=\"switch_detail btn btn-sm btn-default {{$ctrl.report.group.next_report ? '' : 'disabled'}}\"\n" +
-    "                           ng-click=\"$ctrl.nextDetail()\">\n" +
-    "                            Next detail <span class=\"fa fa-arrow-right\"></span></a>\n" +
-    "                    </div>\n" +
+    "\n" +
     "                </div>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "                <h3 class=\"word-wrap\">{{$ctrl.report.error}}</h3>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
     "\n" +
-    "                <div ng-if=\"$ctrl.report.traceback\">\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input type=\"submit\" class=\"btn btn-primary\" value=\"Use this repo\">\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </form>\n" +
     "\n" +
-    "                    <h3><strong>Traceback</strong></h3>\n" +
+    "        <p class=\"m-t-1\">Remember you first need to\n" +
+    "            <strong>\n" +
+    "                <a data-ui-sref=\"user.profile.identities\">authorize your user account</a></strong>\n" +
+    "            with Bitbucket before we can send issues on your behalf.</p>\n" +
     "\n" +
-    "                    <div class=\"btn-group\">\n" +
-    "                        <a ng-if=\"$ctrl.traceback.length-10 > 0 \" ng-click=\"$ctrl.showLong = !$ctrl.showLong\"\n" +
-    "                           class=\"btn btn-default {{$ctrl.showLong ? 'active' : ''}}\">\n" +
-    "                            <span class=\"fa fa-align-left\"></span>\n" +
-    "                            <small>Show {{$ctrl.traceback.length-10}} remaining frames</small>\n" +
-    "                        </a>\n" +
+    "        <p>Every user will have to authorize AppEnlight to access Bitbucket to be able to post issues.</p>\n" +
     "\n" +
-    "                        <a class=\"btn btn-default {{$ctrl.showRaw ? 'active' : ''}}\" ng-click=\"$ctrl.showRaw = !$ctrl.showRaw\">\n" +
-    "                            <span class=\"fa fa-list\"></span>\n" +
-    "                            <small>Raw version</small>\n" +
-    "                        </a>\n" +
-    "                    </div>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/integrations/campfire-integration-config-view/campfire-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
-    "                    <div ng-if=\"$ctrl.showRaw\" class=\"m-t-1\">\n" +
-    "                        <pre>{{$ctrl.rawTraceback}}</pre>\n" +
-    "                    </div>\n" +
-    "                    <div ng-if=\"!$ctrl.showRaw\" class=\"m-t-1\">\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
+    "        <h1>Campfire Integration</h1>\n" +
     "\n" +
-    "                        <div ng-repeat=\"frame in $ctrl.traceback\" class=\"frame {{$odd ? 'odd' : 'even'}}\"\n" +
-    "                             ng-if=\"$index >= $ctrl.traceback.length-10 || $ctrl.traceback.length <= 10 || $ctrl.showLong\">\n" +
-    "                            <div class=\"frameline\" ng-if=\"frame.line\">\n" +
-    "                                <a class=\"inspect_vars\" ng-click=\"frame.showVars = !frame.showVars\" ng-if=\"frame.vars\">\n" +
-    "                            <span class=\"fa fa-search dim btn btn-default\"\n" +
-    "                                  uib-tooltip=\"Show local vars\"> </span>\n" +
-    "                                </a>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
     "\n" +
-    "                                <span class=\"no-vars\" ng-if=\"frame.vars.length == 0\"></span>\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "                <span ng-if=\"frame.file\">\n" +
-    "                <span class=\"mono\">File</span> <span class=\"file mono\">{{frame.file || 'Unknown file'}}</span>,\n" +
-    "                </span>\n" +
-    "                <span ng-if=\"frame.module && !frame.file\">\n" +
-    "                <span class=\"mono\">Module</span> <span class=\"file mono\">{{frame.module || 'Unknown module'}}</span>,\n" +
-    "                </span>\n" +
-    "                                <span class=\"mono\">line</span> <span class=\"line mono\">{{frame.line || 'Unknown line'}}</span>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">Account name</label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
     "\n" +
-    "                <span ng-if=\"frame.fn\"><span class=\"mono\">in</span> <strong\n" +
-    "                        class=\"fn mono\">{{frame.fn || 'Unknown function'}}</strong></span>\n" +
+    "                    <div class=\"input-group\">\n" +
+    "                        <div class=\"input-group-addon\">http://</div>\n" +
+    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.account\" placeholder=\"account\">\n" +
+    "                        <div class=\"input-group-addon\">.campfirenow.com</div>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "                            </div>\n" +
-    "                            <div class=\"cline mono\" ng-if=\"frame.cline\">{{frame.cline || 'Unknown context'}}</div>\n" +
-    "\n" +
-    "                            <div class=\"vars\" ng-if=\"frame.showVars\">\n" +
-    "                                <table class=\"var-listing small\">\n" +
-    "                                    <tr ng-repeat=\"fvar in frame.vars track by $index\" class=\"frame {{$odd ? 'odd' : 'even'}}\">\n" +
-    "                                        <td class=\"var-label\">{{ fvar[0] }}</td>\n" +
-    "                                        <td>\n" +
-    "                                            <span human-format vars=\"fvar[1]\"></span>\n" +
-    "                                        </td>\n" +
-    "                                    </tr>\n" +
-    "                                </table>\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">API Token</label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.api_token\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.api_token\" placeholder=\"Your API token\">\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "                            </div>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">Room ID list</label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.rooms\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.rooms\" placeholder=\"Room ID list\">\n" +
+    "                    <p>\n" +
+    "                        <small>Room ID list separated by comma</small>\n" +
+    "                    </p>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <input type=\"submit\" class=\"btn btn-primary\" value=\"Connect to Campfire\">\n" +
     "\n" +
+    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                        <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
+    "                      <ul class=\"dropdown-menu\">\n" +
+    "                          <li><a>No</a></li>\n" +
+    "                          <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
+    "                      </ul>\n" +
+    "                    </span>\n" +
     "\n" +
+    "                <div class=\"btn-group\" uib-dropdown>\n" +
+    "                    <button id=\"single-button\" type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
+    "                        Test integration <span class=\"caret\"></span>\n" +
+    "                    </button>\n" +
+    "                    <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
+    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
+    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
+    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
+    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
+    "                        <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
+    "                    </ul>\n" +
     "                </div>\n" +
     "\n" +
+    "            </div>\n" +
     "\n" +
-    "                <uib-tabset>\n" +
-    "                    <uib-tab select=\"$ctrl.selectedTab('slow_calls')\" active=\"$ctrl.tabs.slow_calls\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Slow Calls\n" +
-    "                        </uib-tab-heading>\n" +
+    "        </form>\n" +
     "\n" +
-    "                        <h3><strong>Slow Calls</strong></h3>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/integrations/flowdock-integration-config-view/flowdock-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
-    "                        <div ng-if=\"$ctrl.report.slow_calls.length > 0\">\n" +
-    "                            <div ng-repeat=\"call in $ctrl.report.slow_calls\" ng-include=\"'slow_call.html'\"></div>\n" +
-    "                        </div>\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "                        <div ng-if=\"$ctrl.report.slow_calls.length == 0\">\n" +
-    "                            No slow calls reported\n" +
-    "                        </div>\n" +
+    "        <h1>Flowdock Integration</h1>\n" +
     "\n" +
-    "                    </uib-tab>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
     "\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "                    <uib-tab select=\"$ctrl.selectedTab('request_details')\" active=\"$ctrl.tabs.request_details\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Request details\n" +
-    "                        </uib-tab-heading>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">API Token</label>\n" +
     "\n" +
-    "                        <h3><strong>Extra</strong></h3>\n" +
-    "                        <div class=\"var-listing\" human-format vars=\"$ctrl.report.extra\"></div>\n" +
-    "                        <h3><strong>Request details</strong></h3>\n" +
-    "                        <div class=\"var-listing\" human-format vars=\"$ctrl.report.request\"></div>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.api_token\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.api_token\" placeholder=\"Your API token\" type=\"text\">\n" +
+    "                </div>\n" +
     "\n" +
-    "                    </uib-tab>\n" +
     "\n" +
-    "                    <uib-tab select=\"$ctrl.selectedTab('logs')\" active=\"$ctrl.tabs.logs\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Logs\n" +
-    "                        </uib-tab-heading>\n" +
+    "            </div>\n" +
     "\n" +
-    "                        <div ng-if=\"$ctrl.is_loading.logs!=false\" class=\"text-center\">\n" +
-    "                            <span class=\"fa fa-cog fa-spin fa-3x loader\"></span>\n" +
-    "                        </div>\n" +
-    "                        <p ng-if=\"$ctrl.reportLogs.length == 0\"> No logs found</p>\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "                        <table class=\"table table-striped log-list\" ng-if=\"$ctrl.reportLogs.length > 0\">\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
     "\n" +
-    "                            <caption>Logs</caption>\n" +
-    "                            <thead>\n" +
-    "                            <tr>\n" +
-    "                                <th class=\"message\">Message</th>\n" +
-    "                                <th class=\"when\">When</th>\n" +
-    "                            </tr>\n" +
-    "                            </thead>\n" +
-    "                            <tbody>\n" +
-    "                            <tr ng-repeat=\"log in $ctrl.reportLogs track by log.log_id\">\n" +
-    "                                <td>\n" +
-    "                                    <a class=\"tag {{log.log_level|lowercase}}\">\n" +
-    "                                        <span class=\"name\">level:</span> {{log.log_level}}</a>\n" +
-    "                                    <a class=\"tag\">\n" +
-    "                                        <span class=\"name\">namespace:</span> {{log.namespace}}</a>\n" +
-    "                                    <a ng-repeat=\"(tag, value) in log.tags\" class=\"tag\">\n" +
-    "                                        <span class=\"name\">{{tag}}:</span> {{value}}</a>\n" +
-    "                                    <div class=\"log\">\n" +
-    "                                        {{log.message}}\n" +
-    "                                    </div>\n" +
-    "                                </td>\n" +
-    "                                <td class=\"when\">\n" +
-    "                                    <a data-uib-tooltip=\"{{log.timestamp}}\">\n" +
-    "                                        <iso-to-relative-time time=\"{{log.timestamp}}\"/>\n" +
-    "                                    </a>\n" +
-    "                                </td>\n" +
-    "                            </tr>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
     "\n" +
-    "                            </tbody>\n" +
-    "                        </table>\n" +
+    "                    <input type=\"submit\" class=\"btn btn-primary\" value=\"Connect to Flowdock\">\n" +
     "\n" +
-    "                    </uib-tab>\n" +
+    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                        <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
+    "                      <ul class=\"dropdown-menu\">\n" +
+    "                          <li><a>No</a></li>\n" +
+    "                          <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
+    "                      </ul>\n" +
+    "                    </span>\n" +
+    "                    <div class=\"btn-group\" uib-dropdown>\n" +
+    "                        <button id=\"single-button\" type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
+    "                            Test integration <span class=\"caret\"></span>\n" +
+    "                        </button>\n" +
+    "                        <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
+    "                        </ul>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
     "\n" +
-    "                    <uib-tab select=\"$ctrl.selectedTab('comments')\" active=\"$ctrl.tabs.comments\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Comments\n" +
-    "                            <span class=\"label label-info\">{{$ctrl.report.comments.length}}</span>\n" +
+    "        </form>\n" +
     "\n" +
-    "                        </uib-tab-heading>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/integrations/github-integration-config-view/github-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
-    "                        <h3><strong>Comments</strong></h3>\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!$ctrl.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "                        <p ng-if=\"$ctrl.report.comments.length == 0\">No comments yet - be first to add one!</p>\n" +
+    "        <h1>Github Integration</h1>\n" +
     "\n" +
-    "                        <div class=\"comment\" ng-repeat=\"comment in $ctrl.report.comments\">\n" +
-    "                            <p name=\"comment-{{comment.comment_id}}\"><span class=\"fa fa-comment\"></span>\n" +
-    "                                <strong>{{comment.user_name}}</strong>\n" +
-    "                                <iso-to-relative-time time=\"{{comment.created_timestamp}}\"/>\n" +
-    "                            </p>\n" +
-    "                            <p class=\"well\">{{comment.body}}</p>\n" +
-    "                        </div>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
     "\n" +
-    "                        <form name=\"commentForm\" ng-submit=\"$ctrl.addComment()\">\n" +
-    "                            <div class=\"form-group\">\n" +
-    "                <textarea type=\"text\" class=\"form-control\" id=\"$ctrl.commentForm\" ng-model=\"$ctrl.comment\" required\n" +
-    "                          mentio mentio-search=\"$ctrl.searchMentionedPeople(term)\" mentio-items=\"$ctrl.mentionedPeople| filter:label:typedTerm\" class=\"form-control\"></textarea>\n" +
     "\n" +
-    "                            </div>\n" +
-    "                            <div class=\"form-group\">\n" +
-    "                                <button class=\"btn btn-info\" ng-disabled=\"$ctrl.commentForm.$invalid\">Comment</button>\n" +
-    "                            </div>\n" +
-    "                        </form>\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "                        <div ng-repeat=\"comment in $ctrl.report.comments\" class=\"{{$odd ? 'odd' : 'even'}}\" class=\"repeat-animate\">\n" +
-    "                        </div>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">Repository</label>\n" +
     "\n" +
-    "                    </uib-tab>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
     "\n" +
-    "                    <uib-tab select=\"$ctrl.selectedTab('affected_users')\" active=\"$ctrl.tabs.affected_users\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Affected users\n" +
-    "                            <span class=\"label label-warning\">{{$ctrl.report.affected_users_count}}</span>\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.repo_name\"></data-form-errors>\n" +
     "\n" +
-    "                        </uib-tab-heading>\n" +
+    "                    <div class=\"input-group\">\n" +
+    "                        <div class=\"input-group-addon\">https://api.github.com/</div>\n" +
+    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.user_name\" placeholder=\"user\" type=\"text\">\n" +
+    "                        <div class=\"input-group-addon\">/</div>\n" +
+    "                        <input class=\"form-control\" ng-model=\"$ctrl.config.repo_name\" placeholder=\"repo_name\" type=\"text\">\n" +
+    "                    </div>\n" +
     "\n" +
-    "                        <h3><strong>50 most affected users ID's by this issue:</strong></h3>\n" +
-    "                        <ul class=\"affected-user-list\">\n" +
-    "                            <li ng-repeat=\"user in $ctrl.report.top_affected_users\">\n" +
-    "                                <strong>{{user.username}}</strong> <span class=\"badge\" uib-tooltip=\"occurences\">{{user.count}}</span>\n" +
-    "                            </li>\n" +
-    "                        </ul>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "                    </uib-tab>\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "                </uib-tabset>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
+    "\n" +
+    "                <input type=\"submit\" class=\"btn btn-primary\" value=\"Use this repo\">\n" +
     "\n" +
+    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                        <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
+    "                      <ul class=\"dropdown-menu\">\n" +
+    "                          <li><a>No</a></li>\n" +
+    "                          <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
+    "                      </ul>\n" +
+    "                    </span>\n" +
     "\n" +
     "            </div>\n" +
+    "        </form>\n" +
+    "\n" +
+    "        <p class=\"m-t-1\">Remember you first need to\n" +
+    "            <strong>\n" +
+    "                <a data-ui-sref=\"user.profile.identities\">authorize your user account</a></strong>\n" +
+    "            with Github before we can send issues on your behalf.</p>\n" +
+    "\n" +
+    "        <p>Every user will have to authorize AppEnlight to access Github to be able to post issues.</p>\n" +
     "\n" +
+    "        <div class=\"panel panel-warning\">\n" +
+    "            <div class=\"panel-heading\">Private repository access</div>\n" +
+    "            <div class=\"panel-body\">\n" +
+    "                <p>If you need access to private repositories <a data-ui-sref=\"user.profile.identities\">profile page</a> allows you to require token including private repository permissions.</p>\n" +
+    "\n" +
+    "                <p>Registration page OAuth does NOT give you token with private repository access permissions.</p>\n" +
+    "            </div>\n" +
     "        </div>\n" +
+    "\n" +
     "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/reports-browser-view/reports-browser-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.is_loading\"></ng-include>\n" +
+  $templateCache.put('components/views/integrations/hipchat-integration-config-view/hipchat-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
-    "<div ng-if=\"$ctrl.is_loading === false\">\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "    <p class=\"search-params\">\n" +
-    "        <strong>Search params:</strong>\n" +
-    "        <span ng-repeat=\"tag in $ctrl.searchParams.tags\" class=\"tag\">\n" +
-    "            <strong>{{tag.type}}</strong>\n" +
-    "            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}\n" +
+    "        <h1>Hipchat Integration</h1>\n" +
     "\n" +
-    "            <a ng-click=\"$ctrl.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
-    "        </span>\n" +
-    "    </p>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
     "\n" +
-    "    <form class=\"form\">\n" +
-    "        <div class=\"typeahead-tags\">\n" +
-    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"$ctrl.filterTypeAhead\" placeholder=\"Start typing to filter reports - filter by tags, exception, priority or other properties.\"\n" +
-    "                   ng-keydown=\"$ctrl.typeAheadTag($event)\"\n" +
-    "                   uib-typeahead=\"tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:aheadFilter\"\n" +
-    "                   typeahead-min-length=\"1\" class=\"form-control\"\n" +
-    "                   typeahead-template-url=\"templates/directives/search_type_ahead.html\">\n" +
-    "        </div>\n" +
-    "    </form>\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">API Token</label>\n" +
     "\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.api_token\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.api_token\" placeholder=\"Your API token\" type=\"text\">\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "    <div class=\"well position-absolute increse-zindex\" ng-show=\"$ctrl.showDatePicker\" ng-model=\"$ctrl.pickerDate\" ng-change=\"$ctrl.pickerDateChanged()\"\n" +
-    "         class=\"animate-show\">\n" +
-    "        <uib-datepicker></uib-datepicker>\n" +
-    "    </div>\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "    </p>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">Room ID list</label>\n" +
     "\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.rooms\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.rooms\" placeholder=\"Room ID list\" type=\"text\">\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
-    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
-    "    </div>\n" +
+    "                    <p>\n" +
+    "                        <small>Room ID list separated by comma</small>\n" +
+    "                    </p>\n" +
+    "                </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <!-- Default panel contents -->\n" +
+    "            </div>\n" +
     "\n" +
-    "        <table class=\"table table-striped report-list\" ng-show=\"!$ctrl.is_loading\">\n" +
-    "            <caption>Reports</caption>\n" +
-    "            <thead>\n" +
-    "            <tr>\n" +
-    "                <th class=\"c1 ordering occurences\">#</th>\n" +
-    "                <th class=\"c2 application\">Application</th>\n" +
-    "                <th class=\"c4 when\">When <input type=\"checkbox\" ng-model=\"$ctrl.notRelativeTime\"\n" +
-    "                                                ng-change=\"$ctrl.changeRelativeTime()\"\n" +
-    "                                                title=\"Tick to see UTC time instead relative\"></th>\n" +
-    "                <th class=\"c5 error_type\">Error</th>\n" +
-    "            </tr>\n" +
-    "            </thead>\n" +
-    "            <tbody>\n" +
-    "            <tr ng-repeat=\"report in $ctrl.reportsPage track by report.id\">\n" +
-    "                <td class=\"c1 occurences\">\n" +
-    "                    <span class=\"priority-{{report.group.priority}}\" data-uib-tooltip=\"Report priority\">{{report.group.priority}}</span>\n" +
-    "              <span class=\"count {{report.presentation.className}}\" data-uib-tooltip=\"{{report.presentation.tooltip}}\">\n" +
-    "                  {{report.group.occurences|numberToThousands}}\n" +
-    "              </span>\n" +
-    "                </td>\n" +
-    "                <td class=\"c2 application\">\n" +
-    "                    <div class=\"app_name\">{{report.resource_name}}</div>\n" +
-    "                    <span class=\"server\">@{{report.tags.server_name}}</span></td>\n" +
-    "                <td class=\"c3 when\">\n" +
-    "                <span ng-show=\"!$ctrl.notRelativeTime\"><span data-uib-tooltip=\"{{report.group.last_timestamp}}\"><iso-to-relative-time\n" +
-    "                        time=\"{{report.group.last_timestamp}}\"/></span>\n" +
-    "                </span>\n" +
-    "                    <span ng-show=\"$ctrl.notRelativeTime\">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>\n" +
-    "                </td>\n" +
-    "                <td class=\"c4 report ellipsis\"><a  ui-sref=\"report.view_detail({groupId:report.group.id, reportId:report.id})\" title=\"{{report.error}}\">{{report.error || 'Unknown Exception'}}</a> <br/>\n" +
-    "                    <span class=\"url\">{{ report.tags.view_name || report.url_path}}</td>\n" +
-    "            </tr>\n" +
+    "            <div class=\"form-group\">\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input type=\"submit\" class=\"btn btn-primary\" value=\"Connect to Hipchat\">\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
     "\n" +
-    "            </tbody>\n" +
-    "        </table>\n" +
-    "    </div>\n" +
+    "                    <div class=\"btn-group\" uib-dropdown>\n" +
+    "                        <button id=\"single-button\" type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
+    "                            Test integration <span class=\"caret\"></span>\n" +
+    "                        </button>\n" +
+    "                        <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
+    "                        </ul>\n" +
+    "                    </div>\n" +
     "\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
-    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
-    "    </div>\n" +
+    "        </form>\n" +
     "\n" +
+    "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/reports-slow-browser-view/reports-slow-browser-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.is_loading\"></ng-include>\n" +
+  $templateCache.put('components/views/integrations/jira-integration-config-view/jira-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
-    "<div ng-if=\"$ctrl.is_loading === false\">\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "    <p class=\"search-params\">\n" +
-    "        <strong>Search params:</strong>\n" +
-    "        <span ng-repeat=\"tag in $ctrl.searchParams.tags\" class=\"tag\">\n" +
-    "            <strong>{{tag.type}}</strong>\n" +
-    "            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}\n" +
+    "        <h1>Jira Integration</h1>\n" +
     "\n" +
-    "            <a ng-click=\"$ctrl.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
-    "        </span>\n" +
-    "    </p>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
     "\n" +
-    "    <p>\n" +
+    "            <div class=\"form-group\" id=\"row-host_name\">\n" +
     "\n" +
-    "    <form class=\"form\">\n" +
-    "        <div class=\"typeahead-tags\">\n" +
-    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"$ctrl.filterTypeAhead\" placeholder=\"Start typing to filter slowness reports - filter by tags, average response time, priority or other properties.\"\n" +
-    "                   ng-keydown=\"$ctrl.typeAheadTag($event)\"\n" +
-    "                   uib-typeahead=\"tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:aheadFilter\"\n" +
-    "                   typeahead-min-length=\"1\" class=\"form-control\"\n" +
-    "                   typeahead-template-url=\"templates/directives/search_type_ahead.html\">\n" +
-    "        </div>\n" +
-    "    </form>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
+    "                    Server URL <span class=\"required\">*</span>\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.host_name\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" id=\"host_name\" name=\"host_name\" type=\"text\" ng-model=\"$ctrl.config.host_name\">\n" +
     "\n" +
+    "                    <p>\n" +
+    "                        <small>https://servername.atlassian.net</small>\n" +
+    "                    </p>\n" +
     "\n" +
-    "    <div class=\"well position-absolute increse-zindex\" ng-show=\"$ctrl.showDatePicker\" ng-model=\"$ctrl.pickerDate\" ng-change=\"$ctrl.pickerDateChanged()\"\n" +
-    "         class=\"animate-show\">\n" +
-    "        <uib-datepicker></uib-datepicker>\n" +
-    "    </div>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\" id=\"row-user_name\">\n" +
     "\n" +
-    "    </p>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
+    "                    Username <span class=\"required\">*</span>\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
     "\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.user_name\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" id=\"user_name\" name=\"user_name\" type=\"text\" ng-model=\"$ctrl.config.user_name\">\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
-    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
-    "    </div>\n" +
+    "                    <p>\n" +
+    "                        <small>user@email.com</small>\n" +
+    "                    </p>\n" +
     "\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\" id=\"row-password\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <!-- Default panel contents -->\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
+    "                    Password <span class=\"required\">*</span>\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.password\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" id=\"password\" name=\"password\" type=\"password\" ng-model=\"$ctrl.config.password\">\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\" id=\"row-project\">\n" +
     "\n" +
-    "        <table class=\"table table-striped report-list\" ng-show=\"!$ctrl.is_loading\">\n" +
-    "            <caption>Slow Request Reports</caption>\n" +
-    "            <thead>\n" +
-    "            <tr>\n" +
-    "                <td class=\"c1 ordering occurences\">#</td>\n" +
-    "                <td class=\"c2 average_duration\">Avg. duration</td>\n" +
-    "                <td class=\"c3 application\">Application</td>\n" +
-    "                <td class=\"c5 when\">When <input type=\"checkbox\" ng-model=\"$ctrl.notRelativeTime\"\n" +
-    "                                                ng-change=\"$ctrl.changeRelativeTime()\"\n" +
-    "                                                title=\"Tick to see UTC time instead relative\"></td>\n" +
-    "                <td class=\"c6 error_type\">Location</td>\n" +
-    "            </tr>\n" +
-    "            </thead>\n" +
-    "            <tbody>\n" +
-    "            <tr ng-repeat=\"report in $ctrl.reportsPage track by report.id\">\n" +
-    "                <td class=\"c1 occurences\">\n" +
-    "                    <span class=\"priority-{{report.group.priority}}\" data-uib-tooltip=\"Report priority\">{{report.group.priority}}</span>\n" +
-    "              <span class=\"count {{report.presentation.className}}\" data-uib-tooltip=\"{{report.presentation.tooltip}}\">\n" +
-    "                  {{report.group.occurences|numberToThousands}}\n" +
-    "              </span>\n" +
-    "                </td>\n" +
-    "                <td class=\"c2 average_duration\">{{report.group.average_duration.toFixed(3)}}s</td>\n" +
-    "                <td class=\"c3 application\">\n" +
-    "                    <div class=\"app_name\">{{report.resource_name}}</div>\n" +
-    "                    <span class=\"server\">@{{report.tags.server_name}}</span></td>\n" +
-    "                <td class=\"c4 when\">\n" +
-    "                <span ng-show=\"!$ctrl.notRelativeTime\"><span data-uib-tooltip=\"{{report.group.last_timestamp}}\"><iso-to-relative-time\n" +
-    "                        time=\"{{report.group.last_timestamp}}\"/></span>\n" +
-    "                </span>\n" +
-    "                    <span ng-show=\"$ctrl.notRelativeTime\">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>\n" +
-    "                </td>\n" +
-    "                <td class=\"c5 report ellipsis\">\n" +
-    "                    <a  ui-sref=\"report.view_detail({groupId:report.group.id, reportId:report.id})\">{{ report.tags.view_name || report.url_path}} </span></a></td>\n" +
-    "                </td>\n" +
-    "            </tr>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
+    "                    Project key <span class=\"required\">*</span>\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.project\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" id=\"project\" name=\"project\" type=\"text\" ng-model=\"$ctrl.config.project\">\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\" id=\"row-submit\">\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Setup Jira\">\n" +
     "\n" +
-    "            </tbody>\n" +
-    "        </table>\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "    </div>\n" +
+    "        </form>\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
-    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
-    "    </div>\n" +
     "\n" +
+    "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/settings-view/settings-view.html',
-    "<div class=\"row\">\n" +
-    "    <div class=\"col-sm-3\" id=\"menu\">\n" +
-    "        <div class=\"panel panel-default\">\n" +
-    "            <div class=\"panel-heading\">Applications</div>\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.list\"><span class=\"fa fa-cog\"></span> List applications</a></li>\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.update({resourceId:'new'})\"><span class=\"fa fa-plus-circle\"></span> Create application</a></li>\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.purge_logs\"><span class=\"fa fa-trash-o\"></span> Purge logs</a></li>\n" +
-    "            </ul>\n" +
-    "        </div>\n" +
-    "\n" +
+  $templateCache.put('components/views/integrations/slack-integration-config-view/slack-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
-    "        <div class=\"panel panel-default\">\n" +
-    "            <div class=\"panel-heading\">Settings</div>\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.edit\"><span class=\"fa fa-user\"></span> Profile details</a></li>\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.password\"><span class=\"fa fa-lock\"></span> Change Password</a></li>\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.identities\"><span class=\"fa fa-link\"></span> External Identities</a></li>\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.auth_tokens\"><span class=\"fa fa-unlock\"></span> Auth Tokens</a></li>\n" +
-    "            </ul>\n" +
-    "        </div>\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "        <div class=\"panel panel-default\">\n" +
-    "            <div class=\"panel-heading\">Notifications</div>\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.alert_channels.list\"><span class=\"fa fa-bullhorn\"></span> Alert channels</a></li>\n" +
-    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.alert_channels.email\"><span class=\"fa fa-envelope\"></span> Add email channel</a></li>\n" +
-    "            </ul>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
+    "        <h1>Slack Integration</h1>\n" +
     "\n" +
-    "    <div class=\"col-sm-9\" ui-view></div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/user-alert-channel-email-new-view/user-alert-channel-email-new-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.email\"></ng-include>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.email\">\n" +
+    "            <div class=\"form-group\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <p>Adding email alert channel - after you authorize your email in the system we can send alerts directly to this mailbox.</p>\n" +
-    "            <form class=\"form-horizontal\" name=\"$ctrl.channelForm\" ng-submit=\"$ctrl.createChannel()\">\n" +
-    "                <div class=\"form-group\" id=\"row-email\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.channelForm.ae_validation.email\"></data-form-errors>\n" +
-    "                    <label id=\"label-email\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Email Address\n" +
-    "                        <span class=\"required\">*</span>\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" type=\"text\" ng-model=\"$ctrl.form.email\">\n" +
-    "                    </div>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
+    "                    API Token <span class=\"required\">*</span>\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.webhook_url\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" ng-model=\"$ctrl.config.webhook_url\" placeholder=\"Webhook URL\" type=\"webhook_url\">\n" +
     "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <label for=\"submit\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control btn btn-primary\" name=\"submit\" type=\"submit\" value=\"Add email channel\">\n" +
+    "            </div>\n" +
+    "\n" +
+    "            <div class=\"form-group\">\n" +
+    "\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input type=\"submit\" class=\"btn btn-primary\"\n" +
+    "                           value=\"Connect to Slack\">\n" +
+    "\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
+    "\n" +
+    "                    <div class=\"btn-group\" uib-dropdown>\n" +
+    "                        <button type=\"button\" class=\"btn btn-info\" uib-dropdown-toggle>\n" +
+    "                            Test integration <span class=\"caret\"></span>\n" +
+    "                        </button>\n" +
+    "                        <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"single-button\">\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('report_notification')\">Test report notification</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('error_alert')\">Test error alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('uptime_alert')\">Test uptime alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('chart_alert')\">Test chart alert</a></li>\n" +
+    "                            <li role=\"menuitem\"><a ng-click=\"$ctrl.testIntegration('daily_digest')\">Test daily digest</a></li>\n" +
+    "                        </ul>\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "            </form>\n" +
-    "        </div>\n" +
+    "            </div>\n" +
+    "        </form>\n" +
+    "\n" +
     "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/user-alert-channels-list-view/user-alert-channels-list-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.channels || $ctrl.loading.applications\"></ng-include>\n" +
-    "\n" +
-    "<div ng-if=\"!$ctrl.loading.channels && !$ctrl.loading.applications && !$ctrl.loading.actions\">\n" +
-    "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <h1>Report alert rules</h1>\n" +
-    "            <p>\n" +
-    "                <a class=\"btn btn-info\" ng-click=\"$ctrl.addAction()\"><span class=\"fa fa-plus-circle\"></span> Add top-level rule</a>\n" +
-    "            </p>\n" +
+  $templateCache.put('components/views/integrations/webhooks-integration-config-view/webhooks-integration-config-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"integrations.loading.application || $ctrl.loading.integration\"></ng-include>\n" +
     "\n" +
-    "            <report-alert-action action=\"action\" rule-definitions=\"$ctrl.ruleDefinitions\"\n" +
-    "                                 possible-channels=\"$ctrl.alertChannels\"\n" +
-    "                                 actions=\"$ctrl.alertActions\" applications=\"$ctrl.applications\"\n" +
-    "                                 ng-repeat=\"action in $ctrl.alertActions | filter: {type:'report'}\"></report-alert-action>\n" +
+    "<div class=\"panel panel-default\" ng-show=\"!integrations.loading.application && !$ctrl.loading.integration\">\n" +
+    "    <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <div class=\"panel-body\">\n" +
     "\n" +
-    "        </div>\n" +
-    "    </div>\n" +
+    "        <h1>Webhooks Integration</h1>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <h1>Alert channels</h1>\n" +
+    "        <form name=\"$ctrl.integrationForm\" ng-submit=\"$ctrl.configureIntegration()\" class=\"form-horizontal\">\n" +
+    "            <div class=\"form-group\" id=\"row-reports_webhook\">\n" +
     "\n" +
-    "            <p>Here you can configure your <em>alert channels</em>.</p>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
+    "                    Reports webhook <span class=\"required\">*</span>\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.reports_webhook\"></data-form-errors>\n" +
+    "                    <input class=\"form-control\" id=\"reports_webhook\" name=\"reports_webhook\" type=\"text\" ng-model=\"$ctrl.config.reports_webhook\">\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\" id=\"row-alerts_webhook\">\n" +
     "\n" +
-    "            <p>An alert channel serves as means of delivery of notifications about important events that happen in your applications.</p>\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\">\n" +
+    "                    Alerts webhook <span class=\"required\">*</span>\n" +
+    "                </label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.integrationForm.ae_validation.alerts_webhook\"></data-form-errors>\n" +
+    "                    <input class=\"form-control StringField None\" id=\"alerts_webhook\" name=\"alerts_webhook\" type=\"text\" ng-model=\"$ctrl.config.alerts_webhook\">\n" +
+    "                </div>\n" +
     "\n" +
-    "            <div class=\"alert alert-success\">You can add more integrations that support different alert channels via application management panel.</div>\n" +
     "\n" +
-    "            <table class=\"table table-striped\">\n" +
-    "                <tr ng-repeat=\"channel in $ctrl.alertChannels\" class=\"animate-repeat\">\n" +
-    "                    <td><strong>{{ channel.channel_visible_value }}</strong></td>\n" +
-    "                    <td class=\"text-right\">\n" +
-    "                        <span class=\"btn btn-default\" data-uib-tooltip=\"Channel is {{ channel.channel_validated? '' :'NOT' }} validated\" tooltip-append-to-body=\"true\"\n" +
-    "                              ng-class=\"{dim:!channel.channel_validated}\">\n" +
-    "                            <span class=\"fa\" ng-class=\"{'fa-check-circle':channel.channel_validated,  'fa-times-circle':!channel.channel_validated}\"></span>\n" +
-    "                        </span>\n" +
-    "                        <a class=\"btn btn-default\" data-uib-tooltip=\"Press to turn {{ channel.send_alerts ? 'OFF' : 'ON' }} alerting on this chanel\"\n" +
-    "                           ng-click=\"$ctrl.updateChannel(channel,'send_alerts')\" ng-class=\"{dim:!channel.send_alerts}\" tooltip-append-to-body=\"true\">\n" +
-    "                            <span class=\"fa fa-rss\"></span> Alerts\n" +
-    "                        </a>\n" +
-    "                        <a class=\"btn btn-default\" data-uib-tooltip=\"Press to turn {{ channel.daily_digest ? 'OFF' : 'ON' }} daily digests on this channel\"\n" +
-    "                           ng-click=\"$ctrl.updateChannel(channel,'daily_digest')\" ng-class=\"{dim:!channel.daily_digest}\" tooltip-append-to-body=\"true\">\n" +
-    "                            <span class=\"fa fa-envelope\"></span> Daily digests\n" +
-    "                        </a>\n" +
+    "            </div>\n" +
+    "            <div class=\"form-group\" id=\"row-submit\">\n" +
     "\n" +
+    "                <label class=\"control-label col-sm-3 col-lg-2\"></label>\n" +
+    "                <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                    <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Setup webhooks\">\n" +
     "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-default\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove</a>\n" +
+    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove Integration</a>\n" +
     "                          <ul class=\"dropdown-menu\">\n" +
     "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"$ctrl.removeChannel(channel)\">Yes</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeIntegration()\">Yes</a></li>\n" +
     "                          </ul>\n" +
     "                        </span>\n" +
-    "\n" +
-    "                    </td>\n" +
-    "                </tr>\n" +
-    "            </table>\n" +
-    "\n" +
-    "        </div>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </form>\n" +
     "    </div>\n" +
-    "\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/user-auth-tokens-view/user-auth-tokens-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.tokens\"></ng-include>\n" +
+  $templateCache.put('components/views/logs-browser/logs-browser.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.isLoading.logs\"></ng-include>\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.tokens\">\n" +
+    "<div ng-if=\"$ctrl.isLoading.logs === false\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "    <p class=\"search-params\">\n" +
+    "        <strong>Search params:</strong>\n" +
+    "        <span ng-repeat=\"tag in $ctrl.searchParams.tags\" class=\"tag\">\n" +
+    "            <strong>{{tag.type}}</strong>\n" +
+    "            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}\n" +
     "\n" +
-    "        <div class=\"panel-body\">\n" +
+    "            <a ng-click=\"$ctrl.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
+    "        </span>\n" +
+    "    </p>\n" +
     "\n" +
-    "            <div class=\"alert alert-success\">You can use those tokens to authenticate yourself when performing various API calls</div>\n" +
+    "    <p>\n" +
     "\n" +
-    "            <hr/>\n" +
+    "        <script type=\"text/ng-template\" id=\"SearchTypeAheadUrl.html\">\n" +
     "\n" +
-    "            <form method=\"post\" class=\"form-inline\" name=\"$ctrl.TokenForm\" ng-submit=\"$ctrl.addToken()\" novalidate>\n" +
-    "                <data-form-errors errors=\"$ctrl.TokenForm.ae_validation.description\"></data-form-errors>\n" +
-    "                <data-form-errors errors=\"$ctrl.TokenForm.ae_validation.expires\"></data-form-errors>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <label>\n" +
-    "                        Description\n" +
-    "                    </label>\n" +
-    "                    <input class=\"form-control\" name=\"description\" placeholder=\"Token description\" type=\"text\" ng-model=\"$ctrl.form.description\">\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <label>\n" +
-    "                        Expires\n" +
-    "                    </label>\n" +
-    "                    <select class=\"form-control\" ng-model=\"$ctrl.form.expires\" ng-options=\"i.key as i.label for i in $ctrl.expireOptions | objectToOrderedArray:'minutes'\">\n" +
-    "                        <option value=\"\">Never</option>\n" +
-    "                    </select>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    </label>\n" +
-    "                    <input class=\"form-control btn btn-primary\" name=\"submit\" type=\"submit\" value=\"Create Token\">\n" +
-    "                </div>\n" +
-    "            </form>\n" +
+    "        </script>\n" +
     "\n" +
+    "    <form class=\"form\">\n" +
+    "        <div class=\"typeahead-tags\">\n" +
+    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"$ctrl.filterTypeAhead\" placeholder=\"Start typing to filter logs for events, filter by servers, namespaces, levels.\"\n" +
+    "                   ng-keydown=\"$ctrl.typeAheadTag($event)\"\n" +
+    "                   uib-typeahead=\"tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:$ctrl.aheadFilter\"\n" +
+    "                   typeahead-min-length=\"1\" class=\"form-control\"\n" +
+    "                   typeahead-template-url=\"templates/directives/search_type_ahead.html\">\n" +
     "        </div>\n" +
+    "    </form>\n" +
+    "\n" +
+    "    <div class=\"well animate-show position-absolute increse-zindex\" ng-if=\"$ctrl.showDatePicker\" ng-model=\"$ctrl.pickerDate\" ng-change=\"$ctrl.pickerDateChanged()\">\n" +
+    "        <uib-datepicker></uib-datepicker>\n" +
+    "    </div>\n" +
+    "\n" +
+    "    </p>\n" +
     "\n" +
+    "    <div class=\"panel\">\n" +
     "\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <c3chart data-domid=\"log_events_chart\" data-data=\"$ctrl.logEventsChartData\" data-config=\"$ctrl.logEventsChartConfig\">\n" +
+    "            </c3chart>\n" +
+    "        </div>\n" +
     "    </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <table st-table=\"displayedCollection\" st-safe-src=\"$ctrl.tokens\" class=\"table table-striped\">\n" +
-    "            <caption>Your current tokens</caption>\n" +
+    "\n" +
+    "    <div class=\"text-center\">\n" +
+    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
+    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
+    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"></uib-pagination>\n" +
+    "    </div>\n" +
+    "\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "\n" +
+    "        <table class=\"table table-striped log-list\">\n" +
+    "            <caption>Logs</caption>\n" +
     "            <thead>\n" +
     "            <tr>\n" +
-    "                <th st-sort=\"description\"><a>Description</a></th>\n" +
-    "                <th class=\"created\"><a>Created</a></th>\n" +
-    "                <th class=\"expires\"><a>Expires</a></th>\n" +
-    "                <th class=\"options\"></th>\n" +
-    "            </tr>\n" +
-    "            <tr>\n" +
-    "                <th><input st-search=\"description\" placeholder=\"search for description\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th></th>\n" +
-    "                <th></th>\n" +
-    "                <th></th>\n" +
+    "                <th class=\"c1 resource\">Application</th>\n" +
+    "                <th class=\"c2 message\">Message</th>\n" +
+    "                <th class=\"c3 when\">When</th>\n" +
     "            </tr>\n" +
     "            </thead>\n" +
     "            <tbody>\n" +
-    "\n" +
-    "            <tr ng-repeat=\"token in displayedCollection\">\n" +
-    "                <td><p>{{token.description}}</p>\n" +
-    "                    <pre ng-init=\"token.limit = 8\"  ng-mouseover=\"token.limit = 99\" ng-mouseleave=\"token.limit = 8\">{{token.token| limitTo:token.limit}}...</pre>\n" +
+    "            <tr ng-repeat=\"log in $ctrl.logsPage track by log.log_id\" class=\"{{$odd ? 'odd' : 'even'}}\">\n" +
+    "                <td class=\"c1\">\n" +
+    "                    <a class=\"tag application\" ng-click=\"$ctrl.addSearchTag({type:'resource', value:log.resource_id})\">\n" +
+    "                        <span class=\"name\">{{log.resource_name}}</span></a>\n" +
     "                </td>\n" +
-    "                <td><span data-uib-tooltip=\"{{token.creation_date}}\">{{token.creation_date | isoToRelativeTime}}</span></td>\n" +
-    "                <td><span ng-if=\"token.expires\" data-uib-tooltip=\"{{token.expires}}\">{{token.expires | isoToRelativeTime}}</span>\n" +
-    "                    <span ng-if=\"!token.expires\">Never</span></td>\n" +
-    "                <td>\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"$ctrl.removeToken(token)\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
+    "                <td class=\"c2\">\n" +
+    "                    <a class=\"tag {{log.log_level|lowercase}}\" ng-click=\"$ctrl.addSearchTag({type:'level', value:log.log_level})\">\n" +
+    "                        <span class=\"name\">level:</span> {{log.log_level}}</a>\n" +
+    "                    <a class=\"tag\" ng-click=\"$ctrl.addSearchTag({type:'namespace', value:log.namespace})\">\n" +
+    "                        <span class=\"name\">namespace:</span> {{log.namespace}}</a>\n" +
+    "                    <a ng-repeat=\"(tag, value) in log.tags\" class=\"tag\" ng-click=\"$ctrl.addSearchTag({type:tag, value:value})\">\n" +
+    "                        <span class=\"name\">{{tag}}:</span> {{value}}</a>\n" +
+    "                    <div class=\"log\">{{log.message}}</div>\n" +
+    "                </td>\n" +
+    "                <td class=\"c3 when\">\n" +
+    "                    <a ng-click=\"$ctrl.filterId(log)\" data-uib-tooltip=\"{{log.timestamp}}\">\n" +
+    "                        <iso-to-relative-time time=\"{{log.timestamp}}\"/>\n" +
+    "                    </a>\n" +
     "                </td>\n" +
     "            </tr>\n" +
+    "\n" +
     "            </tbody>\n" +
     "        </table>\n" +
+    "\n" +
+    "    </div>\n" +
+    "\n" +
+    "    <div class=\"text-center\">\n" +
+    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
+    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
+    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"></uib-pagination>\n" +
     "    </div>\n" +
     "\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('components/views/user-identities-view/user-identities-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.identities\"></ng-include>\n" +
+  $templateCache.put('components/views/report-view/report-view.html',
+    "<script type=\"text/ng-template\" id=\"slow_call.html\">\n" +
+    "    <table class=\"report-table\">\n" +
+    "        <tr>\n" +
+    "            <td class=\"table-label\">Type</td>\n" +
+    "            <td class=\"data\"><strong>{{call.type}}\n" +
+    "                ({{call.subtype}})\n" +
+    "            </strong></td>\n" +
+    "        </tr>\n" +
+    "        <tr>\n" +
+    "            <td class=\"table-label\">Duration</td>\n" +
+    "            <td class=\"data\"><strong class=\"textColor_1\">{{call.duration}}</strong></td>\n" +
+    "        </tr>\n" +
+    "        <tr>\n" +
+    "            <td class=\"table-label\">Start Time</td>\n" +
+    "            <td class=\"data\">{{call.timestamp}}</td>\n" +
+    "        </tr>\n" +
+    "        <tr>\n" +
+    "            <td class=\"table-label\">Statement</td>\n" +
+    "            <td class=\"data\">\n" +
+    "                <pre class=\"word-wrap\">{{call.statement}}</pre>\n" +
+    "            </td>\n" +
+    "        </tr>\n" +
+    "        <tr ng-if=\"call.location\">\n" +
+    "            <td class=\"table-label\">Location</td>\n" +
+    "            <td class=\"data\">{{call.location}}</td>\n" +
+    "        </tr>\n" +
+    "        <tr>\n" +
+    "            <td class=\"table-label\">Parameters</td>\n" +
+    "            <td class=\"\">\n" +
+    "                <div class=\"var-listing\" human-format vars=\"call.parameters\"></div>\n" +
+    "            </td>\n" +
+    "        </tr>\n" +
+    "    </table>\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.identities\">\n" +
+    "    <div ng-if=\"call.children.length > 0\" class=\"subcalls p-l-8\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "        <div class=\"panel-body\">\n" +
+    "        <p><strong>\n" +
+    "            <small>Sub-calls</small>\n" +
+    "        </strong></p>\n" +
     "\n" +
-    "            <div class=\"col-sm-6\">\n" +
-    "                <p ng-show=\"$ctrl.identities.length === 0\">No external providers linked yet</p>\n" +
-    "                <ul class=\"list-group\">\n" +
-    "                    <li ng-repeat=\"provider in $ctrl.identities\" class=\"animate-repeat list-group-item\">\n" +
-    "                        <div class=\"pull-right\">\n" +
-    "                            <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                                <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                              <ul class=\"dropdown-menu\">\n" +
-    "                                  <li><a>No</a></li>\n" +
-    "                                  <li><a ng-click=\"$ctrl.removeProvider(provider)\">Yes</a></li>\n" +
-    "                              </ul>\n" +
-    "                            </span>\n" +
-    "                        </div>\n" +
-    "                        <em>@{{ provider.provider }}</em>: <strong>{{ provider.id }}</strong>\n" +
-    "                    </li>\n" +
-    "                </ul>\n" +
-    "            </div>\n" +
-    "            <div class=\"col-sm-6\">\n" +
-    "                <ul class=\"list-group\">\n" +
-    "                    <li class=\"list-group-item\">\n" +
-    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.google}}\" target=\"_self\">\n" +
-    "                            <span class=\"fa fa-google-plus-square fa-2x\"></span> Connect with Google</a>\n" +
-    "                    </li>\n" +
-    "                    <li class=\"list-group-item\">\n" +
-    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.twitter}}\" target=\"_self\">\n" +
-    "                            <span class=\"fa fa-twitter fa-2x\"></span> Connect with Twitter</a>\n" +
-    "                    </li>\n" +
-    "                    <li class=\"list-group-item\">\n" +
-    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.bitbucket}}\" target=\"_self\">\n" +
-    "                            <span class=\"fa fa-bitbucket fa-2x\"></span> Connect with Bitbucket</a>\n" +
-    "                    </li>\n" +
-    "                    <li class=\"list-group-item\">\n" +
-    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.github}}\" target=\"_self\">\n" +
-    "                            <span class=\"fa fa-github fa-2x\"></span> Connect with Github including private repo access</a>\n" +
-    "                    </li>\n" +
-    "                </ul>\n" +
-    "            </div>\n" +
+    "        <div class=\"panel panel-default\">\n" +
+    "            <div ng-repeat=\"call in call.children\" ng-include=\"'slow_call.html'\" class=\"panel-body\"/>\n" +
     "        </div>\n" +
     "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/user-password-view/user-password-view.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.password\"></ng-include>\n" +
+    "    </div>\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.password\">\n" +
+    "</script>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "        <div class=\"panel-body\">\n" +
+    "<script type=\"text/ng-template\" id=\"AssignReportCtrl.html\">\n" +
     "\n" +
-    "            <form class=\"form-horizontal\" name=\"$ctrl.passwordForm\" ng-submit=\"$ctrl.updatePassword()\">\n" +
-    "                <div class=\"form-group\" id=\"row-old_password\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.passwordForm.ae_validation.old_password\"></data-form-errors>\n" +
-    "                    <label for=\"old_password\" id=\"label-old_password\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Old Password\n" +
-    "                        <span class=\"required\">*</span>\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"old_password\" name=\"old_password\" type=\"password\" ng-model=\"$ctrl.form.old_password\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-new_password\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.passwordForm.ae_validation.new_password\"></data-form-errors>\n" +
-    "                    <label for=\"new_password\" id=\"label-new_password\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        New Password\n" +
-    "                        <span class=\"required\">*</span>\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"new_password\" name=\"new_password\" type=\"password\" ng-model=\"$ctrl.form.new_password\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-new_password_confirm\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.passwordForm.ae_validation.new_password_confirm\"></data-form-errors>\n" +
-    "                    <label for=\"new_password_confirm\" id=\"label-new_password_confirm\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Confirm Password\n" +
-    "                        <span class=\"required\">*</span>\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"new_password_confirm\" name=\"new_password_confirm\" type=\"password\" ng-model=\"$ctrl.form.new_password_confirm\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-submit\">\n" +
-    "                    <label for=\"submit\" id=\"label-submit\" class=\"control-label col-sm-4 col-lg-3\"></label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control SubmitField btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Change Password\">\n" +
-    "                    </div>\n" +
+    "    <div class=\"modal-header\">\n" +
+    "        <h3>Assign users to report</h3>\n" +
+    "    </div>\n" +
+    "    <div class=\"modal-body\">\n" +
+    "\n" +
+    "        <ng-include src=\"'templates/loader.html'\" ng-if=\"ctrl.loading\"></ng-include>\n" +
+    "\n" +
+    "        <div class=\"row\" ng-if=\"!ctrl.loading\">\n" +
+    "            <div class=\"col-sm-6\">\n" +
+    "                <strong>Unassigned</strong>\n" +
+    "\n" +
+    "                <div class=\"user-assignment\" ng-repeat=\"user in ctrl.unAssignedUsers\"\n" +
+    "                     ng-click=\"ctrl.reassignUser(user)\">\n" +
+    "                    <img ng-src=\"{{user.gravatar_url}}\"/>\n" +
+    "                    <strong>{{user.user_name}}</strong><br/>\n" +
+    "                    {{user.name}}\n" +
+    "                    <div class=\"clear\"></div>\n" +
     "                </div>\n" +
-    "            </form>\n" +
+    "            </div>\n" +
+    "\n" +
+    "            <div class=\"col-sm-6\">\n" +
+    "                <strong>Assigned</strong>\n" +
     "\n" +
+    "                <div class=\"user-assignment\" ng-repeat=\"user in ctrl.assignedUsers\" ng-click=\"ctrl.reassignUser(user)\">\n" +
+    "                    <img ng-src=\"{{user.gravatar_url}}\"/>\n" +
+    "                    {{user.user_name}}<br/>\n" +
+    "                    {{user.name}}\n" +
+    "                    <div class=\"clear\"></div>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
     "        </div>\n" +
     "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('components/views/user-profile-view/user-profile-view.html',
-    "<ui-view></ui-view><ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.profile\"></ng-include>\n" +
+    "    <div class=\"modal-footer\">\n" +
+    "        <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">OK</button>\n" +
+    "        <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
+    "    </div>\n" +
+    "</script>\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.profile\">\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <form name=\"$ctrl.profileForm\" class=\"form-horizontal\" ng-submit=\"$ctrl.updateProfile()\">\n" +
-    "                <div class=\"form-group\" id=\"row-email\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.email\"></data-form-errors>\n" +
-    "                    <label for=\"email\" id=\"label-email\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Email Address\n" +
-    "                        <span class=\"required\">*</span>\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"email\" name=\"email\" type=\"text\" ng-model=\"$ctrl.user.email\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.is_loading.report\"></ng-include>\n" +
     "\n" +
-    "                <div class=\"form-group\" id=\"row-first_name\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.first_name\"></data-form-errors>\n" +
-    "                    <label for=\"first_name\" id=\"label-first_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        First Name\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"first_name\" name=\"first_name\" type=\"text\" ng-model=\"$ctrl.user.first_name\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-last_name\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.last_name\"></data-form-errors>\n" +
-    "                    <label for=\"last_name\" id=\"label-last_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Last Name\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"last_name\" name=\"last_name\" type=\"text\" ng-model=\"$ctrl.user.last_name\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-company_name\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.company_name\"></data-form-errors>\n" +
-    "                    <label for=\"company_name\" id=\"label-company_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Company Name\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"company_name\" name=\"company_name\" type=\"text\" ng-model=\"$ctrl.user.company_name\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-company_address\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.company_address\"></data-form-errors>\n" +
-    "                    <label for=\"company_address\" id=\"label-company_address\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Company Address\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <textarea class=\"form-control\" id=\"company_address\" name=\"company_address\" ng-model=\"$ctrl.user.company_address\"></textarea>\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-zip_code\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.zip_code\"></data-form-errors>\n" +
-    "                    <label for=\"zip_code\" id=\"label-zip_code\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        ZIP code\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"zip_code\" name=\"zip_code\" type=\"text\" ng-model=\"$ctrl.user.zip_code\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-city\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.city\"></data-form-errors>\n" +
-    "                    <label for=\"city\" id=\"label-city\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        City\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"city\" name=\"city\" type=\"text\" ng-model=\"$ctrl.user.city\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-notifications\">\n" +
-    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.notifications\"></data-form-errors>\n" +
-    "                    <label for=\"notifications\" id=\"label-notifications\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Account notifications\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input checked class=\"form-control\" id=\"notifications\" name=\"notifications\" type=\"checkbox\" ng-model=\"$ctrl.user.notifications\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\" id=\"row-submit\">\n" +
-    "                    <label for=\"submit\" id=\"label-submit\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Update Account\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "            </form>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('directives/permissions/permissions.html',
-    "<div class=\"panel panel-default\">\n" +
-    "    <div class=\"panel-heading\">\n" +
-    "        <h3 class=\"panel-title\">Permissions</h3>\n" +
-    "    </div>\n" +
-    "    <div class=\"panel-body\">\n" +
-    "        <p>Here you can <strong>set permissions</strong> for others to access your app data.</p>\n" +
-    "\n" +
-    "        <p>For example you can let other staff member view or alter error reports.</p>\n" +
+    "<div ng-if=\"!$ctrl.is_loading.report && $ctrl.report === null\">\n" +
+    "    <strong>OOPS something went wrong :(</strong>\n" +
+    "</div>\n" +
     "\n" +
-    "        <div ng-if=\"permissions.possibleGroups.length > 0\">\n" +
-    "            <h3>Group permissions</h3>\n" +
+    "<div ng-if=\"$ctrl.report !== null && !$ctrl.is_loading.report\">\n" +
     "\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li ng-repeat=\"perm in permissions.currentPermissions.group\" class=\"animate-repeat list-group-item\">\n" +
-    "                    <strong>{{ perm.self.group_name }}</strong>\n" +
-    "                    <div  ng-repeat=\"perm_name in perm.permissions\" class=\"pull-right animate-repeat m-l-1\">\n" +
-    "                        <span ng-if=\"perm_name == '__all_permissions__'\">Resource owner</span>\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\" ng-if=\"perm_name != '__all_permissions__'\">\n" +
-    "                            <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> {{ perm_name }}</a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"permissions.removeGroupPermission(perm_name, perm)\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
-    "                    </div>\n" +
-    "                </li>\n" +
-    "            </ul>\n" +
+    "    <div ng-if=\"$ctrl.stateHolder.AeUser.id\" class=\"row\">\n" +
+    "      <div class=\"col-lg-12\">\n" +
+    "        <a onclick=\"window.history.back()\" class=\"btn btn-default\" ng-if=\"$ctrl.window.history.length > 2\"><span class=\"fa fa-arrow-circle-o-left\"></span>\n" +
+    "            Go back</a>\n" +
+    "        <a class=\"btn btn-default\" ng-click=\"$ctrl.assignUsersModal()\" ng-if=\"$ctrl.reportType == 'report'\"><span\n" +
+    "                class=\"fa fa-flag\"></span> Assign report\n" +
+    "            to user</a>\n" +
     "\n" +
-    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"permissions.setGroupPermission()\">\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <select class=\"form-control\" ng-model=\"permissions.form.selectedGroup\" ng-options=\"g.id as g.group_name for g in permissions.possibleGroups\"></select>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <span ng-repeat=\"permission in permissions.possiblePermissions\">\n" +
-    "                    <input type=\"checkbox\" ng-model=\"permissions.form.selectedGroupPermissions[permission]\"> {{ permission }}\n" +
-    "                    </span>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <button class=\"btn btn-info\"><span class=\"fa fa-user\"></span> Give permission</button>\n" +
-    "                </div>\n" +
-    "            </form>\n" +
+    "        <a class=\"btn {{ $ctrl.report.group.fixed ? 'btn-success' : 'btn-default'}}\" ng-click=\"$ctrl.markFixed()\"\n" +
+    "           ng-if=\"$ctrl.reportType == 'report'\">\n" +
+    "            <span class=\"fa fa-check\"></span> Mark fixed</a>\n" +
     "\n" +
-    "        </div>\n" +
+    "        <span class=\"dropdown\" ng-if=\"$ctrl.report.application.integrations.length\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "          <a class=\"dropdown-toggle btn btn-default\" data-uib-dropdown-toggle>\n" +
+    "              <span class=\"fa fa-send\"></span> Integrations\n" +
+    "          </a>\n" +
+    "          <ul class=\"dropdown-menu\">\n" +
+    "              <li ng-repeat=\"choice in $ctrl.report.application.integrations\">\n" +
+    "                  <a ng-click=\"$ctrl.runIntegration(choice.name)\">{{choice.action}}</a>\n" +
+    "              </li>\n" +
+    "          </ul>\n" +
+    "        </span>\n" +
     "\n" +
-    "        <h3>User permissions</h3>\n" +
-    "        <div>\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li ng-repeat=\"perm in permissions.currentPermissions.user\" class=\"animate-repeat list-group-item\">\n" +
-    "                    <strong>{{ perm.self.user_name }}</strong>\n" +
-    "                    <div ng-repeat=\"perm_name in perm.permissions\" class=\"pull-right animate-repeat m-l-1\">\n" +
-    "                        <span ng-if=\"perm_name == '__all_permissions__'\">Resource owner</span>\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\" ng-if=\"perm_name != '__all_permissions__'\">\n" +
-    "                            <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> {{ perm_name }}</a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"permissions.removeUserPermission(perm_name,perm)\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
-    "                    </div>\n" +
-    "                </li>\n" +
-    "            </ul>\n" +
-    "        </div>\n" +
-    "        <div>\n" +
-    "            <p>First enter username or full email of person you want to give access to (the person needs to be <strong>already registered in AppEnlight</strong>)</p>\n" +
+    "        <a class=\"btn btn-default\" ng-click=\"$ctrl.markPublic()\">Make {{$ctrl.group.public ? 'private' : 'public'}}</a>\n" +
     "\n" +
-    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"permissions.setUserPermission()\">\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <input type=\"text\" class=\"autocomplete form-control\" placeholder=\"Search for user/email\" ng-model=\"permissions.form.autocompleteUser\"\n" +
-    "                           uib-typeahead=\"u.user for u in permissions.searchUsers($viewValue) | limitTo:8\" typeahead-loading=\"permissions.searchingUsers\" typeahead-wait-ms=\"250\"\n" +
-    "                           typeahead-template-url=\"templates/directives/user_search_type_ahead.html\"\n" +
-    "                    />\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <span ng-repeat=\"permission in permissions.possiblePermissions\">\n" +
-    "                    <input type=\"checkbox\" ng-model=\"permissions.form.selectedUserPermissions[permission]\"> {{ permission }}\n" +
-    "                    </span>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <button class=\"btn btn-info\" ng-disabled=\"!permissions.form.autocompleteUser\"><span class=\"fa fa-user\"></span> Give permission</button>\n" +
-    "                </div>\n" +
-    "            </form>\n" +
-    "        </div>\n" +
+    "<span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "    <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Delete</a>\n" +
+    "  <ul class=\"dropdown-menu\">\n" +
+    "      <li><a>No</a></li>\n" +
+    "      <li><a ng-click=\"$ctrl.delete()\">Yes</a></li>\n" +
+    "  </ul>\n" +
+    "</span>\n" +
+    "      </div>\n" +
     "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('directives/plugin_config/plugin_config.html',
-    "<div ng-repeat=\"tmpl in plugin_ctrlr.inclusions track by $index\">\n" +
-    "    <div><strong>Plugin: {{tmpl.name}}</strong></div>\n" +
-    "    <ng-include src=\"tmpl.template\"></ng-include>\n" +
-    "    <hr/>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('directives/postprocess_action/postprocess_action.html',
-    "<div class=\"panel panel-default action\">\n" +
-    "    <div class=\"panel-body form-inline\">\n" +
-    "        <div class=\"pull-right\">\n" +
-    "            <span class=\"dropdown\" data-uib-dropdown>\n" +
-    "                <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                  <ul class=\"dropdown-menu\">\n" +
-    "                      <li><a>No</a></li>\n" +
-    "                      <li><a ng-click=\"ctrl.deleteAction(ctrl.action)\">Yes</a></li>\n" +
-    "                  </ul>\n" +
-    "            </span>\n" +
-    "        </div>\n" +
     "\n" +
-    "        <div class=\"form-group\">\n" +
-    "        <label>Action</label>\n" +
-    "\n" +
-    "        <div class=\"form-group\">\n" +
-    "            <select class=\"form-control\" ng-model=\"ctrl.action.new_value\" ng-options=\"f[0] as f[1] for f in ctrl.possibleActions\" ng-change=\"ctrl.setDirty()\"></select>\n" +
-    "        </div>\n" +
-    "\n" +
-    "        <a class=\"btn btn-success\" ng-if=\"ctrl.action.dirty\" ng-click=\"ctrl.saveAction()\"><span class=\"fa fa-save\"></span> &nbsp;Save changes</a>\n" +
-    "\n" +
-    "        </div>\n" +
-    "        <hr/>\n" +
-    "        <p>Meeting following criteria:</p>\n" +
-    "        <form-errors errors=\"ctrl.errors\"></form-errors>\n" +
-    "        {{ctrl.rule}}\n" +
-    "        <rule rule=\"ctrl.action.rule\" rule-definitions=\"ctrl.ruleDefinitions\" parent-rule=\"null\" parent-obj=\"ctrl.action\"></rule>\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('directives/report_alert_action/report_alert_action.html',
-    "<div class=\"panel panel-default action\">\n" +
-    "    <div class=\"panel-body form-inline\">\n" +
-    "        <div class=\"pull-right\">\n" +
-    "            <span class=\"dropdown\" data-uib-dropdown>\n" +
-    "                <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                  <ul class=\"dropdown-menu\">\n" +
-    "                      <li><a>No</a></li>\n" +
-    "                      <li><a ng-click=\"ctrl.deleteAction(ctrl.actions, ctrl.action)\">Yes</a></li>\n" +
-    "                  </ul>\n" +
-    "            </span>\n" +
-    "        </div>\n" +
+    "    <div class=\"row\">\n" +
+    "        <div class=\"col-lg-4\">\n" +
     "\n" +
-    "        <div class=\"form-group\">\n" +
-    "            <label>Applies to</label>\n" +
-    "        <select class=\"form-control\" ng-model=\"ctrl.action.resource_id\" ng-options=\"f.resource_id as f.resource_name for f in ctrl.applications\" ng-change=\"ctrl.setDirty()\">\n" +
-    "            <option value=\"\">All Resources</option>\n" +
-    "        </select>\n" +
-    "        </div>\n" +
-    "        <div class=\"form-group\">\n" +
-    "        <label>Notify</label>\n" +
-    "        <select class=\"form-control\" ng-model=\"ctrl.action.action\" ng-change=\"ctrl.setDirty()\" ng-options=\"f[0] as f[1] for f in ctrl.possibleNotifications\"></select>\n" +
+    "            <div class=\"panel panel-default m-t-1\">\n" +
+    "                <div class=\"panel-body\">\n" +
     "\n" +
-    "            <a class=\"btn btn-success\" ng-if=\"ctrl.action.dirty\" ng-click=\"ctrl.saveAction()\"><span class=\"fa fa-save\"></span> &nbsp;Save changes</a>\n" +
+    "                    <h3 class=\"m-t-0\">Report Information</h3>\n" +
     "\n" +
-    "        </div>\n" +
-    "        <div>\n" +
-    "            <p><strong>Channels:</strong></p>\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li class=\"list-group-item\" ng-repeat=\"channel in ctrl.action.channels\">\n" +
-    "                    <strong>{{channel.channel_visible_value}}</strong>\n" +
-    "                    <div class=\"pull-right\">\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown>\n" +
-    "                            <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                              <ul class=\"dropdown-menu\">\n" +
-    "                                  <li><a>No</a></li>\n" +
-    "                                  <li><a ng-click=\"ctrl.unBindChannel(channel)\">Yes</a></li>\n" +
-    "                              </ul>\n" +
-    "                        </span>\n" +
-    "                    </div>\n" +
-    "                </li>\n" +
-    "            </ul>\n" +
-    "            <div class=\"form-group\" ng-if=\"ctrl.possibleChannels.length\">\n" +
-    "                <select class=\"form-control\" ng-model=\"ctrl.channelToBind\" ng-options=\"c as c.channel_visible_value for c in ctrl.possibleChannels |filter: c.supports_report_alerting\"></select>\n" +
-    "                <a class=\"btn btn-info\" ng-click=\"ctrl.bindChannel(channel, ctrl.action)\"><span class=\"fa fa-plus-circle\"></span> Add Channel</a>\n" +
-    "            </div>\n" +
-    "            <div class=\"alert alert-danger\" ng-if=\"!ctrl.possibleChannels.length\">\n" +
-    "                <span class=\"fa fa-exclamation-triangle \"></span>You need to create an alert channel before you can assign it to your rule.\n" +
-    "            </div>\n" +
+    "                    <table class=\"report-table with-ellipsis\">\n" +
+    "                        <tr>\n" +
+    "                            <td class=\"table-label\">Occurences</td>\n" +
+    "                            <td class=\"data\">{{$ctrl.report.group.occurences}}</td>\n" +
+    "                        </tr>\n" +
+    "                        <tr ng-if=\"$ctrl.report.http_status\">\n" +
+    "                            <td class=\"table-label\">HTTP status</td>\n" +
+    "                            <td class=\"data\">{{$ctrl.report.http_status}}</td>\n" +
+    "                        </tr>\n" +
+    "                        <tr ng-if=\"$ctrl.report.group.priority\">\n" +
+    "                            <td class=\"table-label\">Priority</td>\n" +
+    "                            <td class=\"data\">{{$ctrl.report.group.priority}}</td>\n" +
+    "                        </tr>\n" +
+    "                        <tr ng-if=\"$ctrl.report.group.public\">\n" +
+    "                            <td class=\"table-label\">Public URL</td>\n" +
+    "                            <td class=\"data\">\n" +
+    "                                <form>\n" +
+    "                                    <textarea class=\"TextAreaField form-control\" id=\"public-url\" onclick=\"this.select()\">{{$ctrl.$state.href($ctrl.$state.current.name, $ctrl.$state.params, {absolute: true})}}</textarea>\n" +
+    "                                </form>\n" +
+    "                            </td>\n" +
+    "                        </tr>\n" +
+    "                        <tr data-uib-tooltip=\"{{$ctrl.report.url}}\">\n" +
+    "                            <td class=\"table-label\">URL</td>\n" +
+    "                            <td class=\"data ellipsis\"><a href=\"{{$ctrl.report.url}}\">{{$ctrl.report.url}}</a></td>\n" +
+    "                        </tr>\n" +
     "\n" +
-    "        </div>\n" +
-    "        <hr/>\n" +
-    "        <p>Meeting following criteria:</p>\n" +
-    "        <form-errors errors=\"ctrl.errors\"></form-errors>\n" +
-    "        <rule rule=\"ctrl.action.rule\" rule-definitions=\"ctrl.ruleDefinitions\" parent-rule=\"null\" parent-obj=\"ctrl.action\"></rule>\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('directives/rule_read_only/rule_read_only.html',
-    "<div class=\"rule-read-only\">\n" +
+    "                        <tr ng-if=\"$ctrl.report.ip\">\n" +
+    "                            <td class=\"table-label\">Remote IP</td>\n" +
+    "                            <td class=\"data\">{{$ctrl.report.ip}}</td>\n" +
+    "                        </tr>\n" +
+    "                        <tr ng-if=\"$ctrl.report.user_agent\" data-uib-tooltip=\"{{$ctrl.report.user_agent}}\">\n" +
+    "                            <td class=\"table-label\">User Agent</td>\n" +
+    "                            <td class=\"data ellipsis\">{{$ctrl.report.user_agent}}</td>\n" +
+    "                        </tr>\n" +
+    "                        <tr ng-if=\"$ctrl.report.message\">\n" +
+    "                            <td class=\"table-label\">Message</td>\n" +
+    "                            <td class=\"data\">{{$ctrl.report.message}}</td>\n" +
+    "                        </tr>\n" +
+    "                        <tr ng-if=\"$ctrl.report.duration > 0\">\n" +
+    "                            <td class=\"table-label\">Duration</td>\n" +
+    "                            <td class=\"data\">\n" +
+    "                                <span>{{$ctrl.report.duration}}s</span>\n" +
+    "                            </td>\n" +
+    "                        </tr>\n" +
+    "                        <tr>\n" +
+    "                            <td class=\"table-label\">First occured</td>\n" +
+    "                            <td class=\"data\">\n" +
+    "                <span uib-tooltip=\"{{$ctrl.report.group.first_timestamp}}\"><iso-to-relative-time\n" +
+    "                        time=\"{{$ctrl.report.group.first_timestamp}}\"/></span>\n" +
+    "                            </td>\n" +
+    "                        </tr>\n" +
+    "                        <tr>\n" +
+    "                            <td class=\"table-label\">Last occured</td>\n" +
+    "                            <td class=\"data\">\n" +
+    "                <span uib-tooltip=\"{{$ctrl.report.group.last_timestamp}}\"><iso-to-relative-time\n" +
+    "                        time=\"{{$ctrl.report.group.last_timestamp}}\"/></span>\n" +
+    "                            </td>\n" +
+    "                        </tr>\n" +
+    "                    </table>\n" +
     "\n" +
-    "    <span class=\"form-group\">\n" +
-    "        {{rule_ctrlr.readOnlyPossibleFields[rule_ctrlr.rule.field]}}\n" +
-    "    </span>\n" +
+    "                    <div ng-if=\"$ctrl.requestStats\">\n" +
+    "                        <h3>Performance stats</h3>\n" +
     "\n" +
-    "    <span ng-if=\"rule_ctrlr.rule.field != '__AND__' && rule_ctrlr.rule.field !='__OR__' && rule_ctrlr.rule.field !='__NOT__'\">\n" +
-    "          is {{rule_ctrlr.ruleDefinitions.allOps[rule_ctrlr.rule.op]}}  {{rule_ctrlr.rule.value}}\n" +
-    "    </span>\n" +
+    "                        <div class=\"perf_stats\">\n" +
+    "                                <span class=\"stat\" ng-repeat=\"stat in $ctrl.requestStats\"\n" +
+    "                                      ng-if=\"stat.calls > 0 || stat.value > 0\"><strong>\n" +
+    "                                    <span class=\"{{stat.name}} bar\" style=\"width:10px\"></span> {{stat.calls}}\n" +
+    "                                    <span ng-if=\"stat.name!='main'\"><small>{{stat.name}} calls</small></span>\n" +
+    "                                    <span ng-if=\"stat.name=='main'\">\n" +
+    "                                        <span class=\"fa fa-question-circle\"\n" +
+    "                                              data-uib-tooltip=\"Execution time that didnt get assigned to other layers\"></span> Other</span>\n" +
+    "                                </strong>\n" +
+    "                                </span>\n" +
     "\n" +
-    "    <span ng-if=\"rule_ctrlr.rule.field == '__AND__' || rule_ctrlr.rule.field =='__OR__' || rule_ctrlr.rule.field =='__NOT__'\">\n" +
-    "        <p ng-if=\"parent\"><strong>Subrules</strong></p>\n" +
-    "        <div ng-repeat=\"subrule in rule_ctrlr.rule.rules\" class=\"m-l-2\">\n" +
+    "                            <div style=\"width: 100%; overflow:hidden\">\n" +
+    "                                <div class=\"{{stat.name}} bar\" style=\"width:{{stat.percent}}%; height: 25px\"\n" +
+    "                                     ng-repeat=\"stat in $ctrl.requestStats\"\n" +
+    "                                     data-uib-tooltip=\"{{stat.value}}s - Cumulative time spent in this request on all {{ stat.name }} calls\"></div>\n" +
+    "                                <div class=\"row\">\n" +
+    "                                    <div class=\"col-xs-6 text-left\">\n" +
+    "                                        <small>0s</small>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"col-xs-6 text-right\">\n" +
+    "                                        <small>{{$ctrl.report.duration.toFixed(3)}}s</small>\n" +
+    "                                    </div>\n" +
+    "                                </div>\n" +
+    "                            </div>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
+    "\n" +
+    "                    <h3>Tags</h3>\n" +
+    "\n" +
+    "                    <table class=\"report-table with-tags\">\n" +
+    "                        <tr ng-repeat=\"(tag, value) in $ctrl.report.tags\">\n" +
+    "                            <td class=\"table-label\" ng-switch=\"tag\"><!--\n" +
+    "                        --><span ng-switch-when=\"user_name\">Username/UID</span><!--\n" +
+    "                        --><span ng-switch-when=\"view_name\">View Name</span><!--\n" +
+    "                        --><span ng-switch-when=\"server_name\">Server Name</span><!--\n" +
+    "                        --><span ng-switch-default>{{ tag }}</span>\n" +
+    "                            </td>\n" +
+    "                            <td class=\"data\"><a ng-click=\"$ctrl.searchTag(tag, value)\">{{ value }}</td>\n" +
+    "                        </tr>\n" +
+    "                    </table>\n" +
     "\n" +
-    "            <div class=\"panel panel-default\">\n" +
-    "                <div class=\"panel-body form-inline\">\n" +
-    "                    <recursive>\n" +
-    "                        <rule-read-only rule=\"subrule\" rule-definitions=\"rule_ctrlr.ruleDefinitions\" parent-rule=\"null\" parent-obj=\"rule_ctrlr.parentObj\"></rule-read-only>\n" +
-    "                    </recursive>\n" +
     "                </div>\n" +
     "            </div>\n" +
-    "        </div>\n" +
     "\n" +
-    "    </span>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('directives/rule/rule.html',
-    "<div class=\"rule form-inline\">\n" +
     "\n" +
-    "    <div class=\"form-group\">\n" +
-    "        <select class=\"form-control\"\n" +
-    "                ng-model=\"rule_ctrlr.rule.field\"\n" +
-    "                ng-change=\"rule_ctrlr.fieldChange()\"\n" +
-    "                ng-options=\"key as label for (key, label) in rule_ctrlr.ruleDefinitions.possibleFields\"></select>\n" +
-    "    </div>\n" +
+    "        </div>\n" +
+    "        <div class=\"col-lg-8\">\n" +
+    "            <div class=\"frames\">\n" +
+    "                <p class=\"text-center\">Report history</p>\n" +
     "\n" +
-    "    <div ng-if=\"rule_ctrlr.rule.field != '__AND__' && rule_ctrlr.rule.field !='__OR__' && rule_ctrlr.rule.field !='__NOT__'\" class=\"form-group\">\n" +
+    "                <div class=\"panel\" ng-if=\"!$ctrl.is_loading.history\">\n" +
+    "                    <div class=\"panel-body\">\n" +
+    "                        <c3chart data-domid=\"report_history_chart\" data-data=\"$ctrl.reportHistoryData\" data-config=\"$ctrl.reportHistoryConfig\">\n" +
+    "                        </c3chart>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "            <select ng-model=\"rule_ctrlr.rule.op\" class=\"form-control\"\n" +
-    "                    ng-change=\"rule_ctrlr.setDirty()\"\n" +
-    "                    ng-options=\"op as rule_ctrlr.ruleDefinitions.allOps[op] for op in rule_ctrlr.ruleDefinitions.fieldOps[rule_ctrlr.rule.field]\">\n" +
-    "            </select>\n" +
+    "                <div class=\"row m-b-1\">\n" +
+    "                    <div class=\"col-sm-2 text-left\">\n" +
+    "                        <a class=\"switch_detail btn btn-sm btn-default {{$ctrl.report.group.previous_report ? '' : 'disabled'}}\"\n" +
+    "                           ng-click=\"$ctrl.previousDetail()\">\n" +
+    "                            <span class=\"fa fa-arrow-left\"></span>\n" +
+    "                            Prev. detail</a>\n" +
     "\n" +
-    "        <input type=\"text\" placeholder=\"Value\" ng-model=\"rule_ctrlr.rule.value\" ng-change=\"rule_ctrlr.setDirty()\" class=\"form-control\">\n" +
+    "                    </div>\n" +
+    "                    <div class=\"col-sm-8 text-center\">\n" +
+    "                        <small>\n" +
+    "       <span uib-tooltip=\"{{$ctrl.report.start_time|isoToRelativeTime}}\" class=\"m-r-1\">\n" +
+    "           {{$ctrl.report.start_time.replace('T', ' ')}} UTC</span>\n" +
+    "                            <span class=\"text-muted\">ID: {{$ctrl.report.request_id}}</span>\n" +
+    "                        </small>\n" +
+    "                    </div>\n" +
+    "                    <div class=\"col-sm-2 text-right\">\n" +
+    "                        <a class=\"switch_detail btn btn-sm btn-default {{$ctrl.report.group.next_report ? '' : 'disabled'}}\"\n" +
+    "                           ng-click=\"$ctrl.nextDetail()\">\n" +
+    "                            Next detail <span class=\"fa fa-arrow-right\"></span></a>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "    </div>\n" +
+    "                <h3 class=\"word-wrap\">{{$ctrl.report.error}}</h3>\n" +
     "\n" +
-    "    <span ng-if=\"rule_ctrlr.rule.field == '__AND__' || rule_ctrlr.rule.field =='__OR__' || rule_ctrlr.rule.field =='__NOT__'\">\n" +
-    "        <p ng-if=\"parent\"><strong>Subrules</strong></p>\n" +
-    "        <div ng-repeat=\"subrule in rule_ctrlr.rule.rules\" class=\"m-l-2\">\n" +
-    "            <div class=\"panel panel-default\">\n" +
-    "                <div class=\"panel-body form-inline\">\n" +
-    "                    <recursive>\n" +
-    "                        <rule rule=\"subrule\" rule-definitions=\"rule_ctrlr.ruleDefinitions\" parent-rule=\"rule_ctrlr.rule\" parent-obj=\"rule_ctrlr.parentObj\"></rule>\n" +
-    "                    </recursive>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "        </div>\n" +
+    "                <div ng-if=\"$ctrl.report.traceback\">\n" +
     "\n" +
-    "        <span ng-if=\"(rule_ctrlr.config.disable_subrules == false) == false\" class=\"btn btn-info\" ng-click=\"rule_ctrlr.add()\"><span class=\"fa fa-plus-circle\"></span> Add rule</span>\n" +
+    "                    <h3><strong>Traceback</strong></h3>\n" +
     "\n" +
-    "    </span>\n" +
-    "    <div class=\"pull-right\" ng-if=\"rule_ctrlr.parentRule\">\n" +
-    "            <span class=\"dropdown\" data-uib-dropdown>\n" +
-    "                <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                  <ul class=\"dropdown-menu\">\n" +
-    "                      <li><a>No</a></li>\n" +
-    "                      <li><a  ng-click=\"rule_ctrlr.deleteRule(rule_ctrlr.parentRule, rule_ctrlr.rule)\">Yes</a></li>\n" +
-    "                  </ul>\n" +
-    "            </span>\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('templates/admin/applications/applications_list.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"applications.loading.applications\"></ng-include>\n" +
+    "                    <div class=\"btn-group\">\n" +
+    "                        <a ng-if=\"$ctrl.traceback.length-10 > 0 \" ng-click=\"$ctrl.showLong = !$ctrl.showLong\"\n" +
+    "                           class=\"btn btn-default {{$ctrl.showLong ? 'active' : ''}}\">\n" +
+    "                            <span class=\"fa fa-align-left\"></span>\n" +
+    "                            <small>Show {{$ctrl.traceback.length-10}} remaining frames</small>\n" +
+    "                        </a>\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-if=\"!applications.loading.applications\">\n" +
-    "    <div class=\"panel-heading\">\n" +
+    "                        <a class=\"btn btn-default {{$ctrl.showRaw ? 'active' : ''}}\" ng-click=\"$ctrl.showRaw = !$ctrl.showRaw\">\n" +
+    "                            <span class=\"fa fa-list\"></span>\n" +
+    "                            <small>Raw version</small>\n" +
+    "                        </a>\n" +
+    "                    </div>\n" +
     "\n" +
-    "        Currently active applications: {{applications.applications.length}}\n" +
+    "                    <div ng-if=\"$ctrl.showRaw\" class=\"m-t-1\">\n" +
+    "                        <pre>{{$ctrl.rawTraceback}}</pre>\n" +
+    "                    </div>\n" +
+    "                    <div ng-if=\"!$ctrl.showRaw\" class=\"m-t-1\">\n" +
     "\n" +
-    "    </div>\n" +
+    "                        <div ng-repeat=\"frame in $ctrl.traceback\" class=\"frame {{$odd ? 'odd' : 'even'}}\"\n" +
+    "                             ng-if=\"$index >= $ctrl.traceback.length-10 || $ctrl.traceback.length <= 10 || $ctrl.showLong\">\n" +
+    "                            <div class=\"frameline\" ng-if=\"frame.line\">\n" +
+    "                                <a class=\"inspect_vars\" ng-click=\"frame.showVars = !frame.showVars\" ng-if=\"frame.vars\">\n" +
+    "                            <span class=\"fa fa-search dim btn btn-default\"\n" +
+    "                                  uib-tooltip=\"Show local vars\"> </span>\n" +
+    "                                </a>\n" +
     "\n" +
-    "    <table st-table=\"displayedCollection\" st-safe-src=\"applications.applications\" class=\"table table-striped\">\n" +
-    "        <thead>\n" +
-    "        <tr>\n" +
-    "            <th st-sort=\"resource_name\"><a>Application name</a></th>\n" +
-    "            <th st-sort=\"owner_user_name\"><a>Owner User</a></th>\n" +
-    "            <th st-sort=\"owner_group_name\"><a>Owner Group</a></th>\n" +
-    "            <th class=\"options\"></th>\n" +
-    "        </tr>\n" +
-    "        <tr>\n" +
-    "            <th><input st-search=\"resource_name\" placeholder=\"search for application\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "            <th><input st-search=\"owner_user_name\" placeholder=\"search for user\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "            <th><input st-search=\"owner_group_name\" placeholder=\"search for group\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "            <th></th>\n" +
-    "        </tr>\n" +
-    "        </thead>\n" +
-    "        <tbody>\n" +
-    "\n" +
-    "        <tr ng-repeat=\"resource in displayedCollection track by resource.resource_id\">\n" +
-    "            <td> {{resource.resource_name}}</td>\n" +
-    "            <td>{{resource.owner_user_name}}</td>\n" +
-    "            <td>{{resource.owner_group_name}}</td>\n" +
-    "            <td>\n" +
-    "                <a class=\"btn btn-default btn-sm\" data-ui-sref=\"applications.update({resourceId:resource.resource_id})\" data-toggle=\"tooltip\" title=\"Update application\"><span class=\"fa fa-cog\"></span></a>\n" +
-    "            </td>\n" +
-    "        </tr>\n" +
-    "        <tfoot>\n" +
-    "        <tr>\n" +
-    "            <td colspan=\"4\" class=\"text-center\">\n" +
-    "                <div st-pagination=\"\" st-items-by-page=\"100\" st-displayed-pages=\"7\"></div>\n" +
-    "            </td>\n" +
-    "        </tr>\n" +
-    "        </tfoot>\n" +
-    "        </tbody>\n" +
-    "    </table>\n" +
+    "                                <span class=\"no-vars\" ng-if=\"frame.vars.length == 0\"></span>\n" +
     "\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('templates/admin/configs/edit.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"configs.loading.config\"></ng-include>\n" +
+    "                <span ng-if=\"frame.file\">\n" +
+    "                <span class=\"mono\">File</span> <span class=\"file mono\">{{frame.file || 'Unknown file'}}</span>,\n" +
+    "                </span>\n" +
+    "                <span ng-if=\"frame.module && !frame.file\">\n" +
+    "                <span class=\"mono\">Module</span> <span class=\"file mono\">{{frame.module || 'Unknown module'}}</span>,\n" +
+    "                </span>\n" +
+    "                                <span class=\"mono\">line</span> <span class=\"line mono\">{{frame.line || 'Unknown line'}}</span>\n" +
     "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!configs.loading.config\">\n" +
-    "    <div class=\"panel-heading\">\n" +
-    "        <h3 class=\"panel-title\">Basic Configuration</h3>\n" +
-    "    </div>\n" +
-    "    <div class=\"panel-body\">\n" +
-    "        <h2>Visual</h2>\n" +
-    "        <form class=\"form-horizontal\">\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    Footer HTML\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <textarea class=\"form-control\" type=\"text\" ng-model=\"configs.configs.global.template_footer_html.value\" style=\"min-height: 150px\"></textarea>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "        </form>\n" +
+    "                <span ng-if=\"frame.fn\"><span class=\"mono\">in</span> <strong\n" +
+    "                        class=\"fn mono\">{{frame.fn || 'Unknown function'}}</strong></span>\n" +
     "\n" +
-    "        <h2>Functional</h2>\n" +
+    "                            </div>\n" +
+    "                            <div class=\"cline mono\" ng-if=\"frame.cline\">{{frame.cline || 'Unknown context'}}</div>\n" +
     "\n" +
-    "        <form class=\"form-horizontal\">\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    Show user groups to non-admin users\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <button type=\"button\" class=\"btn btn-default\" ng-model=\"configs.configs.global.list_groups_to_non_admins.value\" uib-btn-checkbox>\n" +
-    "                        Enable\n" +
-    "                    </button>\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "        </form>\n" +
+    "                            <div class=\"vars\" ng-if=\"frame.showVars\">\n" +
+    "                                <table class=\"var-listing small\">\n" +
+    "                                    <tr ng-repeat=\"fvar in frame.vars track by $index\" class=\"frame {{$odd ? 'odd' : 'even'}}\">\n" +
+    "                                        <td class=\"var-label\">{{ fvar[0] }}</td>\n" +
+    "                                        <td>\n" +
+    "                                            <span human-format vars=\"fvar[1]\"></span>\n" +
+    "                                        </td>\n" +
+    "                                    </tr>\n" +
+    "                                </table>\n" +
     "\n" +
-    "        <h2>Global Rate Limiting</h2>\n" +
+    "                            </div>\n" +
+    "                        </div>\n" +
+    "                    </div>\n" +
     "\n" +
-    "        <form class=\"form-horizontal\">\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    Ignore reports per minute/per application\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input class=\"form-control\" type=\"number\" ng-model=\"configs.configs.global.per_application_reports_rate_limit.value\" />\n" +
-    "                </div>\n" +
-    "            </div>\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    Ignore logs per minute/per application\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input class=\"form-control\" type=\"number\" ng-model=\"configs.configs.global.per_application_logs_rate_limit.value\" />\n" +
     "                </div>\n" +
-    "            </div>\n" +
     "\n" +
-    "            <div class=\"form-group\">\n" +
-    "                <label class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    Ignore metrics per minute/per application\n" +
-    "                </label>\n" +
-    "                <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                    <input class=\"form-control\" type=\"number\" ng-model=\"configs.configs.global.per_application_metrics_rate_limit.value\" />\n" +
-    "                </div>\n" +
-    "            </div>\n" +
     "\n" +
-    "        </form>\n" +
+    "                <uib-tabset>\n" +
+    "                    <uib-tab select=\"$ctrl.selectedTab('slow_calls')\" active=\"$ctrl.tabs.slow_calls\">\n" +
+    "                        <uib-tab-heading>\n" +
+    "                            Slow Calls\n" +
+    "                        </uib-tab-heading>\n" +
     "\n" +
-    "        <hr/>\n" +
+    "                        <h3><strong>Slow Calls</strong></h3>\n" +
     "\n" +
-    "        <a class=\"btn btn-primary\" ng-click=\"configs.save()\">Save configuration</a>\n" +
-    "    </div>\n" +
+    "                        <div ng-if=\"$ctrl.report.slow_calls.length > 0\">\n" +
+    "                            <div ng-repeat=\"call in $ctrl.report.slow_calls\" ng-include=\"'slow_call.html'\"></div>\n" +
+    "                        </div>\n" +
     "\n" +
-    "</div>\n" +
+    "                        <div ng-if=\"$ctrl.report.slow_calls.length == 0\">\n" +
+    "                            No slow calls reported\n" +
+    "                        </div>\n" +
     "\n" +
+    "                    </uib-tab>\n" +
     "\n" +
-    "<div class=\"panel panel-default\">\n" +
-    "    <div class=\"panel-heading\">\n" +
-    "        <h3 class=\"panel-title\">Plugin Configuration</h3>\n" +
-    "    </div>\n" +
-    "    <div class=\"panel-body\">\n" +
-    "        <plugin-config section=\"'admin.config'\">\n" +
-    "        </plugin-config>\n" +
-    "    </div>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('templates/admin/configs/parent_view.html',
-    "<div ui-view></div>"
-  );
-
-
-  $templateCache.put('templates/admin/groups/groups_create.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"group.loading.group\"></ng-include>\n" +
     "\n" +
-    "<div ng-show=\"!group.loading.group\">\n" +
+    "                    <uib-tab select=\"$ctrl.selectedTab('request_details')\" active=\"$ctrl.tabs.request_details\">\n" +
+    "                        <uib-tab-heading>\n" +
+    "                            Request details\n" +
+    "                        </uib-tab-heading>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <form name=\"group.groupForm\" class=\"form-horizontal\" ng-submit=\"group.createGroup()\">\n" +
-    "                <div class=\"form-group\" id=\"row-group_name\">\n" +
-    "                    <data-form-errors errors=\"group.groupForm.ae_validation.group_name\"></data-form-errors>\n" +
-    "                    <label for=\"group_name\" id=\"label-group_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Group name\n" +
-    "                        <span class=\"required\">*</span>\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"group_name\" name=\"group_name\" type=\"text\" ng-model=\"group.group.group_name\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
+    "                        <h3><strong>Extra</strong></h3>\n" +
+    "                        <div class=\"var-listing\" human-format vars=\"$ctrl.report.extra\"></div>\n" +
+    "                        <h3><strong>Request details</strong></h3>\n" +
+    "                        <div class=\"var-listing\" human-format vars=\"$ctrl.report.request\"></div>\n" +
     "\n" +
-    "                <div class=\"form-group\" id=\"row-description\">\n" +
-    "                    <data-form-errors errors=\"group.groupForm.ae_validation.description\"></data-form-errors>\n" +
-    "                    <label for=\"description\" id=\"label-description\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Description\n" +
-    "                        <span class=\"required\">*</span>\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"description\" name=\"description\" type=\"text\" ng-model=\"group.group.description\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
+    "                    </uib-tab>\n" +
     "\n" +
+    "                    <uib-tab select=\"$ctrl.selectedTab('logs')\" active=\"$ctrl.tabs.logs\">\n" +
+    "                        <uib-tab-heading>\n" +
+    "                            Logs\n" +
+    "                        </uib-tab-heading>\n" +
     "\n" +
-    "                <div class=\"form-group\" id=\"row-submit\">\n" +
-    "                    <label for=\"submit\" id=\"label-submit\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                    </label>\n" +
-    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"{{$state.params.groupId ? 'Update' : 'Add'}} Group\">\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "            </form>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
+    "                        <div ng-if=\"$ctrl.is_loading.logs!=false\" class=\"text-center\">\n" +
+    "                            <span class=\"fa fa-cog fa-spin fa-3x loader\"></span>\n" +
+    "                        </div>\n" +
+    "                        <p ng-if=\"$ctrl.reportLogs.length == 0\"> No logs found</p>\n" +
     "\n" +
+    "                        <table class=\"table table-striped log-list\" ng-if=\"$ctrl.reportLogs.length > 0\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\" ng-if=\"group.group.id\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">Permissions summary</h3>\n" +
-    "        </div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <h3>Direct application permissions</h3>\n" +
+    "                            <caption>Logs</caption>\n" +
+    "                            <thead>\n" +
+    "                            <tr>\n" +
+    "                                <th class=\"message\">Message</th>\n" +
+    "                                <th class=\"when\">When</th>\n" +
+    "                            </tr>\n" +
+    "                            </thead>\n" +
+    "                            <tbody>\n" +
+    "                            <tr ng-repeat=\"log in $ctrl.reportLogs track by log.log_id\">\n" +
+    "                                <td>\n" +
+    "                                    <a class=\"tag {{log.log_level|lowercase}}\">\n" +
+    "                                        <span class=\"name\">level:</span> {{log.log_level}}</a>\n" +
+    "                                    <a class=\"tag\">\n" +
+    "                                        <span class=\"name\">namespace:</span> {{log.namespace}}</a>\n" +
+    "                                    <a ng-repeat=\"(tag, value) in log.tags\" class=\"tag\">\n" +
+    "                                        <span class=\"name\">{{tag}}:</span> {{value}}</a>\n" +
+    "                                    <div class=\"log\">\n" +
+    "                                        {{log.message}}\n" +
+    "                                    </div>\n" +
+    "                                </td>\n" +
+    "                                <td class=\"when\">\n" +
+    "                                    <a data-uib-tooltip=\"{{log.timestamp}}\">\n" +
+    "                                        <iso-to-relative-time time=\"{{log.timestamp}}\"/>\n" +
+    "                                    </a>\n" +
+    "                                </td>\n" +
+    "                            </tr>\n" +
     "\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li ng-repeat=\"perm in group.resourcePermissions.group.application\" class=\"animate-repeat list-group-item\">\n" +
-    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
+    "                            </tbody>\n" +
+    "                        </table>\n" +
     "\n" +
-    "                    <div class=\"pull-right\">\n" +
+    "                    </uib-tab>\n" +
     "\n" +
-    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
     "\n" +
-    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Application\" data-ui-sref=\"applications.update({resourceId:perm.self.resource_id})\">\n" +
-    "                            <span class=\"fa fa-cog\"></span>\n" +
-    "                        </a>\n" +
-    "                    </div>\n" +
-    "                </li>\n" +
-    "            </ul>\n" +
+    "                    <uib-tab select=\"$ctrl.selectedTab('comments')\" active=\"$ctrl.tabs.comments\">\n" +
+    "                        <uib-tab-heading>\n" +
+    "                            Comments\n" +
+    "                            <span class=\"label label-info\">{{$ctrl.report.comments.length}}</span>\n" +
     "\n" +
-    "            <h3>Direct dashboard permissions</h3>\n" +
+    "                        </uib-tab-heading>\n" +
     "\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li ng-repeat=\"perm in group.resourcePermissions.group.dashboard\" class=\"animate-repeat list-group-item\">\n" +
-    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
+    "                        <h3><strong>Comments</strong></h3>\n" +
     "\n" +
-    "                    <div class=\"pull-right\">\n" +
-    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
+    "                        <p ng-if=\"$ctrl.report.comments.length == 0\">No comments yet - be first to add one!</p>\n" +
     "\n" +
-    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Dashboard\" data-ui-sref=\"dashboard.update({resourceId:perm.self.resource_id})\">\n" +
-    "                            <span class=\"fa fa-cog\"></span>\n" +
-    "                        </a>\n" +
-    "                    </div>\n" +
-    "                </li>\n" +
-    "            </ul>\n" +
+    "                        <div class=\"comment\" ng-repeat=\"comment in $ctrl.report.comments\">\n" +
+    "                            <p name=\"comment-{{comment.comment_id}}\"><span class=\"fa fa-comment\"></span>\n" +
+    "                                <strong>{{comment.user_name}}</strong>\n" +
+    "                                <iso-to-relative-time time=\"{{comment.created_timestamp}}\"/>\n" +
+    "                            </p>\n" +
+    "                            <p class=\"well\">{{comment.body}}</p>\n" +
+    "                        </div>\n" +
     "\n" +
-    "        </div>\n" +
+    "                        <form name=\"commentForm\" ng-submit=\"$ctrl.addComment()\">\n" +
+    "                            <div class=\"form-group\">\n" +
+    "                <textarea type=\"text\" class=\"form-control\" id=\"$ctrl.commentForm\" ng-model=\"$ctrl.comment\" required\n" +
+    "                          mentio mentio-search=\"$ctrl.searchMentionedPeople(term)\" mentio-items=\"$ctrl.mentionedPeople| filter:label:typedTerm\" class=\"form-control\"></textarea>\n" +
     "\n" +
-    "    </div>\n" +
+    "                            </div>\n" +
+    "                            <div class=\"form-group\">\n" +
+    "                                <button class=\"btn btn-info\" ng-disabled=\"$ctrl.commentForm.$invalid\">Comment</button>\n" +
+    "                            </div>\n" +
+    "                        </form>\n" +
+    "\n" +
+    "                        <div ng-repeat=\"comment in $ctrl.report.comments\" class=\"{{$odd ? 'odd' : 'even'}}\" class=\"repeat-animate\">\n" +
+    "                        </div>\n" +
     "\n" +
+    "                    </uib-tab>\n" +
+    "\n" +
+    "                    <uib-tab select=\"$ctrl.selectedTab('affected_users')\" active=\"$ctrl.tabs.affected_users\">\n" +
+    "                        <uib-tab-heading>\n" +
+    "                            Affected users\n" +
+    "                            <span class=\"label label-warning\">{{$ctrl.report.affected_users_count}}</span>\n" +
+    "\n" +
+    "                        </uib-tab-heading>\n" +
+    "\n" +
+    "                        <h3><strong>50 most affected users ID's by this issue:</strong></h3>\n" +
+    "                        <ul class=\"affected-user-list\">\n" +
+    "                            <li ng-repeat=\"user in $ctrl.report.top_affected_users\">\n" +
+    "                                <strong>{{user.username}}</strong> <span class=\"badge\" uib-tooltip=\"occurences\">{{user.count}}</span>\n" +
+    "                            </li>\n" +
+    "                        </ul>\n" +
+    "\n" +
+    "                    </uib-tab>\n" +
+    "\n" +
+    "                </uib-tabset>\n" +
+    "\n" +
+    "\n" +
+    "            </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\" ng-if=\"group.group.id\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">User list</h3>\n" +
     "        </div>\n" +
-    "        <div class=\"panel-body\">\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/reports-browser-view/reports-browser-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.is_loading\"></ng-include>\n" +
     "\n" +
-    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"group.addUser()\">\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <input placeholder=\"Username or email\" type=\"text\" class=\"autocomplete form-control\" ng-model=\"group.form.autocompleteUser\" uib-typeahead=\"u for u in group.searchUsers($viewValue) | limitTo:8\" typeahead-loading=\"searchingUsers\" typeahead-wait-ms=\"250\"/>\n" +
-    "                </div>\n" +
-    "                <div class=\"form-group\">\n" +
-    "                    <button class=\"btn btn-info\" ng-disabled=\"!group.form.autocompleteUser\"><span class=\"fa fa-user\"></span> Add user</button>\n" +
-    "                </div>\n" +
-    "            </form>\n" +
+    "<div ng-if=\"$ctrl.is_loading === false\">\n" +
+    "\n" +
+    "    <p class=\"search-params\">\n" +
+    "        <strong>Search params:</strong>\n" +
+    "        <span ng-repeat=\"tag in $ctrl.searchParams.tags\" class=\"tag\">\n" +
+    "            <strong>{{tag.type}}</strong>\n" +
+    "            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}\n" +
+    "\n" +
+    "            <a ng-click=\"$ctrl.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
+    "        </span>\n" +
+    "    </p>\n" +
     "\n" +
+    "    <form class=\"form\">\n" +
+    "        <div class=\"typeahead-tags\">\n" +
+    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"$ctrl.filterTypeAhead\" placeholder=\"Start typing to filter reports - filter by tags, exception, priority or other properties.\"\n" +
+    "                   ng-keydown=\"$ctrl.typeAheadTag($event)\"\n" +
+    "                   uib-typeahead=\"tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:aheadFilter\"\n" +
+    "                   typeahead-min-length=\"1\" class=\"form-control\"\n" +
+    "                   typeahead-template-url=\"templates/directives/search_type_ahead.html\">\n" +
     "        </div>\n" +
+    "    </form>\n" +
+    "\n" +
+    "\n" +
+    "    <div class=\"well position-absolute increse-zindex\" ng-show=\"$ctrl.showDatePicker\" ng-model=\"$ctrl.pickerDate\" ng-change=\"$ctrl.pickerDateChanged()\"\n" +
+    "         class=\"animate-show\">\n" +
+    "        <uib-datepicker></uib-datepicker>\n" +
+    "    </div>\n" +
+    "\n" +
+    "    </p>\n" +
+    "\n" +
+    "\n" +
+    "    <div class=\"text-center\">\n" +
+    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
+    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
+    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
+    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
+    "    </div>\n" +
+    "\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <!-- Default panel contents -->\n" +
     "\n" +
-    "        <table st-table=\"displayedCollection\" st-safe-src=\"group.users\" class=\"table table-striped\">\n" +
+    "        <table class=\"table table-striped report-list\" ng-show=\"!$ctrl.is_loading\">\n" +
+    "            <caption>Reports</caption>\n" +
     "            <thead>\n" +
     "            <tr>\n" +
-    "                <th st-sort=\"user_name\"><a>Username</a></th>\n" +
-    "                <th st-sort=\"email\"><a>Email</a></th>\n" +
-    "                <th st-sort=\"status\"><a>Status</a></th>\n" +
-    "                <th st-sort=\"first_name\"><a>First Name</a></th>\n" +
-    "                <th st-sort=\"last_name\"><a>Last Name</a></th>\n" +
-    "                <th st-sort=\"last_login_date\"><a>Last login</a></th>\n" +
-    "                <th class=\"options\" style=\"width: 130px\"></th>\n" +
-    "            </tr>\n" +
-    "            <tr>\n" +
-    "                <th><input st-search=\"user_name\" placeholder=\"search for user name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th><input st-search=\"email\" placeholder=\"search for email\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th></th>\n" +
-    "                <th><input st-search=\"first_name\" placeholder=\"search for first name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th><input st-search=\"last_name\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th><input st-search=\"last_login_date\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th></th>\n" +
+    "                <th class=\"c1 ordering occurences\">#</th>\n" +
+    "                <th class=\"c2 application\">Application</th>\n" +
+    "                <th class=\"c4 when\">When <input type=\"checkbox\" ng-model=\"$ctrl.notRelativeTime\"\n" +
+    "                                                ng-change=\"$ctrl.changeRelativeTime()\"\n" +
+    "                                                title=\"Tick to see UTC time instead relative\"></th>\n" +
+    "                <th class=\"c5 error_type\">Error</th>\n" +
     "            </tr>\n" +
     "            </thead>\n" +
     "            <tbody>\n" +
-    "\n" +
-    "            <tr ng-repeat=\"user in displayedCollection\">\n" +
-    "                <td><img src=\"{{user.gravatar_url}}\" class=\"avatar\"> {{user.user_name}}</td>\n" +
-    "                <td>{{user.email}}</td>\n" +
-    "                <td class=\"text-center\"><span class=\"fa\" ng-class=\"{'fa-check-circle':user.status, 'fa-times':!user.status}\"></span></td>\n" +
-    "                <td>{{user.first_name}}</td>\n" +
-    "                <td>{{user.last_name}}</td>\n" +
-    "                <td><span data-uib-tooltip=\"{{user.last_login_date}}\">{{user.last_login_date | isoToRelativeTime}}</span></td>\n" +
-    "                <td>\n" +
-    "                    <a class=\"btn btn-default btn-sm\" data-ui-sref=\"admin.user.update({userId:user.id})\"><span class=\"fa fa-cog\"></span></a>\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger btn-sm\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"group.removeUser(user)\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
-    "            </tr>\n" +
-    "            <tfoot>\n" +
-    "            <tr>\n" +
-    "                <td colspan=\"7\" class=\"text-center\">\n" +
-    "                    <div st-pagination=\"\" st-items-by-page=\"50\" st-displayed-pages=\"7\"></div>\n" +
+    "            <tr ng-repeat=\"report in $ctrl.reportsPage track by report.id\">\n" +
+    "                <td class=\"c1 occurences\">\n" +
+    "                    <span class=\"priority-{{report.group.priority}}\" data-uib-tooltip=\"Report priority\">{{report.group.priority}}</span>\n" +
+    "              <span class=\"count {{report.presentation.className}}\" data-uib-tooltip=\"{{report.presentation.tooltip}}\">\n" +
+    "                  {{report.group.occurences|numberToThousands}}\n" +
+    "              </span>\n" +
+    "                </td>\n" +
+    "                <td class=\"c2 application\">\n" +
+    "                    <div class=\"app_name\">{{report.resource_name}}</div>\n" +
+    "                    <span class=\"server\">@{{report.tags.server_name}}</span></td>\n" +
+    "                <td class=\"c3 when\">\n" +
+    "                <span ng-show=\"!$ctrl.notRelativeTime\"><span data-uib-tooltip=\"{{report.group.last_timestamp}}\"><iso-to-relative-time\n" +
+    "                        time=\"{{report.group.last_timestamp}}\"/></span>\n" +
+    "                </span>\n" +
+    "                    <span ng-show=\"$ctrl.notRelativeTime\">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>\n" +
     "                </td>\n" +
+    "                <td class=\"c4 report ellipsis\"><a  ui-sref=\"report.view_detail({groupId:report.group.id, reportId:report.id})\" title=\"{{report.error}}\">{{report.error || 'Unknown Exception'}}</a> <br/>\n" +
+    "                    <span class=\"url\">{{ report.tags.view_name || report.url_path}}</td>\n" +
     "            </tr>\n" +
-    "            </tfoot>\n" +
+    "\n" +
     "            </tbody>\n" +
     "        </table>\n" +
-    "\n" +
     "    </div>\n" +
     "\n" +
     "\n" +
+    "    <div class=\"text-center\">\n" +
+    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
+    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
+    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
+    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
+    "    </div>\n" +
+    "\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('templates/admin/groups/groups_list.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"groups.loading.groups\"></ng-include>\n" +
-    "\n" +
-    "<div class=\"panel panel-default\" ng-show=\"!groups.loading.groups\">\n" +
+  $templateCache.put('components/views/reports-slow-browser-view/reports-slow-browser-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.is_loading\"></ng-include>\n" +
     "\n" +
-    "    <table st-table=\"displayedCollection\" st-safe-src=\"groups.groups\" class=\"table table-striped\">\n" +
-    "        <thead>\n" +
-    "        <tr>\n" +
-    "            <th st-sort=\"group_name\"><a>Group name</a></th>\n" +
-    "            <th st-sort=\"description\"><a>Description</a></th>\n" +
-    "            <th st-sort=\"members\"><a>Member count</a></th>\n" +
-    "            <th class=\"options\"></th>\n" +
-    "        </tr>\n" +
-    "        <tr>\n" +
-    "            <th><input st-search=\"group_name\" placeholder=\"search for group name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "            <th><input st-search=\"description\" placeholder=\"search for description\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "            <th></th>\n" +
-    "            <th></th>\n" +
-    "        </tr>\n" +
-    "        </thead>\n" +
-    "        <tbody>\n" +
+    "<div ng-if=\"$ctrl.is_loading === false\">\n" +
     "\n" +
-    "        <tr ng-repeat=\"group in displayedCollection track by group.id\">\n" +
-    "            <td>{{group.group_name}}</td>\n" +
-    "            <td>{{group.description}}</td>\n" +
-    "            <td>{{group.member_count}}</td>\n" +
-    "            <td>\n" +
-    "                <a class=\"btn btn-default btn-sm\" data-ui-sref=\"admin.group.update({groupId:group.id})\"><span class=\"fa fa-cog\"></span></a>\n" +
-    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                            <a class=\"btn btn-danger btn-sm\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                          <ul class=\"dropdown-menu\">\n" +
-    "                              <li><a>No</a></li>\n" +
-    "                              <li><a ng-click=\"groups.removeGroup(group)\">Yes</a></li>\n" +
-    "                          </ul>\n" +
-    "                        </span>\n" +
-    "        </tr>\n" +
-    "        <tfoot>\n" +
-    "        <tr>\n" +
-    "            <td colspan=\"4\" class=\"text-center\">\n" +
-    "                <div st-pagination=\"\" st-items-by-page=\"100\" st-displayed-pages=\"7\"></div>\n" +
-    "            </td>\n" +
-    "        </tr>\n" +
-    "        </tfoot>\n" +
-    "        </tbody>\n" +
-    "    </table>\n" +
+    "    <p class=\"search-params\">\n" +
+    "        <strong>Search params:</strong>\n" +
+    "        <span ng-repeat=\"tag in $ctrl.searchParams.tags\" class=\"tag\">\n" +
+    "            <strong>{{tag.type}}</strong>\n" +
+    "            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}\n" +
     "\n" +
-    "</div>\n" +
-    "\n"
-  );
-
-
-  $templateCache.put('templates/admin/groups/parent_view.html',
-    "<div ui-view></div>"
-  );
-
-
-  $templateCache.put('templates/admin/parent_view.html',
-    "<div class=\"col-sm-3\" id=\"menu\">\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\">Users and groups</div>\n" +
-    "        <ul class=\"list-group\">\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.user.list\"> Users</a></li>\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.user.create\"> Create user</a></li>\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.group.list\"> Groups</a></li>\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.group.create\"> Create group</a></li>\n" +
-    "        </ul>\n" +
-    "    </div>\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\">Resources</div>\n" +
-    "        <ul class=\"list-group\">\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.application.list\"> List applications</a></li>\n" +
-    "        </ul>\n" +
-    "    </div>\n" +
+    "            <a ng-click=\"$ctrl.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
+    "        </span>\n" +
+    "    </p>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\">System</div>\n" +
-    "        <ul class=\"list-group\">\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.configs.list\"> Config variables</a></li>\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.system\"> System</a></li>\n" +
-    "            <li class=\"list-group-item\" ui-sref-active=\"active\"><a data-ui-sref=\"admin.partitions\"> Partition Management</a></li>\n" +
-    "        </ul>\n" +
-    "    </div>\n" +
-    "</div>\n" +
+    "    <p>\n" +
     "\n" +
+    "    <form class=\"form\">\n" +
+    "        <div class=\"typeahead-tags\">\n" +
+    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"$ctrl.filterTypeAhead\" placeholder=\"Start typing to filter slowness reports - filter by tags, average response time, priority or other properties.\"\n" +
+    "                   ng-keydown=\"$ctrl.typeAheadTag($event)\"\n" +
+    "                   uib-typeahead=\"tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:aheadFilter\"\n" +
+    "                   typeahead-min-length=\"1\" class=\"form-control\"\n" +
+    "                   typeahead-template-url=\"templates/directives/search_type_ahead.html\">\n" +
+    "        </div>\n" +
+    "    </form>\n" +
     "\n" +
-    "<div class=\"col-sm-9\" ui-view></div>\n"
-  );
-
-
-  $templateCache.put('templates/admin/partitions.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"partitions.loading.partitions\"></ng-include>\n" +
     "\n" +
-    "<div ng-show=\"!partitions.loading.partitions\">\n" +
+    "    <div class=\"well position-absolute increse-zindex\" ng-show=\"$ctrl.showDatePicker\" ng-model=\"$ctrl.pickerDate\" ng-change=\"$ctrl.pickerDateChanged()\"\n" +
+    "         class=\"animate-show\">\n" +
+    "        <uib-datepicker></uib-datepicker>\n" +
+    "    </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            DELETE Daily Partitions\n" +
-    "        </div>\n" +
+    "    </p>\n" +
     "\n" +
-    "        <form name=\"partitions.dailyPartitionsForm\"\n" +
-    "              novalidate ng-submit=\"partitions.partitionsDelete('dailyPartitions')\"\n" +
-    "              class=\"form-inline\"\n" +
-    "              ng-class=\"{'has-error':partitions.dailyPartitionsForm.$invalid}\">\n" +
     "\n" +
-    "            <div class=\"panel-body\">\n" +
+    "    <div class=\"text-center\">\n" +
+    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
+    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
+    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
+    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
+    "    </div>\n" +
     "\n" +
-    "                <input type=\"text\" name=\"confirm\"\n" +
-    "                       placeholder=\"Enter CONFIRM to proceed\" class=\"form-control input-autosize\" confirm-validate required ng-model=\"partitions.dailyConfirm\">\n" +
-    "                <input type=\"submit\" class=\"btn btn-danger\" ng-disabled=\"partitions.dailyPartitionsForm.$invalid\">\n" +
-    "                <input type=\"checkbox\" ng-model=\"partitions.dailyChecked\" ng-change=\"partitions.setCheckedList('dailyPartitions')\"> Check All\n" +
     "\n" +
-    "            </div>\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <!-- Default panel contents -->\n" +
     "\n" +
-    "            <table class=\"table table-striped\">\n" +
-    "                <tr>\n" +
-    "                    <th class=\"c1 date\">Date</th>\n" +
-    "                    <th class=\"c2 indices\">Indices</th>\n" +
-    "                </tr>\n" +
-    "                <tr class=\"r{{$index}}\" ng-repeat=\"row in partitions.dailyPartitions\">\n" +
-    "                    <td class=\"c1\">{{row[0]}}</td>\n" +
-    "                    <td class=\"c2\">\n" +
-    "                        <ul class=\"list-group\">\n" +
-    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].elasticsearch\">\n" +
-    "                            <input name=\"es_index\" type=\"checkbox\" ng-model=\"partition.checked\"> ES: {{partition.name}}\n" +
-    "                        </li>\n" +
-    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].pg\">\n" +
-    "                            <input name=\"pg_index\" type=\"checkbox\" ng-model=\"partition.checked\"> PG: {{partition.name}}\n" +
-    "                        </li>\n" +
-    "                        </ul>\n" +
-    "                    </td>\n" +
-    "                </tr>\n" +
-    "            </table>\n" +
-    "        </form>\n" +
+    "        <table class=\"table table-striped report-list\" ng-show=\"!$ctrl.is_loading\">\n" +
+    "            <caption>Slow Request Reports</caption>\n" +
+    "            <thead>\n" +
+    "            <tr>\n" +
+    "                <td class=\"c1 ordering occurences\">#</td>\n" +
+    "                <td class=\"c2 average_duration\">Avg. duration</td>\n" +
+    "                <td class=\"c3 application\">Application</td>\n" +
+    "                <td class=\"c5 when\">When <input type=\"checkbox\" ng-model=\"$ctrl.notRelativeTime\"\n" +
+    "                                                ng-change=\"$ctrl.changeRelativeTime()\"\n" +
+    "                                                title=\"Tick to see UTC time instead relative\"></td>\n" +
+    "                <td class=\"c6 error_type\">Location</td>\n" +
+    "            </tr>\n" +
+    "            </thead>\n" +
+    "            <tbody>\n" +
+    "            <tr ng-repeat=\"report in $ctrl.reportsPage track by report.id\">\n" +
+    "                <td class=\"c1 occurences\">\n" +
+    "                    <span class=\"priority-{{report.group.priority}}\" data-uib-tooltip=\"Report priority\">{{report.group.priority}}</span>\n" +
+    "              <span class=\"count {{report.presentation.className}}\" data-uib-tooltip=\"{{report.presentation.tooltip}}\">\n" +
+    "                  {{report.group.occurences|numberToThousands}}\n" +
+    "              </span>\n" +
+    "                </td>\n" +
+    "                <td class=\"c2 average_duration\">{{report.group.average_duration.toFixed(3)}}s</td>\n" +
+    "                <td class=\"c3 application\">\n" +
+    "                    <div class=\"app_name\">{{report.resource_name}}</div>\n" +
+    "                    <span class=\"server\">@{{report.tags.server_name}}</span></td>\n" +
+    "                <td class=\"c4 when\">\n" +
+    "                <span ng-show=\"!$ctrl.notRelativeTime\"><span data-uib-tooltip=\"{{report.group.last_timestamp}}\"><iso-to-relative-time\n" +
+    "                        time=\"{{report.group.last_timestamp}}\"/></span>\n" +
+    "                </span>\n" +
+    "                    <span ng-show=\"$ctrl.notRelativeTime\">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>\n" +
+    "                </td>\n" +
+    "                <td class=\"c5 report ellipsis\">\n" +
+    "                    <a  ui-sref=\"report.view_detail({groupId:report.group.id, reportId:report.id})\">{{ report.tags.view_name || report.url_path}} </span></a></td>\n" +
+    "                </td>\n" +
+    "            </tr>\n" +
+    "\n" +
+    "            </tbody>\n" +
+    "        </table>\n" +
     "\n" +
     "    </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            DELETE Permanent Partitions\n" +
+    "    <div class=\"text-center\">\n" +
+    "        <uib-pagination total-items=\"$ctrl.itemCount\" items-per-page=\"$ctrl.itemsPerPage\" ng-model=\"$ctrl.page\" max-size=\"10\"\n" +
+    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
+    "                        ng-change=\"$ctrl.paginationChange()\"\n" +
+    "                        ng-show=\"!$ctrl.is_loading\"></uib-pagination>\n" +
+    "    </div>\n" +
+    "\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/settings-view/settings-view.html',
+    "<div class=\"row\">\n" +
+    "    <div class=\"col-sm-3\" id=\"menu\">\n" +
+    "        <div class=\"panel panel-default\">\n" +
+    "            <div class=\"panel-heading\">Applications</div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.list\"><span class=\"fa fa-cog\"></span> List applications</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.update({resourceId:'new'})\"><span class=\"fa fa-plus-circle\"></span> Create application</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"applications.purge_logs\"><span class=\"fa fa-trash-o\"></span> Purge logs</a></li>\n" +
+    "            </ul>\n" +
     "        </div>\n" +
     "\n" +
-    "        <form name=\"partitions.permanentPartitionsForm\" novalidate\n" +
-    "              ng-submit=\"partitions.partitionsDelete('permanentPartitions')\"\n" +
-    "              class=\"form-inline\"\n" +
-    "              ng-class=\"{'has-error':partitions.permanentPartitionsForm.$invalid}\">\n" +
     "\n" +
+    "        <div class=\"panel panel-default\">\n" +
+    "            <div class=\"panel-heading\">Settings</div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.edit\"><span class=\"fa fa-user\"></span> Profile details</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.password\"><span class=\"fa fa-lock\"></span> Change Password</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.identities\"><span class=\"fa fa-link\"></span> External Identities</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.profile.auth_tokens\"><span class=\"fa fa-unlock\"></span> Auth Tokens</a></li>\n" +
+    "            </ul>\n" +
+    "        </div>\n" +
     "\n" +
-    "            <div class=\"panel-body\">\n" +
+    "        <div class=\"panel panel-default\">\n" +
+    "            <div class=\"panel-heading\">Notifications</div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.alert_channels.list\"><span class=\"fa fa-bullhorn\"></span> Alert channels</a></li>\n" +
+    "                <li class=\"list-group-item\" ui-sref-active-eq=\"active\"><a data-ui-sref=\"user.alert_channels.email\"><span class=\"fa fa-envelope\"></span> Add email channel</a></li>\n" +
+    "            </ul>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "\n" +
+    "    <div class=\"col-sm-9\" ui-view></div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/user-alert-channel-email-new-view/user-alert-channel-email-new-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.email\"></ng-include>\n" +
+    "\n" +
+    "<div ng-show=\"!$ctrl.loading.email\">\n" +
     "\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <p>Adding email alert channel - after you authorize your email in the system we can send alerts directly to this mailbox.</p>\n" +
+    "            <form class=\"form-horizontal\" name=\"$ctrl.channelForm\" ng-submit=\"$ctrl.createChannel()\">\n" +
+    "                <div class=\"form-group\" id=\"row-email\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.channelForm.ae_validation.email\"></data-form-errors>\n" +
+    "                    <label id=\"label-email\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Email Address\n" +
+    "                        <span class=\"required\">*</span>\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" type=\"text\" ng-model=\"$ctrl.form.email\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "                <div class=\"form-group\">\n" +
-    "                    <input type=\"text\" name=\"confirm\"\n" +
-    "                           placeholder=\"Enter CONFIRM to proceed\" class=\"form-control\" confirm-validate required ng-model=\"partitions.permConfirm\">\n" +
-    "                    <input type=\"submit\" class=\"btn btn-danger\" ng-disabled=\"partitions.permanentPartitionsForm.$invalid\">\n" +
-    "                    <input type=\"checkbox\" ng-model=\"partitions.permChecked\" ng-change=\"partitions.setCheckedList('permanentPartitions')\"> Check All\n" +
+    "                    <label for=\"submit\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control btn btn-primary\" name=\"submit\" type=\"submit\" value=\"Add email channel\">\n" +
+    "                    </div>\n" +
     "                </div>\n" +
+    "            </form>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/user-alert-channels-list-view/user-alert-channels-list-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.channels || $ctrl.loading.applications\"></ng-include>\n" +
     "\n" +
-    "            </div>\n" +
+    "<div ng-if=\"!$ctrl.loading.channels && !$ctrl.loading.applications && !$ctrl.loading.actions\">\n" +
+    "\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <h1>Report alert rules</h1>\n" +
+    "            <p>\n" +
+    "                <a class=\"btn btn-info\" ng-click=\"$ctrl.addAction()\"><span class=\"fa fa-plus-circle\"></span> Add top-level rule</a>\n" +
+    "            </p>\n" +
+    "\n" +
+    "            <report-alert-action action=\"action\" rule-definitions=\"$ctrl.ruleDefinitions\"\n" +
+    "                                 possible-channels=\"$ctrl.alertChannels\"\n" +
+    "                                 actions=\"$ctrl.alertActions\" applications=\"$ctrl.applications\"\n" +
+    "                                 ng-repeat=\"action in $ctrl.alertActions | filter: {type:'report'}\"></report-alert-action>\n" +
+    "\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <h1>Alert channels</h1>\n" +
+    "\n" +
+    "            <p>Here you can configure your <em>alert channels</em>.</p>\n" +
+    "\n" +
+    "            <p>An alert channel serves as means of delivery of notifications about important events that happen in your applications.</p>\n" +
+    "\n" +
+    "            <div class=\"alert alert-success\">You can add more integrations that support different alert channels via application management panel.</div>\n" +
     "\n" +
     "            <table class=\"table table-striped\">\n" +
-    "                <tr>\n" +
-    "                    <th class=\"c1 date\">Date</th>\n" +
-    "                    <th class=\"c2 indices\">Indices</th>\n" +
-    "                </tr>\n" +
-    "                <tr class=\"r{{$index}}\" ng-repeat=\"row in partitions.permanentPartitions\">\n" +
-    "                    <td class=\"c1\">{{row[0]}}</td>\n" +
-    "                    <td class=\"c2\">\n" +
-    "                        <ul class=\"list-group\">\n" +
-    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].elasticsearch\">\n" +
-    "                            <input name=\"es_index\" type=\"checkbox\" ng-model=\"partition.checked\"> ES: {{partition.name}}\n" +
-    "                        </li>\n" +
-    "                        <li class=\"list-group-item\" ng-repeat=\"partition in row[1].pg\">\n" +
-    "                            <input name=\"pg_index\" type=\"checkbox\" ng-model=\"partition.checked\"> PG: {{partition.name}}\n" +
-    "                        </li>\n" +
-    "                        </ul>\n" +
+    "                <tr ng-repeat=\"channel in $ctrl.alertChannels\" class=\"animate-repeat\">\n" +
+    "                    <td><strong>{{ channel.channel_visible_value }}</strong></td>\n" +
+    "                    <td class=\"text-right\">\n" +
+    "                        <span class=\"btn btn-default\" data-uib-tooltip=\"Channel is {{ channel.channel_validated? '' :'NOT' }} validated\" tooltip-append-to-body=\"true\"\n" +
+    "                              ng-class=\"{dim:!channel.channel_validated}\">\n" +
+    "                            <span class=\"fa\" ng-class=\"{'fa-check-circle':channel.channel_validated,  'fa-times-circle':!channel.channel_validated}\"></span>\n" +
+    "                        </span>\n" +
+    "                        <a class=\"btn btn-default\" data-uib-tooltip=\"Press to turn {{ channel.send_alerts ? 'OFF' : 'ON' }} alerting on this chanel\"\n" +
+    "                           ng-click=\"$ctrl.updateChannel(channel,'send_alerts')\" ng-class=\"{dim:!channel.send_alerts}\" tooltip-append-to-body=\"true\">\n" +
+    "                            <span class=\"fa fa-rss\"></span> Alerts\n" +
+    "                        </a>\n" +
+    "                        <a class=\"btn btn-default\" data-uib-tooltip=\"Press to turn {{ channel.daily_digest ? 'OFF' : 'ON' }} daily digests on this channel\"\n" +
+    "                           ng-click=\"$ctrl.updateChannel(channel,'daily_digest')\" ng-class=\"{dim:!channel.daily_digest}\" tooltip-append-to-body=\"true\">\n" +
+    "                            <span class=\"fa fa-envelope\"></span> Daily digests\n" +
+    "                        </a>\n" +
+    "\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-default\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> Remove</a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeChannel(channel)\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
+    "\n" +
     "                    </td>\n" +
     "                </tr>\n" +
     "            </table>\n" +
-    "        </form>\n" +
     "\n" +
+    "        </div>\n" +
     "    </div>\n" +
     "\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('templates/admin/system.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"system.loading.system\"></ng-include>\n" +
-    "\n" +
-    "<div ng-if=\"system.loading.system == false\">\n" +
-    "    <div class=\"row\">\n" +
-    "        <div class=\"col-sm-12\">\n" +
-    "            <div class=\"panel panel-default\">\n" +
-    "                <div class=\"panel-heading\">\n" +
-    "                    <h3 class=\"panel-title\">\n" +
-    "                        System Info\n" +
-    "                    </h3>\n" +
-    "                </div>\n" +
-    "                <div class=\"panel-body\">\n" +
+  $templateCache.put('components/views/user-auth-tokens-view/user-auth-tokens-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.tokens\"></ng-include>\n" +
     "\n" +
-    "                    <p><strong>System Load:</strong>\n" +
-    "                        1min: {{system.systemLoad[0]}}, 5min: {{system.systemLoad[1]}}, 15min: {{system.systemLoad[2]}}\n" +
-    "                    </p>\n" +
-    "                    <p><strong>Awaiting tasks:</strong>\n" +
-    "                    <ul>\n" +
-    "                        <li>reports: {{system.queueStats.waiting_reports}}</li>\n" +
-    "                        <li>logs: {{system.queueStats.waiting_logs}}</li>\n" +
-    "                        <li>metrics: {{system.queueStats.waiting_metrics}}</li>\n" +
-    "                        <li>other: {{system.queueStats.waiting_other}}</li>\n" +
-    "                    </ul>\n" +
-    "                    </p>\n" +
-    "                    <p><strong>Queue stats from last minute:</strong>\n" +
-    "                    <ul>\n" +
-    "                        <li>Processed reports: {{system.queueStats.processed_reports}}</li>\n" +
-    "                        <li>Processed logs: {{system.queueStats.processed_logs}}</li>\n" +
-    "                        <li>Processed metrics: {{system.queueStats.processed_metrics}}</li>\n" +
-    "                    </ul>\n" +
-    "                    </p>\n" +
+    "<div ng-show=\"!$ctrl.loading.tokens\">\n" +
     "\n" +
-    "                    <p><strong>Disks:</strong>\n" +
-    "                    <ul>\n" +
-    "                        <li ng-repeat=\"disk in system.disks\">\n" +
-    "                            <strong>{{disk.device}}</strong> {{disk.free}}/{{disk.total}}, {{disk.percentage}}% used\n" +
-    "                        </li>\n" +
-    "                    </ul>\n" +
-    "                    </p>\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
     "\n" +
-    "                    <p><strong>Process stats:</strong>\n" +
-    "                    <ul>\n" +
-    "                        <li>FD soft limits: {{system.selfInfo.fds.soft}}</li>\n" +
-    "                        <li>FD hard limits: {{system.selfInfo.fds.hard}}</li>\n" +
-    "                        <li>Memlock soft limits: {{system.selfInfo.memlock.soft}}</li>\n" +
-    "                        <li>Memlock hard limits: {{system.selfInfo.memlock.hard}}</li>\n" +
-    "                    </ul>\n" +
-    "                    </p>\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
-    "                </div>\n" +
-    "            </div>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
-    "    <div class=\"row\">\n" +
-    "        <div class=\"col-sm-12\">\n" +
+    "            <div class=\"alert alert-success\">You can use those tokens to authenticate yourself when performing various API calls</div>\n" +
     "\n" +
-    "            <div class=\"panel panel-default\">\n" +
-    "                <div class=\"panel-body\">\n" +
+    "            <hr/>\n" +
     "\n" +
-    "                    <uib-tabset>\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Postgresql Tables\n" +
-    "                            </uib-tab-heading>\n" +
-    "\n" +
-    "                            <table class=\"table table-striped\">\n" +
-    "                                <thead>\n" +
-    "                                <tr>\n" +
-    "                                    <th class=\"c1 tablename\">Table name</th>\n" +
-    "                                    <th class=\"c2 size_human\">Size</th>\n" +
-    "                                </tr>\n" +
-    "                                </thead>\n" +
-    "                                <tbody>\n" +
-    "                                <tr class=\"r{{$index}}\" ng-repeat=\"row in system.DBtables\">\n" +
-    "                                    <td class=\"c1\">{{row.table_name}}</td>\n" +
-    "                                    <td class=\"c2\">{{row.size_human}}</td>\n" +
-    "                                </tr>\n" +
-    "                                </tbody>\n" +
-    "                            </table>\n" +
-    "\n" +
-    "                        </uib-tab>\n" +
-    "\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Elasticsearch Indices\n" +
-    "                            </uib-tab-heading>\n" +
+    "            <form method=\"post\" class=\"form-inline\" name=\"$ctrl.TokenForm\" ng-submit=\"$ctrl.addToken()\" novalidate>\n" +
+    "                <data-form-errors errors=\"$ctrl.TokenForm.ae_validation.description\"></data-form-errors>\n" +
+    "                <data-form-errors errors=\"$ctrl.TokenForm.ae_validation.expires\"></data-form-errors>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <label>\n" +
+    "                        Description\n" +
+    "                    </label>\n" +
+    "                    <input class=\"form-control\" name=\"description\" placeholder=\"Token description\" type=\"text\" ng-model=\"$ctrl.form.description\">\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <label>\n" +
+    "                        Expires\n" +
+    "                    </label>\n" +
+    "                    <select class=\"form-control\" ng-model=\"$ctrl.form.expires\" ng-options=\"i.key as i.label for i in $ctrl.expireOptions | objectToOrderedArray:'minutes'\">\n" +
+    "                        <option value=\"\">Never</option>\n" +
+    "                    </select>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <label class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                    </label>\n" +
+    "                    <input class=\"form-control btn btn-primary\" name=\"submit\" type=\"submit\" value=\"Create Token\">\n" +
+    "                </div>\n" +
+    "            </form>\n" +
     "\n" +
-    "                            <table class=\"table table-striped\">\n" +
-    "                                <thead>\n" +
-    "                                <tr>\n" +
-    "                                    <th class=\"c1 tablename\">Index name</th>\n" +
-    "                                    <th class=\"c2 size_human\">Size</th>\n" +
-    "                                </tr>\n" +
-    "                                </thead>\n" +
-    "                                <tbody>\n" +
-    "                                <tr class=\"r{{$index}}\" ng-repeat=\"row in system.ESIndices\">\n" +
-    "                                    <td class=\"c1\">{{row.name}}</td>\n" +
-    "                                    <td class=\"c2\">{{row.size_human}}</td>\n" +
-    "                                </tr>\n" +
-    "                                </tbody>\n" +
-    "                            </table>\n" +
+    "        </div>\n" +
     "\n" +
-    "                        </uib-tab>\n" +
     "\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Processes\n" +
-    "                            </uib-tab-heading>\n" +
+    "    </div>\n" +
     "\n" +
-    "                            <table class=\"table table-striped\">\n" +
-    "                                <thead>\n" +
-    "                                <tr>\n" +
-    "                                    <th class=\"c1 tablename\">Owner</th>\n" +
-    "                                    <th class=\"c2 tablename\">PID</th>\n" +
-    "                                    <th class=\"c3 tablename\">CPU</th>\n" +
-    "                                    <th class=\"c4 tablename\">MEM</th>\n" +
-    "                                    <th class=\"c4 tablename\">Name</th>\n" +
-    "                                </tr>\n" +
-    "                                </thead>\n" +
-    "                                <tbody>\n" +
-    "                                <tr class=\"r{{$index}}\" ng-repeat-start=\"row in system.processInfo\">\n" +
-    "                                    <td class=\"c1\">{{row.owner}}</td>\n" +
-    "                                    <td class=\"c2\">{{row.pid}}</td>\n" +
-    "                                    <td class=\"c3\">{{row.cpu}}</td>\n" +
-    "                                    <td class=\"c4\">{{row.mem_usage}} ({{row.mem_percentage}}%)</td>\n" +
-    "                                    <td class=\"c5\"><strong>{{row.name}}</strong></td>\n" +
-    "                                </tr>\n" +
-    "                                <tr ng-repeat-end>\n" +
-    "                                    <td colspan=\"5\" class=\"word-wrap\">{{row.command}}</td>\n" +
-    "                                </tr>\n" +
-    "                                </tbody>\n" +
-    "                            </table>\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <table st-table=\"displayedCollection\" st-safe-src=\"$ctrl.tokens\" class=\"table table-striped\">\n" +
+    "            <caption>Your current tokens</caption>\n" +
+    "            <thead>\n" +
+    "            <tr>\n" +
+    "                <th st-sort=\"description\"><a>Description</a></th>\n" +
+    "                <th class=\"created\"><a>Created</a></th>\n" +
+    "                <th class=\"expires\"><a>Expires</a></th>\n" +
+    "                <th class=\"options\"></th>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <th><input st-search=\"description\" placeholder=\"search for description\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
+    "                <th></th>\n" +
+    "                <th></th>\n" +
+    "                <th></th>\n" +
+    "            </tr>\n" +
+    "            </thead>\n" +
+    "            <tbody>\n" +
     "\n" +
-    "                        </uib-tab>\n" +
+    "            <tr ng-repeat=\"token in displayedCollection\">\n" +
+    "                <td><p>{{token.description}}</p>\n" +
+    "                    <pre ng-init=\"token.limit = 8\"  ng-mouseover=\"token.limit = 99\" ng-mouseleave=\"token.limit = 8\">{{token.token| limitTo:token.limit}}...</pre>\n" +
+    "                </td>\n" +
+    "                <td><span data-uib-tooltip=\"{{token.creation_date}}\">{{token.creation_date | isoToRelativeTime}}</span></td>\n" +
+    "                <td><span ng-if=\"token.expires\" data-uib-tooltip=\"{{token.expires}}\">{{token.expires | isoToRelativeTime}}</span>\n" +
+    "                    <span ng-if=\"!token.expires\">Never</span></td>\n" +
+    "                <td>\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                            <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeToken(token)\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
+    "                </td>\n" +
+    "            </tr>\n" +
+    "            </tbody>\n" +
+    "        </table>\n" +
+    "    </div>\n" +
     "\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Python packages\n" +
-    "                            </uib-tab-heading>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/user-identities-view/user-identities-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.identities\"></ng-include>\n" +
     "\n" +
-    "                            <table class=\"table\">\n" +
-    "                                <tr ng-repeat=\"package in system.packages\">\n" +
-    "                                    <td>{{package.name}}</td>\n" +
-    "                                    <td>{{package.version}}</td>\n" +
-    "                                </tr>\n" +
-    "                            </table>\n" +
-    "                            </p>\n" +
+    "<div ng-show=\"!$ctrl.loading.identities\">\n" +
     "\n" +
-    "                        </uib-tab>\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
-    "                    </uib-tabset>\n" +
-    "                </div>\n" +
+    "            <div class=\"col-sm-6\">\n" +
+    "                <p ng-show=\"$ctrl.identities.length === 0\">No external providers linked yet</p>\n" +
+    "                <ul class=\"list-group\">\n" +
+    "                    <li ng-repeat=\"provider in $ctrl.identities\" class=\"animate-repeat list-group-item\">\n" +
+    "                        <div class=\"pull-right\">\n" +
+    "                            <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
+    "                                <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                              <ul class=\"dropdown-menu\">\n" +
+    "                                  <li><a>No</a></li>\n" +
+    "                                  <li><a ng-click=\"$ctrl.removeProvider(provider)\">Yes</a></li>\n" +
+    "                              </ul>\n" +
+    "                            </span>\n" +
+    "                        </div>\n" +
+    "                        <em>@{{ provider.provider }}</em>: <strong>{{ provider.id }}</strong>\n" +
+    "                    </li>\n" +
+    "                </ul>\n" +
+    "            </div>\n" +
+    "            <div class=\"col-sm-6\">\n" +
+    "                <ul class=\"list-group\">\n" +
+    "                    <li class=\"list-group-item\">\n" +
+    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.google}}\" target=\"_self\">\n" +
+    "                            <span class=\"fa fa-google-plus-square fa-2x\"></span> Connect with Google</a>\n" +
+    "                    </li>\n" +
+    "                    <li class=\"list-group-item\">\n" +
+    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.twitter}}\" target=\"_self\">\n" +
+    "                            <span class=\"fa fa-twitter fa-2x\"></span> Connect with Twitter</a>\n" +
+    "                    </li>\n" +
+    "                    <li class=\"list-group-item\">\n" +
+    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.bitbucket}}\" target=\"_self\">\n" +
+    "                            <span class=\"fa fa-bitbucket fa-2x\"></span> Connect with Bitbucket</a>\n" +
+    "                    </li>\n" +
+    "                    <li class=\"list-group-item\">\n" +
+    "                        <a href=\"{{$ctrl.AeConfig.urls.social_auth.github}}\" target=\"_self\">\n" +
+    "                            <span class=\"fa fa-github fa-2x\"></span> Connect with Github including private repo access</a>\n" +
+    "                    </li>\n" +
+    "                </ul>\n" +
     "            </div>\n" +
     "        </div>\n" +
     "    </div>\n" +
@@ -6631,240 +6424,442 @@ function kickstartAE(initialUserData) {
   );
 
 
-  $templateCache.put('templates/admin/users/parent_view.html',
-    "<div ui-view></div>"
-  );
-
-
-  $templateCache.put('templates/admin/users/users_create.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"user.loading.user\"></ng-include>\n" +
+  $templateCache.put('components/views/user-password-view/user-password-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.password\"></ng-include>\n" +
     "\n" +
-    "<div ng-show=\"!user.loading.user\">\n" +
+    "<div ng-show=\"!$ctrl.loading.password\">\n" +
     "\n" +
     "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
     "        <div class=\"panel-body\">\n" +
     "\n" +
-    "                <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\" ng-if=\"user.user.id\">\n" +
-    "                    <a class=\"btn btn-default\" data-uib-dropdown-toggle><span class=\"fa fa-user-secret\"></span> Re-login to user</a>\n" +
-    "                  <ul class=\"dropdown-menu\">\n" +
-    "                      <li><a>No</a></li>\n" +
-    "                      <li><a ng-click=\"user.reloginUser(user)\">Yes</a></li>\n" +
-    "                  </ul>\n" +
-    "                </span>\n" +
-    "\n" +
-    "            <form name=\"user.profileForm\" class=\"form-horizontal\" ng-submit=\"user.createUser()\">\n" +
-    "                <div class=\"form-group\" id=\"row-user_name\">\n" +
-    "                    <data-form-errors errors=\"user.profileForm.ae_validation.user_name\"></data-form-errors>\n" +
-    "                    <label for=\"user_name\" id=\"label-user_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        User name\n" +
+    "            <form class=\"form-horizontal\" name=\"$ctrl.passwordForm\" ng-submit=\"$ctrl.updatePassword()\">\n" +
+    "                <div class=\"form-group\" id=\"row-old_password\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.passwordForm.ae_validation.old_password\"></data-form-errors>\n" +
+    "                    <label for=\"old_password\" id=\"label-old_password\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Old Password\n" +
     "                        <span class=\"required\">*</span>\n" +
     "                    </label>\n" +
     "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"user_name\" name=\"user_name\" type=\"text\" ng-model=\"user.user.user_name\">\n" +
+    "                        <input class=\"form-control\" id=\"old_password\" name=\"old_password\" type=\"password\" ng-model=\"$ctrl.form.old_password\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "\n" +
-    "                <div class=\"form-group\" id=\"row-user_password\">\n" +
-    "                    <data-form-errors errors=\"user.profileForm.ae_validation.user_password\"></data-form-errors>\n" +
-    "                    <label for=\"user_password\" id=\"label-user_password\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Password\n" +
+    "                <div class=\"form-group\" id=\"row-new_password\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.passwordForm.ae_validation.new_password\"></data-form-errors>\n" +
+    "                    <label for=\"new_password\" id=\"label-new_password\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        New Password\n" +
     "                        <span class=\"required\">*</span>\n" +
     "                    </label>\n" +
     "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"user_password\" name=\"user_password\" type=\"password\" ng-model=\"user.user.user_password\">\n" +
-    "\n" +
-    "                        <p class=\"m-t-1\"><a class=\"btn btn-info btn-sm\" ng-click=\"user.generatePassword()\"><span class=\"fa fa-lock\"></span> Generate password</a>\n" +
-    "                            <span ng-show=\"user.gen_pass.length > 0\">(generated password: {{user.gen_pass}})</span>\n" +
-    "                        </p>\n" +
-    "\n" +
+    "                        <input class=\"form-control\" id=\"new_password\" name=\"new_password\" type=\"password\" ng-model=\"$ctrl.form.new_password\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\" id=\"row-new_password_confirm\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.passwordForm.ae_validation.new_password_confirm\"></data-form-errors>\n" +
+    "                    <label for=\"new_password_confirm\" id=\"label-new_password_confirm\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Confirm Password\n" +
+    "                        <span class=\"required\">*</span>\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"new_password_confirm\" name=\"new_password_confirm\" type=\"password\" ng-model=\"$ctrl.form.new_password_confirm\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\" id=\"row-submit\">\n" +
+    "                    <label for=\"submit\" id=\"label-submit\" class=\"control-label col-sm-4 col-lg-3\"></label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control SubmitField btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Change Password\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
+    "            </form>\n" +
     "\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('components/views/user-profile-view/user-profile-view.html',
+    "<ui-view></ui-view><ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.profile\"></ng-include>\n" +
     "\n" +
+    "<div ng-show=\"!$ctrl.loading.profile\">\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <form name=\"$ctrl.profileForm\" class=\"form-horizontal\" ng-submit=\"$ctrl.updateProfile()\">\n" +
     "                <div class=\"form-group\" id=\"row-email\">\n" +
-    "                    <data-form-errors errors=\"user.profileForm.ae_validation.email\"></data-form-errors>\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.email\"></data-form-errors>\n" +
     "                    <label for=\"email\" id=\"label-email\" class=\"control-label col-sm-4 col-lg-3\">\n" +
     "                        Email Address\n" +
     "                        <span class=\"required\">*</span>\n" +
     "                    </label>\n" +
     "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"email\" name=\"email\" type=\"text\" ng-model=\"user.user.email\">\n" +
+    "                        <input class=\"form-control\" id=\"email\" name=\"email\" type=\"text\" ng-model=\"$ctrl.user.email\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "\n" +
     "                <div class=\"form-group\" id=\"row-first_name\">\n" +
-    "                    <data-form-errors errors=\"user.profileForm.ae_validation.first_name\"></data-form-errors>\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.first_name\"></data-form-errors>\n" +
     "                    <label for=\"first_name\" id=\"label-first_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
     "                        First Name\n" +
     "                    </label>\n" +
     "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"first_name\" name=\"first_name\" type=\"text\" ng-model=\"user.user.first_name\">\n" +
+    "                        <input class=\"form-control\" id=\"first_name\" name=\"first_name\" type=\"text\" ng-model=\"$ctrl.user.first_name\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "                <div class=\"form-group\" id=\"row-last_name\">\n" +
-    "                    <data-form-errors errors=\"user.profileForm.ae_validation.last_name\"></data-form-errors>\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.last_name\"></data-form-errors>\n" +
     "                    <label for=\"last_name\" id=\"label-last_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
     "                        Last Name\n" +
     "                    </label>\n" +
     "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control\" id=\"last_name\" name=\"last_name\" type=\"text\" ng-model=\"user.user.last_name\">\n" +
+    "                        <input class=\"form-control\" id=\"last_name\" name=\"last_name\" type=\"text\" ng-model=\"$ctrl.user.last_name\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "\n" +
-    "                <div class=\"form-group\" id=\"row-status\">\n" +
-    "                    <data-form-errors errors=\"user.profileForm.ae_validation.status\"></data-form-errors>\n" +
-    "                    <label for=\"status\" id=\"label-status\" class=\"control-label col-sm-4 col-lg-3\">\n" +
-    "                        Active\n" +
+    "                <div class=\"form-group\" id=\"row-company_name\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.company_name\"></data-form-errors>\n" +
+    "                    <label for=\"company_name\" id=\"label-company_name\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Company Name\n" +
     "                    </label>\n" +
     "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input checked class=\"form-control\" id=\"status\" name=\"status\" type=\"checkbox\" ng-model=\"user.user.status\">\n" +
+    "                        <input class=\"form-control\" id=\"company_name\" name=\"company_name\" type=\"text\" ng-model=\"$ctrl.user.company_name\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\" id=\"row-company_address\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.company_address\"></data-form-errors>\n" +
+    "                    <label for=\"company_address\" id=\"label-company_address\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Company Address\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <textarea class=\"form-control\" id=\"company_address\" name=\"company_address\" ng-model=\"$ctrl.user.company_address\"></textarea>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\" id=\"row-zip_code\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.zip_code\"></data-form-errors>\n" +
+    "                    <label for=\"zip_code\" id=\"label-zip_code\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        ZIP code\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"zip_code\" name=\"zip_code\" type=\"text\" ng-model=\"$ctrl.user.zip_code\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\" id=\"row-city\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.city\"></data-form-errors>\n" +
+    "                    <label for=\"city\" id=\"label-city\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        City\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input class=\"form-control\" id=\"city\" name=\"city\" type=\"text\" ng-model=\"$ctrl.user.city\">\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\" id=\"row-notifications\">\n" +
+    "                    <data-form-errors errors=\"$ctrl.profileForm.ae_validation.notifications\"></data-form-errors>\n" +
+    "                    <label for=\"notifications\" id=\"label-notifications\" class=\"control-label col-sm-4 col-lg-3\">\n" +
+    "                        Account notifications\n" +
+    "                    </label>\n" +
+    "                    <div class=\"col-sm-8 col-lg-9\">\n" +
+    "                        <input checked class=\"form-control\" id=\"notifications\" name=\"notifications\" type=\"checkbox\" ng-model=\"$ctrl.user.notifications\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "\n" +
     "                <div class=\"form-group\" id=\"row-submit\">\n" +
     "                    <label for=\"submit\" id=\"label-submit\" class=\"control-label col-sm-4 col-lg-3\">\n" +
     "                    </label>\n" +
     "                    <div class=\"col-sm-8 col-lg-9\">\n" +
-    "                        <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"{{$state.params.userId ? 'Update' : 'Add'}} User\">\n" +
+    "                        <input class=\"form-control btn btn-primary\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"Update Account\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "            </form>\n" +
     "        </div>\n" +
     "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('directives/permissions/permissions.html',
+    "<div class=\"panel panel-default\">\n" +
+    "    <div class=\"panel-heading\">\n" +
+    "        <h3 class=\"panel-title\">Permissions</h3>\n" +
+    "    </div>\n" +
+    "    <div class=\"panel-body\">\n" +
+    "        <p>Here you can <strong>set permissions</strong> for others to access your app data.</p>\n" +
     "\n" +
+    "        <p>For example you can let other staff member view or alter error reports.</p>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\" ng-if=\"user.user.id\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">Permission Summary</h3>\n" +
-    "        </div>\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <h3>Direct application permissions</h3>\n" +
+    "        <div ng-if=\"permissions.possibleGroups.length > 0\">\n" +
+    "            <h3>Group permissions</h3>\n" +
     "\n" +
     "            <ul class=\"list-group\">\n" +
-    "                <li ng-repeat=\"perm in user.resourcePermissions.user.application\" class=\"animate-repeat list-group-item\">\n" +
-    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
-    "                    <div class=\"pull-right\">\n" +
-    "\n" +
-    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
-    "\n" +
-    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Application\" data-ui-sref=\"applications.update({resourceId:perm.self.resource_id})\">\n" +
-    "                            <span class=\"fa fa-cog\"></span>\n" +
-    "                        </a>\n" +
+    "                <li ng-repeat=\"perm in permissions.currentPermissions.group\" class=\"animate-repeat list-group-item\">\n" +
+    "                    <strong>{{ perm.self.group_name }}</strong>\n" +
+    "                    <div  ng-repeat=\"perm_name in perm.permissions\" class=\"pull-right animate-repeat m-l-1\">\n" +
+    "                        <span ng-if=\"perm_name == '__all_permissions__'\">Resource owner</span>\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\" ng-if=\"perm_name != '__all_permissions__'\">\n" +
+    "                            <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> {{ perm_name }}</a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"permissions.removeGroupPermission(perm_name, perm)\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
     "                    </div>\n" +
     "                </li>\n" +
     "            </ul>\n" +
     "\n" +
-    "            <h3>Direct dashboard permissions</h3>\n" +
-    "\n" +
-    "            <ul class=\"list-group\">\n" +
-    "                <li ng-repeat=\"perm in user.resourcePermissions.user.dashboard\" class=\"animate-repeat list-group-item\">\n" +
-    "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
-    "                    <div class=\"pull-right\">\n" +
+    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"permissions.setGroupPermission()\">\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <select class=\"form-control\" ng-model=\"permissions.form.selectedGroup\" ng-options=\"g.id as g.group_name for g in permissions.possibleGroups\"></select>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <span ng-repeat=\"permission in permissions.possiblePermissions\">\n" +
+    "                    <input type=\"checkbox\" ng-model=\"permissions.form.selectedGroupPermissions[permission]\"> {{ permission }}\n" +
+    "                    </span>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <button class=\"btn btn-info\"><span class=\"fa fa-user\"></span> Give permission</button>\n" +
+    "                </div>\n" +
+    "            </form>\n" +
     "\n" +
-    "                        <span class=\"btn btn-primary btn-xs m-r-1\" disabled ng-repeat=\"perm_name in perm.permissions\">{{ perm.self.owner ? 'Resource owner' : perm_name }}</span>\n" +
+    "        </div>\n" +
     "\n" +
-    "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Dashboard\" data-ui-sref=\"dashboard.update({resourceId:perm.self.resource_id})\">\n" +
-    "                            <span class=\"fa fa-cog\"></span>\n" +
-    "                        </a>\n" +
+    "        <h3>User permissions</h3>\n" +
+    "        <div>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li ng-repeat=\"perm in permissions.currentPermissions.user\" class=\"animate-repeat list-group-item\">\n" +
+    "                    <strong>{{ perm.self.user_name }}</strong>\n" +
+    "                    <div ng-repeat=\"perm_name in perm.permissions\" class=\"pull-right animate-repeat m-l-1\">\n" +
+    "                        <span ng-if=\"perm_name == '__all_permissions__'\">Resource owner</span>\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\" ng-if=\"perm_name != '__all_permissions__'\">\n" +
+    "                            <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span> {{ perm_name }}</a>\n" +
+    "                          <ul class=\"dropdown-menu\">\n" +
+    "                              <li><a>No</a></li>\n" +
+    "                              <li><a ng-click=\"permissions.removeUserPermission(perm_name,perm)\">Yes</a></li>\n" +
+    "                          </ul>\n" +
+    "                        </span>\n" +
     "                    </div>\n" +
     "                </li>\n" +
     "            </ul>\n" +
-    "\n" +
     "        </div>\n" +
+    "        <div>\n" +
+    "            <p>First enter username or full email of person you want to give access to (the person needs to be <strong>already registered in AppEnlight</strong>)</p>\n" +
     "\n" +
+    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"permissions.setUserPermission()\">\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <input type=\"text\" class=\"autocomplete form-control\" placeholder=\"Search for user/email\" ng-model=\"permissions.form.autocompleteUser\"\n" +
+    "                           uib-typeahead=\"u.user for u in permissions.searchUsers($viewValue) | limitTo:8\" typeahead-loading=\"permissions.searchingUsers\" typeahead-wait-ms=\"250\"\n" +
+    "                           typeahead-template-url=\"templates/directives/user_search_type_ahead.html\"\n" +
+    "                    />\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <span ng-repeat=\"permission in permissions.possiblePermissions\">\n" +
+    "                    <input type=\"checkbox\" ng-model=\"permissions.form.selectedUserPermissions[permission]\"> {{ permission }}\n" +
+    "                    </span>\n" +
+    "                </div>\n" +
+    "                <div class=\"form-group\">\n" +
+    "                    <button class=\"btn btn-info\" ng-disabled=\"!permissions.form.autocompleteUser\"><span class=\"fa fa-user\"></span> Give permission</button>\n" +
+    "                </div>\n" +
+    "            </form>\n" +
+    "        </div>\n" +
     "    </div>\n" +
-    "\n" +
-    "\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('templates/admin/users/users_list.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"users.loading.users\"></ng-include>\n" +
-    "\n" +
-    "<div ng-show=\"!users.loading.users\">\n" +
-    "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            {{users.activeUsers}} active out of {{users.users.length}} users\n" +
+  $templateCache.put('directives/plugin_config/plugin_config.html',
+    "<div ng-repeat=\"tmpl in plugin_ctrlr.inclusions track by $index\">\n" +
+    "    <div><strong>Plugin: {{tmpl.name}}</strong></div>\n" +
+    "    <ng-include src=\"tmpl.template\"></ng-include>\n" +
+    "    <hr/>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('directives/postprocess_action/postprocess_action.html',
+    "<div class=\"panel panel-default action\">\n" +
+    "    <div class=\"panel-body form-inline\">\n" +
+    "        <div class=\"pull-right\">\n" +
+    "            <span class=\"dropdown\" data-uib-dropdown>\n" +
+    "                <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                  <ul class=\"dropdown-menu\">\n" +
+    "                      <li><a>No</a></li>\n" +
+    "                      <li><a ng-click=\"ctrl.deleteAction(ctrl.action)\">Yes</a></li>\n" +
+    "                  </ul>\n" +
+    "            </span>\n" +
     "        </div>\n" +
     "\n" +
+    "        <div class=\"form-group\">\n" +
+    "        <label>Action</label>\n" +
     "\n" +
-    "        <table st-table=\"displayedCollection\" st-safe-src=\"users.users\" class=\"table table-striped\">\n" +
-    "            <thead>\n" +
-    "            <tr>\n" +
-    "                <th class=\"user_name\" st-sort=\"user_name\"><a>Username</a></th>\n" +
-    "                <th class=\"email\" st-sort=\"email\"><a>Email</a></th>\n" +
-    "                <th class=\"status\" st-sort=\"status\"><a>Status</a></th>\n" +
-    "                <th st-sort=\"first_name\"><a>First Name</a></th>\n" +
-    "                <th st-sort=\"last_name\"><a>Last Name</a></th>\n" +
-    "                <th st-sort=\"last_login_date\"><a>Last login</a></th>\n" +
-    "                <th class=\"options\"></th>\n" +
-    "            </tr>\n" +
-    "            <tr>\n" +
-    "                <th><input st-search=\"user_name\" placeholder=\"search for user name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th><input st-search=\"email\" placeholder=\"search for email\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th></th>\n" +
-    "                <th><input st-search=\"first_name\" placeholder=\"search for first name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th><input st-search=\"last_name\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th><input st-search=\"last_login_date\" placeholder=\"search for last name\" class=\"form-control\" type=\"search\" st-delay=\"1\"/></th>\n" +
-    "                <th></th>\n" +
-    "            </tr>\n" +
-    "            </thead>\n" +
-    "            <tbody>\n" +
-    "\n" +
-    "            <tr ng-repeat=\"user in displayedCollection track by user.id\">\n" +
-    "                <td><img src=\"{{user.gravatar_url}}\" class=\"avatar\"> {{user.user_name}}</td>\n" +
-    "                <td class=\"word-wrap small\">{{user.email}}</td>\n" +
-    "                <td class=\"text-center\"><span class=\"fa\" ng-class=\"{'fa-check-circle':user.status, 'fa-times':!user.status}\"></span></td>\n" +
-    "                <td class=\"word-wrap small\">{{user.first_name}}</td>\n" +
-    "                <td class=\"word-wrap small\">{{user.last_name}}</td>\n" +
-    "                <td><span data-uib-tooltip=\"{{user.last_login_date}}\" class=\"small\">{{user.last_login_date | isoToRelativeTime}}</span></td>\n" +
-    "                <td>\n" +
-    "                    <a class=\"btn btn-default btn-sm\" data-ui-sref=\"admin.user.update({userId:user.id})\"><span class=\"fa fa-cog\"></span></a>\n" +
-    "                    <span class=\"dropdown\" data-uib-dropdown on-toggle=\"toggled(open)\">\n" +
-    "                        <a class=\"btn btn-danger btn-sm\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
-    "                      <ul class=\"dropdown-menu\">\n" +
-    "                          <li><a>No</a></li>\n" +
-    "                          <li><a ng-click=\"users.removeUser(user)\">Yes</a></li>\n" +
-    "                      </ul>\n" +
-    "                    </span>\n" +
-    "            </tr>\n" +
-    "            <tfoot>\n" +
-    "            <tr>\n" +
-    "                <td colspan=\"6\" class=\"text-center\">\n" +
-    "                    <div st-pagination=\"\" st-items-by-page=\"100\" st-displayed-pages=\"7\"></div>\n" +
-    "                </td>\n" +
-    "            </tr>\n" +
-    "            </tfoot>\n" +
-    "            </tbody>\n" +
-    "        </table>\n" +
+    "        <div class=\"form-group\">\n" +
+    "            <select class=\"form-control\" ng-model=\"ctrl.action.new_value\" ng-options=\"f[0] as f[1] for f in ctrl.possibleActions\" ng-change=\"ctrl.setDirty()\"></select>\n" +
+    "        </div>\n" +
     "\n" +
+    "        <a class=\"btn btn-success\" ng-if=\"ctrl.action.dirty\" ng-click=\"ctrl.saveAction()\"><span class=\"fa fa-save\"></span> &nbsp;Save changes</a>\n" +
     "\n" +
+    "        </div>\n" +
+    "        <hr/>\n" +
+    "        <p>Meeting following criteria:</p>\n" +
+    "        <form-errors errors=\"ctrl.errors\"></form-errors>\n" +
+    "        {{ctrl.rule}}\n" +
+    "        <rule rule=\"ctrl.action.rule\" rule-definitions=\"ctrl.ruleDefinitions\" parent-rule=\"null\" parent-obj=\"ctrl.action\"></rule>\n" +
     "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('templates/directives/search_type_ahead.html',
-    "<a>\n" +
-    "    <span class=\"tag\" ng-show=\"match.model.tag\">{{match.model.tag}}</span>\n" +
-    "    <span class=\"tag\" ng-show=\"!match.model.tag\">{{match.label}}</span>\n" +
-    "    <span ng-show=\"match.model.example\">-</span> <span class=\"example\">{{match.model.example}}</span>\n" +
-    "    <div class=\"description\">{{match.model.description}}</div>\n" +
+  $templateCache.put('directives/report_alert_action/report_alert_action.html',
+    "<div class=\"panel panel-default action\">\n" +
+    "    <div class=\"panel-body form-inline\">\n" +
+    "        <div class=\"pull-right\">\n" +
+    "            <span class=\"dropdown\" data-uib-dropdown>\n" +
+    "                <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                  <ul class=\"dropdown-menu\">\n" +
+    "                      <li><a>No</a></li>\n" +
+    "                      <li><a ng-click=\"ctrl.deleteAction(ctrl.actions, ctrl.action)\">Yes</a></li>\n" +
+    "                  </ul>\n" +
+    "            </span>\n" +
+    "        </div>\n" +
     "\n" +
-    "</a>\n"
-  );
-
-
-  $templateCache.put('templates/directives/user_search_type_ahead.html',
-    "<a>\n" +
-    "    <span>{{match.label}}</span> -\n" +
-    "    <span class=\"color-secondary\">{{match.model.name}}</span>\n" +
-    "</a>\n"
-  );
-
+    "        <div class=\"form-group\">\n" +
+    "            <label>Applies to</label>\n" +
+    "        <select class=\"form-control\" ng-model=\"ctrl.action.resource_id\" ng-options=\"f.resource_id as f.resource_name for f in ctrl.applications\" ng-change=\"ctrl.setDirty()\">\n" +
+    "            <option value=\"\">All Resources</option>\n" +
+    "        </select>\n" +
+    "        </div>\n" +
+    "        <div class=\"form-group\">\n" +
+    "        <label>Notify</label>\n" +
+    "        <select class=\"form-control\" ng-model=\"ctrl.action.action\" ng-change=\"ctrl.setDirty()\" ng-options=\"f[0] as f[1] for f in ctrl.possibleNotifications\"></select>\n" +
+    "\n" +
+    "            <a class=\"btn btn-success\" ng-if=\"ctrl.action.dirty\" ng-click=\"ctrl.saveAction()\"><span class=\"fa fa-save\"></span> &nbsp;Save changes</a>\n" +
+    "\n" +
+    "        </div>\n" +
+    "        <div>\n" +
+    "            <p><strong>Channels:</strong></p>\n" +
+    "            <ul class=\"list-group\">\n" +
+    "                <li class=\"list-group-item\" ng-repeat=\"channel in ctrl.action.channels\">\n" +
+    "                    <strong>{{channel.channel_visible_value}}</strong>\n" +
+    "                    <div class=\"pull-right\">\n" +
+    "                        <span class=\"dropdown\" data-uib-dropdown>\n" +
+    "                            <a class=\"btn btn-danger btn-xs\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                              <ul class=\"dropdown-menu\">\n" +
+    "                                  <li><a>No</a></li>\n" +
+    "                                  <li><a ng-click=\"ctrl.unBindChannel(channel)\">Yes</a></li>\n" +
+    "                              </ul>\n" +
+    "                        </span>\n" +
+    "                    </div>\n" +
+    "                </li>\n" +
+    "            </ul>\n" +
+    "            <div class=\"form-group\" ng-if=\"ctrl.possibleChannels.length\">\n" +
+    "                <select class=\"form-control\" ng-model=\"ctrl.channelToBind\" ng-options=\"c as c.channel_visible_value for c in ctrl.possibleChannels |filter: c.supports_report_alerting\"></select>\n" +
+    "                <a class=\"btn btn-info\" ng-click=\"ctrl.bindChannel(channel, ctrl.action)\"><span class=\"fa fa-plus-circle\"></span> Add Channel</a>\n" +
+    "            </div>\n" +
+    "            <div class=\"alert alert-danger\" ng-if=\"!ctrl.possibleChannels.length\">\n" +
+    "                <span class=\"fa fa-exclamation-triangle \"></span>You need to create an alert channel before you can assign it to your rule.\n" +
+    "            </div>\n" +
+    "\n" +
+    "        </div>\n" +
+    "        <hr/>\n" +
+    "        <p>Meeting following criteria:</p>\n" +
+    "        <form-errors errors=\"ctrl.errors\"></form-errors>\n" +
+    "        <rule rule=\"ctrl.action.rule\" rule-definitions=\"ctrl.ruleDefinitions\" parent-rule=\"null\" parent-obj=\"ctrl.action\"></rule>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('directives/rule_read_only/rule_read_only.html',
+    "<div class=\"rule-read-only\">\n" +
+    "\n" +
+    "    <span class=\"form-group\">\n" +
+    "        {{rule_ctrlr.readOnlyPossibleFields[rule_ctrlr.rule.field]}}\n" +
+    "    </span>\n" +
+    "\n" +
+    "    <span ng-if=\"rule_ctrlr.rule.field != '__AND__' && rule_ctrlr.rule.field !='__OR__' && rule_ctrlr.rule.field !='__NOT__'\">\n" +
+    "          is {{rule_ctrlr.ruleDefinitions.allOps[rule_ctrlr.rule.op]}}  {{rule_ctrlr.rule.value}}\n" +
+    "    </span>\n" +
+    "\n" +
+    "    <span ng-if=\"rule_ctrlr.rule.field == '__AND__' || rule_ctrlr.rule.field =='__OR__' || rule_ctrlr.rule.field =='__NOT__'\">\n" +
+    "        <p ng-if=\"parent\"><strong>Subrules</strong></p>\n" +
+    "        <div ng-repeat=\"subrule in rule_ctrlr.rule.rules\" class=\"m-l-2\">\n" +
+    "\n" +
+    "            <div class=\"panel panel-default\">\n" +
+    "                <div class=\"panel-body form-inline\">\n" +
+    "                    <recursive>\n" +
+    "                        <rule-read-only rule=\"subrule\" rule-definitions=\"rule_ctrlr.ruleDefinitions\" parent-rule=\"null\" parent-obj=\"rule_ctrlr.parentObj\"></rule-read-only>\n" +
+    "                    </recursive>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </div>\n" +
+    "\n" +
+    "    </span>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('directives/rule/rule.html',
+    "<div class=\"rule form-inline\">\n" +
+    "\n" +
+    "    <div class=\"form-group\">\n" +
+    "        <select class=\"form-control\"\n" +
+    "                ng-model=\"rule_ctrlr.rule.field\"\n" +
+    "                ng-change=\"rule_ctrlr.fieldChange()\"\n" +
+    "                ng-options=\"key as label for (key, label) in rule_ctrlr.ruleDefinitions.possibleFields\"></select>\n" +
+    "    </div>\n" +
+    "\n" +
+    "    <div ng-if=\"rule_ctrlr.rule.field != '__AND__' && rule_ctrlr.rule.field !='__OR__' && rule_ctrlr.rule.field !='__NOT__'\" class=\"form-group\">\n" +
+    "\n" +
+    "            <select ng-model=\"rule_ctrlr.rule.op\" class=\"form-control\"\n" +
+    "                    ng-change=\"rule_ctrlr.setDirty()\"\n" +
+    "                    ng-options=\"op as rule_ctrlr.ruleDefinitions.allOps[op] for op in rule_ctrlr.ruleDefinitions.fieldOps[rule_ctrlr.rule.field]\">\n" +
+    "            </select>\n" +
+    "\n" +
+    "        <input type=\"text\" placeholder=\"Value\" ng-model=\"rule_ctrlr.rule.value\" ng-change=\"rule_ctrlr.setDirty()\" class=\"form-control\">\n" +
+    "\n" +
+    "    </div>\n" +
+    "\n" +
+    "    <span ng-if=\"rule_ctrlr.rule.field == '__AND__' || rule_ctrlr.rule.field =='__OR__' || rule_ctrlr.rule.field =='__NOT__'\">\n" +
+    "        <p ng-if=\"parent\"><strong>Subrules</strong></p>\n" +
+    "        <div ng-repeat=\"subrule in rule_ctrlr.rule.rules\" class=\"m-l-2\">\n" +
+    "            <div class=\"panel panel-default\">\n" +
+    "                <div class=\"panel-body form-inline\">\n" +
+    "                    <recursive>\n" +
+    "                        <rule rule=\"subrule\" rule-definitions=\"rule_ctrlr.ruleDefinitions\" parent-rule=\"rule_ctrlr.rule\" parent-obj=\"rule_ctrlr.parentObj\"></rule>\n" +
+    "                    </recursive>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </div>\n" +
+    "\n" +
+    "        <span ng-if=\"(rule_ctrlr.config.disable_subrules == false) == false\" class=\"btn btn-info\" ng-click=\"rule_ctrlr.add()\"><span class=\"fa fa-plus-circle\"></span> Add rule</span>\n" +
+    "\n" +
+    "    </span>\n" +
+    "    <div class=\"pull-right\" ng-if=\"rule_ctrlr.parentRule\">\n" +
+    "            <span class=\"dropdown\" data-uib-dropdown>\n" +
+    "                <a class=\"btn btn-danger\" data-uib-dropdown-toggle><span class=\"fa fa-trash-o\"></span></a>\n" +
+    "                  <ul class=\"dropdown-menu\">\n" +
+    "                      <li><a>No</a></li>\n" +
+    "                      <li><a  ng-click=\"rule_ctrlr.deleteRule(rule_ctrlr.parentRule, rule_ctrlr.rule)\">Yes</a></li>\n" +
+    "                  </ul>\n" +
+    "            </span>\n" +
+    "    </div>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('templates/directives/search_type_ahead.html',
+    "<a>\n" +
+    "    <span class=\"tag\" ng-show=\"match.model.tag\">{{match.model.tag}}</span>\n" +
+    "    <span class=\"tag\" ng-show=\"!match.model.tag\">{{match.label}}</span>\n" +
+    "    <span ng-show=\"match.model.example\">-</span> <span class=\"example\">{{match.model.example}}</span>\n" +
+    "    <div class=\"description\">{{match.model.description}}</div>\n" +
+    "\n" +
+    "</a>\n"
+  );
+
+
+  $templateCache.put('templates/directives/user_search_type_ahead.html',
+    "<a>\n" +
+    "    <span>{{match.label}}</span> -\n" +
+    "    <span class=\"color-secondary\">{{match.model.name}}</span>\n" +
+    "</a>\n"
+  );
+
 
   $templateCache.put('templates/integrations/bitbucket.html',
     "      <div class=\"modal-header\">\n" +
@@ -7323,23 +7318,26 @@ function ChannelstreamController($rootScope, stateHolder, userSelfPropertyResour
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.integrationsListView', [])
-    .component('integrationsListView', {
-        templateUrl: 'components/views/applications-integrations-view/applications-integrations-view.html',
-        controller: IntegrationsListViewController
+angular.module('appenlight.components.adminApplicationsListView', [])
+    .component('adminApplicationsListView', {
+        templateUrl: 'components/views/admin-applications-list-view/admin-applications-list-view.html',
+        controller: AdminApplicationsListController
     });
 
-IntegrationsListViewController.$inject = ['$state', 'applicationsResource'];
+AdminApplicationsListController.$inject = ['applicationsResource'];
 
-function IntegrationsListViewController($state, applicationsResource) {
+function AdminApplicationsListController(applicationsResource) {
     
     var vm = this;
-    vm.loading = {application: true};
-    vm.resource = applicationsResource.get({resourceId: $state.params.resourceId}, function (data) {
-        vm.loading.application = false;
-        $state.current.data.resource = vm.resource;
+    vm.loading = {applications: true};
+
+    vm.applications = applicationsResource.query({
+        root_list: true,
+        resource_type: 'application'
+    }, function (data) {
+        vm.loading = {applications: false};
     });
-}
+};
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -7360,23 +7358,48 @@ function IntegrationsListViewController($state, applicationsResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.applicationsListView', [])
-    .component('applicationsListView', {
-        templateUrl: 'components/views/applications-list-view/applications-list-view.html',
-        controller: ApplicationsListViewController
+angular.module('appenlight.components.adminConfigurationView', [])
+    .component('adminConfigurationView', {
+        templateUrl: 'components/views/admin-configuration-view/admin-configuration-view.html',
+        controller: AdminConfigurationViewController
     });
 
-ApplicationsListViewController.$inject = ['$state', 'applicationsResource'];
+AdminConfigurationViewController.$inject = ['configsResource', 'configsNoIdResource'];
 
-function ApplicationsListViewController($state, applicationsResource) {
-    
+function AdminConfigurationViewController(configsResource, configsNoIdResource) {
     var vm = this;
-    vm.$state = $state;
-    vm.loading = {applications: true};
-    vm.applications = applicationsResource.query(null, function(){
-        vm.loading.applications = false;
-    });
-}
+    vm.loading = {config: true};
+
+    var filters = [
+        'template_footer_html:global',
+        'list_groups_to_non_admins:global',
+        'per_application_reports_rate_limit:global',
+        'per_application_logs_rate_limit:global',
+        'per_application_metrics_rate_limit:global',
+    ];
+
+    vm.configs = {};
+
+    vm.configList = configsResource.query({filter: filters},
+        function (data) {
+            vm.loading = {config: false};
+            _.each(data, function (item) {
+                if (vm.configs[item.section] === undefined) {
+                    vm.configs[item.section] = {};
+                }
+                vm.configs[item.section][item.key] = item;
+            });
+        });
+
+    vm.save = function () {
+        vm.loading.config = true;
+        _.each(vm.configList, function (item) {
+            item.$save();
+        });
+        vm.loading.config = false;
+    };
+
+};
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -7397,51 +7420,133 @@ function ApplicationsListViewController($state, applicationsResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.applicationsPurgeLogsView', [])
-    .component('applicationsPurgeLogsView', {
-        templateUrl: 'components/views/applications-purge-logs-view/applications-purge-logs-view.html',
-        controller: applicationsPurgeLogsViewController
+angular.module('appenlight.components.adminGroupsCreateView', [])
+    .component('adminGroupsCreateView', {
+        templateUrl: 'components/views/admin-groups-create-view/admin-groups-create-view.html',
+        controller: AdminGroupsCreateViewController
     });
 
-applicationsPurgeLogsViewController.$inject = ['$state' ,'applicationsResource', 'sectionViewResource', 'logsNoIdResource'];
+AdminGroupsCreateViewController.$inject = ['$state', 'groupsResource', 'groupsPropertyResource', 'sectionViewResource'];
 
-function applicationsPurgeLogsViewController($state, applicationsResource, sectionViewResource, logsNoIdResource) {
+function AdminGroupsCreateViewController($state, groupsResource, groupsPropertyResource, sectionViewResource) {
     
     var vm = this;
     vm.$state = $state;
-    vm.loading = {applications: true};
+    vm.loading = {
+        group: false,
+        resource_permissions: false,
+        users: false
+    };
 
-    vm.namespace = null;
-    vm.selectedResource = null;
-    vm.commonNamespaces = [];
+    vm.form = {
+        autocompleteUser: '',
+    }
 
-    vm.applications = applicationsResource.query({'type':'update_reports'}, function () {
-        vm.loading.applications = false;
-        vm.selectedResource = vm.applications[0].resource_id;
-        vm.getCommonKeys();
-    });
 
-    /**
-     * Fetches most commonly used tags in logs
-     */
-    vm.getCommonKeys = function () {
-        sectionViewResource.get({
-            section: 'logs_section',
-            view: 'common_tags',
-            resource: vm.selectedResource
-        }, function (data) {
-            vm.commonNamespaces = data['namespaces']
+    if (typeof $state.params.groupId !== 'undefined') {
+        vm.loading.group = true;
+        var groupId = $state.params.groupId;
+        vm.group = groupsResource.get({groupId: groupId}, function (data) {
+            vm.loading.group = false;
         });
-    };
 
-    vm.purgeLogs = function () {
-        vm.loading.applications = true;
-        logsNoIdResource.delete({resource:vm.selectedResource,
-            namespace: vm.namespace}, function(){
-            vm.loading.applications = false;
-        });
-    }
-}
+        vm.resource_permissions = groupsPropertyResource.query(
+            {groupId: groupId, key: 'resource_permissions'}, function (data) {
+                vm.loading.resource_permissions = false;
+                var tmpObj = {
+                    'group': {
+                        'application': {},
+                        'dashboard': {}
+                    }
+                };
+                _.each(data, function (item) {
+                    
+                    var section = tmpObj[item.type][item.resource_type];
+                    if (typeof section[item.resource_id] == 'undefined') {
+                        section[item.resource_id] = {
+                            self: item,
+                            permissions: []
+                        }
+                    }
+                    section[item.resource_id].permissions.push(item.perm_name);
+
+                });
+                vm.resourcePermissions = tmpObj;
+            });
+
+        vm.users = groupsPropertyResource.query(
+            {groupId: groupId, key: 'users'}, function (data) {
+                vm.loading.users = false;
+            }, function () {
+                vm.loading.users = false;
+            });
+
+    }
+    else {
+        var groupId = null;
+    }
+
+    var formResponse = function (response) {
+        if (response.status === 422) {
+            setServerValidation(vm.groupForm, response.data);
+        }
+        vm.loading.group = false;
+    };
+
+    vm.createGroup = function () {
+        vm.loading.group = true;
+        if (groupId) {
+            groupsResource.update({groupId: vm.group.id}, vm.group, function (data) {
+                setServerValidation(vm.groupForm);
+                vm.loading.group = false;
+            }, formResponse);
+        }
+        else {
+            groupsResource.save(vm.group, function (data) {
+                $state.go('admin.group.update', {groupId: data.id});
+            }, formResponse);
+        }
+    };
+
+    vm.removeUser = function (user) {
+        groupsPropertyResource.delete(
+            {groupId: groupId, key: 'users', user_name: user.user_name},
+            function (data) {
+                vm.loading.users = false;
+                vm.users = _.filter(vm.users, function (item) {
+                    return item != user;
+                });
+            }, function () {
+                vm.loading.users = false;
+            });
+    };
+
+    vm.addUser = function () {
+        groupsPropertyResource.save(
+            {groupId: groupId, key: 'users'},
+            {user_name: vm.form.autocompleteUser},
+            function (data) {
+                vm.loading.users = false;
+                vm.users.push(data);
+                vm.form.autocompleteUser = '';
+            }, function () {
+                vm.loading.users = false;
+            });
+    }
+
+    vm.searchUsers = function (searchPhrase) {
+        
+        return sectionViewResource.query({
+            section: 'users_section',
+            view: 'search_users',
+            'user_name': searchPhrase
+        }).$promise.then(function (data) {
+                return _.map(data, function (item) {
+                    return item.user;
+                });
+            });
+    }
+};
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -7462,156 +7567,45 @@ function applicationsPurgeLogsViewController($state, applicationsResource, secti
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.applicationsUpdateView', [])
-    .component('applicationsUpdateView', {
-        templateUrl: 'components/views/applications-update-view/applications-update-view.html',
-        controller: applicationsUpdateViewController
+angular.module('appenlight.components.adminGroupsListView', [])
+    .component('adminGroupsListView', {
+        templateUrl: 'components/views/admin-groups-list-view/admin-groups-list-view.html',
+        controller: AdminGroupsListViewController
     });
 
-applicationsUpdateViewController.$inject = ['$state', 'applicationsNoIdResource', 'applicationsResource', 'applicationsPropertyResource', 'stateHolder'];
+AdminGroupsListViewController.$inject = ['$state', 'groupsResource'];
 
-function applicationsUpdateViewController($state, applicationsNoIdResource, applicationsResource, applicationsPropertyResource, stateHolder) {
-    'use strict';
+function AdminGroupsListViewController($state, groupsResource) {
     
     var vm = this;
     vm.$state = $state;
-    vm.loading = {application: false};
-
-    vm.groupingOptions = [
-        ['url_type', 'Error Type + location'],
-        ['url_traceback', 'Traceback + location'],
-        ['traceback_server', 'Traceback + Server'],
-    ];
-    var resourceId = $state.params.resourceId;
-    var options = {};
-    vm.momentJs = moment;
-    vm.formTransferModel = {password:''};
-
-    // set initial data
-
-    if (resourceId === 'new') {
-        vm.resource = {
-            resource_id: null,
-            slow_report_threshold: 10,
-            error_report_threshold: 10,
-            allow_permanent_storage: true,
-            default_grouping: vm.groupingOptions[1][0]
-        };
-    }
-    else {
-        vm.loading.application = true;
-        vm.resource = applicationsResource.get({
-            'resourceId': resourceId
-        }, function (data) {
-            vm.loading.application = false;
-        });
-    }
-
-
-    vm.updateBasicForm = function () {
-        vm.loading.application = true;
-        if (vm.resource.resource_id === null) {
-            applicationsNoIdResource.save(null, vm.resource, function (data) {
-                stateHolder.AeUser.addApplication(data);
-                $state.go('applications.update', {resourceId: data.resource_id});
-                setServerValidation(vm.BasicForm);
-            }, function (response) {
-                if (response.status == 422) {
-                    setServerValidation(vm.BasicForm, response.data);
-                }
-                vm.loading.application = false;
-                
-            });
-        }
-        else {
-            applicationsResource.update({resourceId: vm.resource.resource_id},
-                vm.resource, function (data) {
-                    vm.resource = data;
-                    vm.loading.application = false;
-                    setServerValidation(vm.BasicForm);
-                }, function (response) {
-                    if (response.status == 422) {
-                        setServerValidation(vm.BasicForm, response.data);
-                    }
-                    vm.loading.application = false;
-                });
-        }
-    };
-
-    vm.addRule = function () {
-        
-        applicationsPropertyResource.save({
-                resourceId: vm.resource.resource_id,
-                key: 'postprocessing_rules'
-            }, null,
-            function (data) {
-                vm.resource.postprocessing_rules.push(data);
-            }
-        );
-    };
+    vm.loading = {groups: true};
 
-    vm.regenerateAPIKeys = function(){
-        vm.loading.application = true;
-        applicationsPropertyResource.save({
-                resourceId: vm.resource.resource_id,
-                key: 'api_key'
-            }, {password: vm.regenerateAPIKeysPassword},
-            function (data) {
-                vm.resource = data;
-                vm.loading.application = false;
-                vm.regenerateAPIKeysPassword = '';
-                setServerValidation(vm.regenerateAPIKeysForm);
-            },
-            function (response) {
-                if (response.status == 422) {
-                    setServerValidation(vm.regenerateAPIKeysForm, response.data);
-                    
-                }
-                vm.loading.application = false;
+    vm.groups = groupsResource.query({}, function (data) {
+        vm.loading = {groups: false};
+        vm.activeUsers = _.reduce(vm.groups, function(memo, val){
+            if (val.status == 1){
+                return memo + 1;
             }
-        )
-    };
+            return memo;
+        }, 0);
+        
+    });
 
-    vm.deleteApplication = function(){
-        vm.loading.application = true;
-        applicationsPropertyResource.update({
-                resourceId: vm.resource.resource_id,
-                key: 'delete_resource'
-            }, vm.formDeleteModel,
-            function (data) {
-                stateHolder.AeUser.removeApplicationById(vm.resource.resource_id);
-                $state.go('applications.list');
-            },
-            function (response) {
-                if (response.status == 422) {
-                    setServerValidation(vm.formDelete, response.data);
-                    
-                }
-                vm.loading.application = false;
-            }
-        );
-    };
 
-    vm.transferApplication = function(){
-        vm.loading.application = true;
-        applicationsPropertyResource.update({
-                resourceId: vm.resource.resource_id,
-                key: 'owner'
-            }, vm.formTransferModel,
-            function (data) {
-                $state.go('applications.list');
-            },
-            function (response) {
-                if (response.status == 422) {
-                    setServerValidation(vm.formTransfer, response.data);
-                    
+    vm.removeGroup = function (group) {
+        groupsResource.remove({groupId: group.id}, function (data, responseHeaders) {
+            
+            if (data) {
+                var index = vm.groups.indexOf(group);
+                if (index !== -1) {
+                    vm.groups.splice(index, 1);
+                    vm.activeGroups -= 1;
                 }
-                vm.loading.application = false;
             }
-        )
+        });
     }
-
-}
+};
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -7632,32 +7626,112 @@ function applicationsUpdateViewController($state, applicationsNoIdResource, appl
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.eventBrowserView', [])
-    .component('eventBrowserView', {
-        templateUrl: 'components/views/event-browser/event-browser.html',
-        controller: EventBrowserController
+angular.module('appenlight.components.adminPartitionsView', [])
+    .component('adminPartitionsView', {
+        templateUrl: 'components/views/admin-partitions-view/admin-partitions-view.html',
+        controller: AdminPartitionsViewController
     });
 
-EventBrowserController.$inject = ['eventsNoIdResource', 'eventsResource'];
+AdminPartitionsViewController.$inject = ['sectionViewResource'];
 
-function EventBrowserController(eventsNoIdResource, eventsResource) {
-    console.info('EventBrowserController');
+function AdminPartitionsViewController(sectionViewResource) {
     var vm = this;
+    vm.permanentPartitions = [];
+    vm.dailyPartitions = [];
+    vm.loading = {partitions: true};
+    vm.dailyChecked = false;
+    vm.permChecked = false;
+    vm.dailyConfirm = '';
+    vm.permConfirm = '';
 
-    vm.loading = {events: true};
 
-    vm.events = eventsNoIdResource.query(
-        {key: 'events'},
-        function (data) {
-            vm.loading.events = false;
-        });
+    vm.loadPartitions = function (data) {
+        var permanentPartitions = vm.transformPartitionList(
+            data.permanent_partitions);
+        var dailyPartitions = vm.transformPartitionList(
+            data.daily_partitions);
+        vm.permanentPartitions = permanentPartitions;
+        vm.dailyPartitions = dailyPartitions;
+        vm.loading = {partitions: false};
+    };
 
+    vm.setCheckedList = function (scope) {
+        var toTest = null;
+        if (scope === 'dailyPartitions'){
+            toTest = 'dailyChecked';
+        }
+        else{
+            toTest = 'permChecked';
+        }
 
-    vm.closeEvent = function (event) {
+        if (vm[toTest]) {
+            var val = true;
+        }
+        else {
+            var val = false;
+        }
         
-        eventsResource.update({eventId: event.id}, {status: 0}, function (data) {
-            event.status = 0;
+        _.each(vm[scope], function (item) {
+            _.each(item[1].pg, function (index) {
+                index.checked = val;
+            });
+            _.each(item[1].elasticsearch, function (index) {
+                index.checked = val;
+            });
+        });
+    }
+
+
+    vm.transformPartitionList = function (inputList) {
+        var outputList = [];
+
+        _.each(inputList, function (item) {
+            var time = [item[0], {
+                elasticsearch: [],
+                pg: []
+            }]
+            _.each(item[1].pg, function (index) {
+                time[1].pg.push({name: index, checked: false})
+            });
+            _.each(item[1].elasticsearch, function (index) {
+                time[1].elasticsearch.push({
+                    name: index,
+                    checked: false
+                })
+            });
+            outputList.push(time);
+        });
+        return outputList;
+    };
+
+    sectionViewResource.get({section:'admin_section', view: 'partitions'},
+        vm.loadPartitions);
+
+    vm.partitionsDelete = function (partitionType) {
+        var es_indices = [];
+        var pg_indices = [];
+        _.each(vm[partitionType], function (item) {
+            _.each(item[1].pg, function (index) {
+                if (index.checked) {
+                    pg_indices.push(index.name)
+                }
+            });
+            _.each(item[1].elasticsearch, function (index) {
+                if (index.checked) {
+                    es_indices.push(index.name)
+                }
+            });
         });
+        
+
+        vm.loading = {partitions: true};
+        sectionViewResource.save({section:'admin_section',
+            view: 'partitions_remove'}, {
+            es_indices: es_indices,
+            pg_indices: pg_indices,
+            confirm: 'CONFIRM'
+        }, vm.loadPartitions);
+
     }
 
 }
@@ -7681,652 +7755,324 @@ function EventBrowserController(eventsNoIdResource, eventsResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.indexDashboardView', [])
-    .component('indexDashboardView', {
-        templateUrl: 'components/views/index-dashboard/index-dashboard.html',
-        controller: IndexDashboardController
+angular.module('appenlight.components.adminSystemView', [])
+    .component('adminSystemView', {
+        templateUrl: 'components/views/admin-system-view/admin-system-view.html',
+        controller: AdminSystemViewController
     });
 
-IndexDashboardController.$inject = ['$rootScope', '$scope', '$location','$cookies', '$interval', 'stateHolder', 'applicationsPropertyResource', 'AeConfig'];
+AdminSystemViewController.$inject = ['sectionViewResource'];
 
-function IndexDashboardController($rootScope, $scope, $location, $cookies, $interval, stateHolder, applicationsPropertyResource, AeConfig) {
+function AdminSystemViewController(sectionViewResource) {
     var vm = this;
-    stateHolder.section = 'dashboard';
-    vm.timeOptions = {};
-    var allowed = ['1h', '4h', '12h', '24h', '1w', '2w', '1M'];
-    _.each(allowed, function (key) {
-        if (allowed.indexOf(key) !== -1) {
-            vm.timeOptions[key] = AeConfig.timeOptions[key];
-        }
+    vm.tables = [];
+    vm.loading = {system: true};
+    sectionViewResource.get({
+        section: 'admin_section',
+        view: 'system'
+    }, null, function (data) {
+        vm.DBtables = data.db_tables;
+        vm.ESIndices = data.es_indices;
+        vm.queueStats = data.queue_stats;
+        vm.systemLoad = data.system_load;
+        vm.packages = data.packages;
+        vm.processInfo = data.process_info;
+        vm.disks = data.disks;
+        vm.memory = data.memory;
+        vm.selfInfo = data.self_info;
+
+        vm.loading.system = false;
     });
-    vm.stateHolder = stateHolder;
-    vm.urls = AeConfig.urls;
-    vm.applications = stateHolder.AeUser.applications_map;
-    vm.show_dashboard = false;
-    vm.resource = null;
-    vm.graphType = {selected: null};
-    vm.timeSpan = vm.timeOptions['1h'];
-    vm.trendingReports = [];
-    vm.exceptions = 0;
-    vm.satisfyingRequests = 0;
-    vm.toleratedRequests = 0;
-    vm.frustratingRequests = 0;
-    vm.uptimeStats = 0;
-    vm.apdexStats = [];
-    vm.seriesRequestsData = [];
-    vm.seriesMetricsData = [];
-    vm.seriesSlowData = [];
-    vm.slowCalls = [];
-    vm.slowURIS = [];
+};
 
-    vm.reportChartConfig = {
-        data: {
-            json: [],
-            xFormat: '%Y-%m-%dT%H:%M:%S'
-        },
-        color: {
-            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
-        },
-        axis: {
-            x: {
-                type: 'timeseries',
-                tick: {
-                    culling: {
-                        max: 6 // the number of tick texts will be adjusted to less than this value
-                    },
-                    format: '%Y-%m-%d %H:%M'
-                }
-            },
-            y: {
-                tick: {
-                    count: 5,
-                    format: d3.format('.2s')
-                }
-            }
-        },
-        subchart: {
-            show: true,
-            size: {
-                height: 20
-            }
-        },
-        size: {
-            height: 250
-        },
-        zoom: {
-            rescale: true
-        },
-        grid: {
-            x: {
-                show: true
-            },
-            y: {
-                show: true
-            }
-        },
-        tooltip: {
-            format: {
-                title: function (d) {
-                    return '' + d;
-                },
-                value: function (v) {
-                    return v
-                }
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
+
+angular.module('appenlight.components.adminUsersCreateView', [])
+    .component('adminUsersCreateView', {
+        templateUrl: 'components/views/admin-users-create-view/admin-users-create-view.html',
+        controller: AdminUsersCreateViewController
+    });
+
+AdminUsersCreateViewController.$inject = ['$state', 'usersResource', 'usersPropertyResource', 'sectionViewResource', 'AeConfig'];
+
+function AdminUsersCreateViewController($state, usersResource, usersPropertyResource, sectionViewResource, AeConfig) {
+    
+    var vm = this;
+    vm.$state = $state;
+    vm.loading = {user: false};
+
+
+    if (typeof $state.params.userId !== 'undefined') {
+        vm.loading.user = true;
+        var userId = $state.params.userId;
+        vm.user = usersResource.get({userId: userId}, function (data) {
+            vm.loading.user = false;
+            // cast to true for angular checkbox
+            if (vm.user.status === 1) {
+                vm.user.status = true;
             }
-        }
-    };
-    vm.reportChartData = {};
+        });
 
-    vm.reportSlowChartConfig = {
-        data: {
-            json: [],
-            xFormat: '%Y-%m-%dT%H:%M:%S'
-        },
-        color: {
-            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
-        },
-        axis: {
-            x: {
-                type: 'timeseries',
-                tick: {
-                    culling: {
-                        max: 6 // the number of tick texts will be adjusted to less than this value
+        vm.resource_permissions = usersPropertyResource.query(
+            {userId: userId, key: 'resource_permissions'}, function (data) {
+                vm.loading.resource_permissions = false;
+                var tmpObj = {
+                    'user': {
+                        'application': {},
+                        'dashboard': {}
                     },
-                    format: '%Y-%m-%d %H:%M'
-                }
-            },
-            y: {
-                tick: {
-                    count: 5,
-                    format: d3.format('.2s')
-                }
-            }
-        },
-        subchart: {
-            show: true,
-            size: {
-                height: 20
-            }
-        },
-        size: {
-            height: 250
-        },
-        zoom: {
-            rescale: true
-        },
-        grid: {
-            x: {
-                show: true
-            },
-            y: {
-                show: true
-            }
-        },
-        tooltip: {
-            format: {
-                title: function (d) {
-                    return '' + d;
-                },
-                value: function (v) {
-                    return v
-                }
-            }
+                    'group': {
+                        'application': {},
+                        'dashboard': {}
+                    }
+                };
+                _.each(data, function (item) {
+                    
+                    var section = tmpObj[item.type][item.resource_type];
+                    if (typeof section[item.resource_id] == 'undefined'){
+                        section[item.resource_id] = {
+                            self:item,
+                            permissions: []
+                        }
+                    }
+                    section[item.resource_id].permissions.push(item.perm_name);
+
+                });
+                vm.resourcePermissions = tmpObj;
+            });
+
+    }
+    else {
+        var userId = null;
+        vm.user = {
+            status: true
         }
-    };
-    vm.reportSlowChartData = {};
+    }
 
-    vm.metricsChartConfig = {
-        data: {
-            json: [],
-            xFormat: '%Y-%m-%dT%H:%M:%S',
-            keys: {
-                x: 'x',
-                value: ["main", "sql", "nosql", "tmpl", "remote", "custom"]
-            },
-            names: {
-                main: 'View/Application logic',
-                sql: 'Relational database queries',
-                nosql: 'NoSql datastore calls',
-                tmpl: 'Template rendering',
-                custom: 'Custom timed calls',
-                remote: 'Requests to remote resources'
-            },
-            type: 'area',
-            groups: [["main", "sql", "nosql", "remote", "custom", "tmpl"]],
-            order: null
-        },
-        color: {
-            pattern: ['#6baed6', '#c7e9c0', '#fd8d3c', '#d6616b', '#ffcc00', '#c6dbef']
-        },
-        axis: {
-            x: {
-                type: 'timeseries',
-                tick: {
-                    culling: {
-                        max: 6 // the number of tick texts will be adjusted to less than this value
-                    },
-                    format: '%Y-%m-%d %H:%M'
-                }
-            },
-            y: {
-                tick: {
-                    count: 5,
-                    format: d3.format('.2f')
-                }
-            }
-        },
-        point: {
-            show: false
-        },
-        subchart: {
-            show: true,
-            size: {
-                height: 20
-            }
-        },
-        size: {
-            height: 350
-        },
-        zoom: {
-            rescale: true
-        },
-        grid: {
-            x: {
-                show: true
-            },
-            y: {
-                show: true
-            }
-        },
-        tooltip: {
-            format: {
-                title: function (d) {
-                    return '' + d;
-                },
-                value: function (v) {
-                    return v
-                }
-            }
+    var formResponse = function (response) {
+        if (response.status == 422) {
+            setServerValidation(vm.profileForm, response.data);
         }
-    };
-    vm.metricsChartData = {};
+        vm.loading.user = false;
+    }
 
-    vm.responseChartConfig = {
-        data: {
-            json: [],
-            xFormat: '%Y-%m-%dT%H:%M:%S'
-        },
-        color: {
-            pattern: ['#d6616b', '#6baed6', '#fd8d3c']
-        },
-        axis: {
-            x: {
-                type: 'timeseries',
-                tick: {
-                    culling: {
-                        max: 6 // the number of tick texts will be adjusted to less than this value
-                    },
-                    format: '%Y-%m-%d %H:%M'
-                }
-            },
-            y: {
-                tick: {
-                    count: 5,
-                    format: d3.format('.2f')
-                }
-            }
-        },
-        point: {
-            show: false
-        },
-        subchart: {
-            show: true,
-            size: {
-                height: 20
-            }
-        },
-        size: {
-            height: 350
-        },
-        zoom: {
-            rescale: true
-        },
-        grid: {
-            x: {
-                show: true
-            },
-            y: {
-                show: true
-            }
-        },
-        tooltip: {
-            format: {
-                title: function (d) {
-                    return '' + d;
-                },
-                value: function (v) {
-                    return v
-                }
-            }
+    vm.createUser = function () {
+        vm.loading.user = true;
+        
+        if (userId) {
+            usersResource.update({userId: vm.user.id}, vm.user, function (data) {
+                setServerValidation(vm.profileForm);
+                vm.loading.user = false;
+            }, formResponse);
         }
-    };
-    vm.responseChartData = {};
+        else {
+            usersResource.save(vm.user, function (data) {
+                $state.go('admin.user.update', {userId: data.id});
+            }, formResponse);
+        }
+    }
 
-    vm.requestsChartConfig = {
-        data: {
-            json: [],
-            xFormat: '%Y-%m-%dT%H:%M:%S'
-        },
-        color: {
-            pattern: ['#d6616b', '#6baed6', '#fd8d3c']
-        },
-        axis: {
-            x: {
-                type: 'timeseries',
-                tick: {
-                    culling: {
-                        max: 6 // the number of tick texts will be adjusted to less than this value
-                    },
-                    format: '%Y-%m-%d %H:%M'
-                }
-            },
-            y: {
-                tick: {
-                    count: 5,
-                    format: d3.format('.2f')
-                }
-            }
-        },
-        point: {
-            show: false
-        },
-        subchart: {
-            show: true,
-            size: {
-                height: 20
-            }
-        },
-        size: {
-            height: 350
-        },
-        zoom: {
-            rescale: true
-        },
-        grid: {
-            x: {
-                show: true
-            },
-            y: {
-                show: true
-            }
-        },
-        tooltip: {
-            format: {
-                title: function (d) {
-                    return '' + d;
-                },
-                value: function (v) {
-                    return v
-                }
-            }
+    vm.generatePassword = function () {
+        var length = 8;
+        var charset = "abcdefghijklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        vm.gen_pass = "";
+        for (var i = 0, n = charset.length; i < length; ++i) {
+            vm.gen_pass += charset.charAt(Math.floor(Math.random() * n));
         }
-    };
-    vm.requestsChartData = {};
-
-    vm.loading = {
-        'apdex': true,
-        'reports': true,
-        'graphs': true,
-        'slowCalls': true,
-        'slowURIS': true,
-        'requestsBreakdown': true,
-        'series': true
-    };
-    vm.stream = {paused: false, filtered: false, messages: [], reports: []};
+        vm.user.user_password = '' + vm.gen_pass;
+        
+    }
 
-    $rootScope.$on('channelstream-message.front_dashboard.new_topic', function(event, message){
-        var ws_report = message.message.report;
-        if (ws_report.http_status != 500) {
-            return
-        }
-        if (vm.stream.paused == true) {
-            return
-        }
-        if (vm.stream.filtered && ws_report.resource_id != vm.resource) {
-            return
-        }
-        var should_insert = true;
-        _.each(vm.stream.reports, function (report) {
-            if (report.report_id == ws_report.report_id) {
-                report.occurences = ws_report.occurences;
-                should_insert = false;
-            }
+    vm.reloginUser = function () {
+        sectionViewResource.get({
+            section: 'admin_section', view: 'relogin_user',
+            user_id: vm.user.id
+        }, function () {
+            window.location = AeConfig.urls.baseUrl;
         });
-        if (should_insert) {
-            if (vm.stream.reports.length > 7) {
-                vm.stream.reports.pop();
-            }
-            vm.stream.reports.unshift(ws_report);
-        }
+
+    }
+};
+
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
+
+angular.module('appenlight.components.adminUsersListView', [])
+    .component('adminUsersListView', {
+        templateUrl: 'components/views/admin-users-list-view/admin-users-list-view.html',
+        controller: AdminUserListViewController
     });
 
-    vm.determineStartState = function () {
-        if (stateHolder.AeUser.applications.length) {
-            vm.resource = Number($location.search().resource);
+AdminUserListViewController.$inject = ['usersResource'];
 
-            if (!vm.resource){
-                var cookieResource = $cookies.getObject('resource');
-                
+function AdminUserListViewController(usersResource) {
+    
+    var vm = this;
+    vm.loading = {users: true};
 
-                if (cookieResource) {
-                    vm.resource = cookieResource;
-                }
-                else{
-                    vm.resource = stateHolder.AeUser.applications[0].resource_id;
-                }
+    vm.users = usersResource.query({}, function (data) {
+        vm.loading = {users: false};
+        vm.activeUsers = _.reduce(vm.users, function(memo, val){
+            if (val.status == 1){
+                return memo + 1;
             }
-        }
+            return memo;
+        }, 0);
+        
+    });
 
-        var timespan = $location.search().timespan;
 
-        if(_.has(vm.timeOptions, timespan)){
-            vm.timeSpan = vm.timeOptions[timespan];
-        }
-        else{
-            vm.timeSpan = vm.timeOptions['1h'];
-        }
+    vm.removeUser = function (user) {
+        usersResource.remove({userId: user.id}, function (data, responseHeaders) {
+            
+            if (data) {
+                var index = vm.users.indexOf(user);
+                if (index !== -1) {
+                    vm.users.splice(index, 1);
+                    vm.activeUsers -= 1;
+                }
+            }
+        });
+    }
+};
 
-        var graphType = $location.search().graphtype;
-        if(!graphType){
-            vm.graphType = {selected: 'metrics_graphs'};
-        }
-        else{
-            vm.graphType = {selected: graphType};
-        }
-        vm.updateSearchParams();
-    };
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
 
-    vm.updateSearchParams = function () {
-        $location.search('resource', vm.resource);
-        $location.search('timespan', vm.timeSpan.key);
-        $location.search('graphtype', vm.graphType.selected);
-        stateHolder.resource = vm.resource;
+angular.module('appenlight.components.adminView', [])
+    .component('adminView', {
+        templateUrl: 'components/views/admin-view/admin-view.html',
+        controller: AdminViewController
+    });
 
-        if (vm.resource){
-            $cookies.putObject('resource', vm.resource,
-                {expires:new Date(3000, 1, 1)});
-        }
-        vm.refreshData();
-    };
+AdminViewController.$inject = ['$state'];
 
-    vm.refreshData = function () {
-        vm.fetchApdexStats();
-        vm.fetchTrendingReports();
-        vm.fetchMetrics();
-        vm.fetchRequestsBreakdown();
-        vm.fetchSlowCalls();
-    };
+function AdminViewController($state) {
+    this.$state = $state;
+    console.info('AdminViewController');
+}
 
-    vm.changedTimeSpan = function(){
-        vm.startDateFilter = timeSpanToStartDate(vm.timeSpan.key);
-        vm.refreshData();
-    };
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
 
-    vm.intervalId = $interval(function () {
-        if (_.contains(['30m', "1h"], vm.timeSpan.key)) {
-            // don't do anything if window is unfocused
-            if(document.hidden === true){
-                return ;
-            }
-            vm.refreshData();
-        }
-    }, 60000);
+angular.module('appenlight.components.integrationsListView', [])
+    .component('integrationsListView', {
+        templateUrl: 'components/views/applications-integrations-view/applications-integrations-view.html',
+        controller: IntegrationsListViewController
+    });
 
-    vm.fetchApdexStats = function () {
-        vm.loading.apdex = true;
-        vm.apdexStats = applicationsPropertyResource.query({
-                'key': 'apdex_stats',
-                'resourceId': vm.resource,
-                "start_date": timeSpanToStartDate(vm.timeSpan.key)
-            },
-            function (data) {
-                vm.loading.apdex = false;
+IntegrationsListViewController.$inject = ['$state', 'applicationsResource'];
 
-                vm.exceptions = _.reduce(data, function (memo, row) {
-                    return memo + row.errors;
-                }, 0);
-                vm.satisfyingRequests = _.reduce(data, function (memo, row) {
-                    return memo + row.satisfying_requests;
-                }, 0);
-                vm.toleratedRequests = _.reduce(data, function (memo, row) {
-                    return memo + row.tolerated_requests;
-                }, 0);
-                vm.frustratingRequests = _.reduce(data, function (memo, row) {
-                    return memo + row.frustrating_requests;
-                }, 0);
-                if (data.length) {
-                    vm.uptimeStats = data[0].uptime;
-                }
-
-            },
-            function () {
-                vm.loading.apdex = false;
-            }
-        );
-    }
-
-    vm.fetchMetrics = function () {
-        vm.loading.series = true;
-        applicationsPropertyResource.query({
-            'resourceId': vm.resource,
-            'key': vm.graphType.selected,
-            "start_date": timeSpanToStartDate(vm.timeSpan.key)
-        }, function (data) {
-            if (vm.graphType.selected == 'metrics_graphs') {
-                vm.metricsChartData = {
-                    json: data,
-                    xFormat: '%Y-%m-%dT%H:%M:%S',
-                    keys: {
-                        x: 'x',
-                        value: ["main", "sql", "nosql", "tmpl", "remote", "custom"]
-                    },
-                    names: {
-                        main: 'View/Application logic',
-                        sql: 'Relational database queries',
-                        nosql: 'NoSql datastore calls',
-                        tmpl: 'Template rendering',
-                        custom: 'Custom timed calls',
-                        remote: 'Requests to remote resources'
-                    },
-                    type: 'area',
-                    groups: [["main", "sql", "nosql", "remote", "custom", "tmpl"]],
-                    order: null
-                };
-            }
-            else if (vm.graphType.selected == 'report_graphs') {
-                vm.reportChartData = {
-                    json: data,
-                    xFormat: '%Y-%m-%dT%H:%M:%S',
-                    keys: {
-                        x: 'x',
-                        value: ["not_found", "report"]
-                    },
-                    names: {
-                        report: 'Errors',
-                        not_found: '404\'s requests'
-                    },
-                    type: 'bar'
-                };
-            }
-            else if (vm.graphType.selected == 'slow_report_graphs') {
-                vm.reportSlowChartData = {
-                    json: data,
-                    xFormat: '%Y-%m-%dT%H:%M:%S',
-                    keys: {
-                        x: 'x',
-                        value: ["slow_report"]
-                    },
-                    names: {
-                        slow_report: 'Slow reports'
-                    },
-                    type: 'bar'
-                };
-            }
-            else if (vm.graphType.selected == 'response_graphs') {
-                vm.responseChartData = {
-                    json: data,
-                    xFormat: '%Y-%m-%dT%H:%M:%S',
-                    keys: {
-                        x: 'x',
-                        value: ["today", "days_ago_2", "days_ago_7"]
-                    },
-                    names: {
-                        today: 'Today',
-                        "days_ago_2": '2 days ago',
-                        "days_ago_7": '7 days ago'
-                    }
-                };
-            }
-            else if (vm.graphType.selected == 'requests_graphs') {
-                vm.requestsChartData = {
-                    json: data,
-                    xFormat: '%Y-%m-%dT%H:%M:%S',
-                    keys: {
-                        x: 'x',
-                        value: ["requests"]
-                    },
-                    names: {
-                        requests: 'Requests/s'
-                    }
-                };
-            }
-            vm.loading.series = false;
-        }, function(){
-            vm.loading.series = false;
-        });
-    }
-
-    vm.fetchSlowCalls = function () {
-        vm.loading.slowCalls = true;
-        applicationsPropertyResource.query({
-            'resourceId': vm.resource,
-            "start_date": timeSpanToStartDate(vm.timeSpan.key),
-            'key': 'slow_calls'
-        }, function (data) {
-            vm.slowCalls = data;
-            vm.loading.slowCalls = false;
-        }, function () {
-            vm.loading.slowCalls = false;
-        });
-    }
-
-    vm.fetchRequestsBreakdown = function () {
-        vm.loading.requestsBreakdown = true;
-        applicationsPropertyResource.query({
-            'resourceId': vm.resource,
-            "start_date": timeSpanToStartDate(vm.timeSpan.key),
-            'key': 'requests_breakdown'
-        }, function (data) {
-            vm.requestsBreakdown = data;
-            vm.loading.requestsBreakdown = false;
-        }, function () {
-            vm.loading.requestsBreakdown = false;
-        });
-    }
+function IntegrationsListViewController($state, applicationsResource) {
+    
+    var vm = this;
+    vm.loading = {application: true};
+    vm.resource = applicationsResource.get({resourceId: $state.params.resourceId}, function (data) {
+        vm.loading.application = false;
+        $state.current.data.resource = vm.resource;
+    });
+}
 
-    vm.fetchTrendingReports = function () {
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
 
-        if (vm.graphType.selected == 'slow_report_graphs') {
-            var report_type = 'slow';
-        }
-        else {
-            var report_type = 'error';
-        }
+angular.module('appenlight.components.applicationsListView', [])
+    .component('applicationsListView', {
+        templateUrl: 'components/views/applications-list-view/applications-list-view.html',
+        controller: ApplicationsListViewController
+    });
 
-        vm.loading.reports = true;
-        vm.trendingReports = applicationsPropertyResource.query({
-                'key': 'trending_reports',
-                'resourceId': vm.resource,
-                "start_date": timeSpanToStartDate(vm.timeSpan.key),
-                "report_type": report_type
-            },
-            function () {
-                vm.loading.reports = false;
-            },
-            function () {
-                vm.loading.reports = false;
-            }
-        );
-    };
+ApplicationsListViewController.$inject = ['$state', 'applicationsResource'];
 
-    $scope.$on('$destroy',function(){
-        $interval.cancel(vm.intervalId);
+function ApplicationsListViewController($state, applicationsResource) {
+    
+    var vm = this;
+    vm.$state = $state;
+    vm.loading = {applications: true};
+    vm.applications = applicationsResource.query(null, function(){
+        vm.loading.applications = false;
     });
-
-    if (stateHolder.AeUser.applications.length){
-        vm.show_dashboard = true;
-        vm.determineStartState();
-    }
 }
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
@@ -8348,121 +8094,221 @@ function IndexDashboardController($rootScope, $scope, $location, $cookies, $inte
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
+angular.module('appenlight.components.applicationsPurgeLogsView', [])
+    .component('applicationsPurgeLogsView', {
+        templateUrl: 'components/views/applications-purge-logs-view/applications-purge-logs-view.html',
+        controller: applicationsPurgeLogsViewController
+    });
 
-ApplicationsIntegrationsEditViewController.$inject = ['$state', 'integrationResource'];
+applicationsPurgeLogsViewController.$inject = ['$state' ,'applicationsResource', 'sectionViewResource', 'logsNoIdResource'];
 
-function ApplicationsIntegrationsEditViewController($state, integrationResource) {
+function applicationsPurgeLogsViewController($state, applicationsResource, sectionViewResource, logsNoIdResource) {
     
     var vm = this;
     vm.$state = $state;
-    vm.loading = {integration: true};
-    vm.config = integrationResource.get(
-        {
-            integration: $state.params.integration,
-            action: 'setup',
-            resourceId: $state.params.resourceId
+    vm.loading = {applications: true};
+
+    vm.namespace = null;
+    vm.selectedResource = null;
+    vm.commonNamespaces = [];
+
+    vm.applications = applicationsResource.query({'type':'update_reports'}, function () {
+        vm.loading.applications = false;
+        vm.selectedResource = vm.applications[0].resource_id;
+        vm.getCommonKeys();
+    });
+
+    /**
+     * Fetches most commonly used tags in logs
+     */
+    vm.getCommonKeys = function () {
+        sectionViewResource.get({
+            section: 'logs_section',
+            view: 'common_tags',
+            resource: vm.selectedResource
         }, function (data) {
-            vm.loading.integration = false;
+            vm.commonNamespaces = data['namespaces']
         });
-
-    vm.configureIntegration = function () {
-        console.info('configureIntegration');
-        vm.loading.integration = true;
-        integrationResource.save(
-            {
-                integration: $state.params.integration,
-                action: 'setup',
-                resourceId: $state.params.resourceId
-            }, vm.config, function (data) {
-                vm.loading.integration = false;
-                setServerValidation(vm.integrationForm);
-            }, function (response) {
-                if (response.status == 422) {
-                    setServerValidation(vm.integrationForm, response.data);
-                }
-                vm.loading.integration = false;
-            });
     };
 
-    vm.removeIntegration = function () {
-        console.info('removeIntegration');
-        integrationResource.remove({
-                integration: $state.params.integration,
-                resourceId: $state.params.resourceId,
-                action: 'delete'
-            },
-            function () {
-                $state.go('applications.integrations',
-                    {resourceId: $state.params.resourceId});
-            }
-        );
+    vm.purgeLogs = function () {
+        vm.loading.applications = true;
+        logsNoIdResource.delete({resource:vm.selectedResource,
+            namespace: vm.namespace}, function(){
+            vm.loading.applications = false;
+        });
     }
+}
 
-    vm.testIntegration = function (to_test) {
-        console.info('testIntegration', to_test);
-        vm.loading.integration = true;
-        integrationResource.save(
-            {
-                integration: $state.params.integration,
-                action: 'test_' + to_test,
-                resourceId: $state.params.resourceId
-            }, vm.config, function (data) {
-                vm.loading.integration = false;
-            }, function (response) {
-                vm.loading.integration = false;
-            });
-    }
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
+
+angular.module('appenlight.components.applicationsUpdateView', [])
+    .component('applicationsUpdateView', {
+        templateUrl: 'components/views/applications-update-view/applications-update-view.html',
+        controller: applicationsUpdateViewController
+    });
+
+applicationsUpdateViewController.$inject = ['$state', 'applicationsNoIdResource', 'applicationsResource', 'applicationsPropertyResource', 'stateHolder'];
 
+function applicationsUpdateViewController($state, applicationsNoIdResource, applicationsResource, applicationsPropertyResource, stateHolder) {
+    'use strict';
     
-}
+    var vm = this;
+    vm.$state = $state;
+    vm.loading = {application: false};
 
-;angular.module('appenlight.components.bitbucketIntegrationConfigView', [])
-    .component('bitbucketIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/bitbucket-integration-config-view/bitbucket-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
+    vm.groupingOptions = [
+        ['url_type', 'Error Type + location'],
+        ['url_traceback', 'Traceback + location'],
+        ['traceback_server', 'Traceback + Server'],
+    ];
+    var resourceId = $state.params.resourceId;
+    var options = {};
+    vm.momentJs = moment;
+    vm.formTransferModel = {password:''};
 
-;angular.module('appenlight.components.campfireIntegrationConfigView', [])
-    .component('campfireIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/campfire-integration-config-view/campfire-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
+    // set initial data
 
-;angular.module('appenlight.components.flowdockIntegrationConfigView', [])
-    .component('flowdockIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/flowdock-integration-config-view/flowdock-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
+    if (resourceId === 'new') {
+        vm.resource = {
+            resource_id: null,
+            slow_report_threshold: 10,
+            error_report_threshold: 10,
+            allow_permanent_storage: true,
+            default_grouping: vm.groupingOptions[1][0]
+        };
+    }
+    else {
+        vm.loading.application = true;
+        vm.resource = applicationsResource.get({
+            'resourceId': resourceId
+        }, function (data) {
+            vm.loading.application = false;
+        });
+    }
 
-;angular.module('appenlight.components.githubIntegrationConfigView', [])
-    .component('githubIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/github-integration-config-view/github-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
 
-;angular.module('appenlight.components.hipchatIntegrationConfigView', [])
-    .component('hipchatIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/hipchat-integration-config-view/hipchat-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
+    vm.updateBasicForm = function () {
+        vm.loading.application = true;
+        if (vm.resource.resource_id === null) {
+            applicationsNoIdResource.save(null, vm.resource, function (data) {
+                stateHolder.AeUser.addApplication(data);
+                $state.go('applications.update', {resourceId: data.resource_id});
+                setServerValidation(vm.BasicForm);
+            }, function (response) {
+                if (response.status == 422) {
+                    setServerValidation(vm.BasicForm, response.data);
+                }
+                vm.loading.application = false;
+                
+            });
+        }
+        else {
+            applicationsResource.update({resourceId: vm.resource.resource_id},
+                vm.resource, function (data) {
+                    vm.resource = data;
+                    vm.loading.application = false;
+                    setServerValidation(vm.BasicForm);
+                }, function (response) {
+                    if (response.status == 422) {
+                        setServerValidation(vm.BasicForm, response.data);
+                    }
+                    vm.loading.application = false;
+                });
+        }
+    };
 
-;angular.module('appenlight.components.jiraIntegrationConfigView', [])
-    .component('jiraIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/jira-integration-config-view/jira-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
+    vm.addRule = function () {
+        
+        applicationsPropertyResource.save({
+                resourceId: vm.resource.resource_id,
+                key: 'postprocessing_rules'
+            }, null,
+            function (data) {
+                vm.resource.postprocessing_rules.push(data);
+            }
+        );
+    };
 
-;angular.module('appenlight.components.slackIntegrationConfigView', [])
-    .component('slackIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/slack-integration-config-view/slack-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
+    vm.regenerateAPIKeys = function(){
+        vm.loading.application = true;
+        applicationsPropertyResource.save({
+                resourceId: vm.resource.resource_id,
+                key: 'api_key'
+            }, {password: vm.regenerateAPIKeysPassword},
+            function (data) {
+                vm.resource = data;
+                vm.loading.application = false;
+                vm.regenerateAPIKeysPassword = '';
+                setServerValidation(vm.regenerateAPIKeysForm);
+            },
+            function (response) {
+                if (response.status == 422) {
+                    setServerValidation(vm.regenerateAPIKeysForm, response.data);
+                    
+                }
+                vm.loading.application = false;
+            }
+        )
+    };
 
-;angular.module('appenlight.components.webhooksIntegrationConfigView', [])
-    .component('webhooksIntegrationConfigView', {
-        templateUrl: 'components/views/integrations/webhooks-integration-config-view/webhooks-integration-config-view.html',
-        controller: ApplicationsIntegrationsEditViewController
-    });
+    vm.deleteApplication = function(){
+        vm.loading.application = true;
+        applicationsPropertyResource.update({
+                resourceId: vm.resource.resource_id,
+                key: 'delete_resource'
+            }, vm.formDeleteModel,
+            function (data) {
+                stateHolder.AeUser.removeApplicationById(vm.resource.resource_id);
+                $state.go('applications.list');
+            },
+            function (response) {
+                if (response.status == 422) {
+                    setServerValidation(vm.formDelete, response.data);
+                    
+                }
+                vm.loading.application = false;
+            }
+        );
+    };
+
+    vm.transferApplication = function(){
+        vm.loading.application = true;
+        applicationsPropertyResource.update({
+                resourceId: vm.resource.resource_id,
+                key: 'owner'
+            }, vm.formTransferModel,
+            function (data) {
+                $state.go('applications.list');
+            },
+            function (response) {
+                if (response.status == 422) {
+                    setServerValidation(vm.formTransfer, response.data);
+                    
+                }
+                vm.loading.application = false;
+            }
+        )
+    }
+
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -8483,29 +8329,109 @@ function ApplicationsIntegrationsEditViewController($state, integrationResource)
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.logsBrowserView', [])
-    .component('logsBrowserView', {
-        templateUrl: 'components/views/logs-browser/logs-browser.html',
-        controller: LogsBrowserController
+angular.module('appenlight.components.eventBrowserView', [])
+    .component('eventBrowserView', {
+        templateUrl: 'components/views/event-browser/event-browser.html',
+        controller: EventBrowserController
     });
 
-LogsBrowserController.$inject = ['$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource'];
+EventBrowserController.$inject = ['eventsNoIdResource', 'eventsResource'];
 
-function LogsBrowserController($location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource) {
+function EventBrowserController(eventsNoIdResource, eventsResource) {
+    console.info('EventBrowserController');
     var vm = this;
-    vm.logEventsChartConfig = {
-        data: {
-            json: [],
-            xFormat: '%Y-%m-%dT%H:%M:%S'
-        },
-        color: {
-            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
-        },
-        axis: {
-            x: {
-                type: 'timeseries',
-                tick: {
-                    format: '%Y-%m-%d'
+
+    vm.loading = {events: true};
+
+    vm.events = eventsNoIdResource.query(
+        {key: 'events'},
+        function (data) {
+            vm.loading.events = false;
+        });
+
+
+    vm.closeEvent = function (event) {
+        
+        eventsResource.update({eventId: event.id}, {status: 0}, function (data) {
+            event.status = 0;
+        });
+    }
+
+}
+
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
+
+angular.module('appenlight.components.indexDashboardView', [])
+    .component('indexDashboardView', {
+        templateUrl: 'components/views/index-dashboard/index-dashboard.html',
+        controller: IndexDashboardController
+    });
+
+IndexDashboardController.$inject = ['$rootScope', '$scope', '$location','$cookies', '$interval', 'stateHolder', 'applicationsPropertyResource', 'AeConfig'];
+
+function IndexDashboardController($rootScope, $scope, $location, $cookies, $interval, stateHolder, applicationsPropertyResource, AeConfig) {
+    var vm = this;
+    stateHolder.section = 'dashboard';
+    vm.timeOptions = {};
+    var allowed = ['1h', '4h', '12h', '24h', '1w', '2w', '1M'];
+    _.each(allowed, function (key) {
+        if (allowed.indexOf(key) !== -1) {
+            vm.timeOptions[key] = AeConfig.timeOptions[key];
+        }
+    });
+    vm.stateHolder = stateHolder;
+    vm.urls = AeConfig.urls;
+    vm.applications = stateHolder.AeUser.applications_map;
+    vm.show_dashboard = false;
+    vm.resource = null;
+    vm.graphType = {selected: null};
+    vm.timeSpan = vm.timeOptions['1h'];
+    vm.trendingReports = [];
+    vm.exceptions = 0;
+    vm.satisfyingRequests = 0;
+    vm.toleratedRequests = 0;
+    vm.frustratingRequests = 0;
+    vm.uptimeStats = 0;
+    vm.apdexStats = [];
+    vm.seriesRequestsData = [];
+    vm.seriesMetricsData = [];
+    vm.seriesSlowData = [];
+    vm.slowCalls = [];
+    vm.slowURIS = [];
+
+    vm.reportChartConfig = {
+        data: {
+            json: [],
+            xFormat: '%Y-%m-%dT%H:%M:%S'
+        },
+        color: {
+            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
+        },
+        axis: {
+            x: {
+                type: 'timeseries',
+                tick: {
+                    culling: {
+                        max: 6 // the number of tick texts will be adjusted to less than this value
+                    },
+                    format: '%Y-%m-%d %H:%M'
                 }
             },
             y: {
@@ -8546,279 +8472,170 @@ function LogsBrowserController($location, stateHolder, typeAheadTagHelper, logsN
             }
         }
     };
-    vm.logEventsChartData = {};
-    stateHolder.section = 'logs';
-    vm.today = function () {
-        vm.pickerDate = new Date();
-    };
-    vm.today();
+    vm.reportChartData = {};
 
-    vm.applications = stateHolder.AeUser.applications_map;
-    vm.logsPage = [];
-    vm.itemCount = 0;
-    vm.itemsPerPage = 250;
-    vm.page = 1;
-    vm.$location = $location;
-    vm.isLoading = {
-        logs: true,
-        series: true
-    };
-    vm.filterTypeAheadOptions = [
-        {
-            type: 'message',
-            text: 'message:',
-            'description': 'Full-text search in your logs',
-            tag: 'Message',
-            example: 'message:text-im-looking-for'
-        },
-        {
-            type: 'namespace',
-            text: 'namespace:',
-            'description': 'Query logs from specific namespace',
-            tag: 'Namespace',
-            example: "namespace:module.foo"
+    vm.reportSlowChartConfig = {
+        data: {
+            json: [],
+            xFormat: '%Y-%m-%dT%H:%M:%S'
         },
-        {
-            type: 'resource',
-            text: 'resource:',
-            'description': 'Restrict resultset to application',
-            tag: 'Application',
-            example: "resource:ID"
+        color: {
+            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
         },
-        {
-            type: 'request_id',
-            text: 'request_id:',
-            'description': 'Show logs with specific request id',
-            example: "request_id:883143dc572e4c38aceae92af0ea5ae0",
-            tag: 'Request ID'
+        axis: {
+            x: {
+                type: 'timeseries',
+                tick: {
+                    culling: {
+                        max: 6 // the number of tick texts will be adjusted to less than this value
+                    },
+                    format: '%Y-%m-%d %H:%M'
+                }
+            },
+            y: {
+                tick: {
+                    count: 5,
+                    format: d3.format('.2s')
+                }
+            }
         },
-        {
-            type: 'level',
-            text: 'level:',
-            'description': 'Show entries with specific log level',
-            example: 'level:warning',
-            tag: 'Level'
+        subchart: {
+            show: true,
+            size: {
+                height: 20
+            }
         },
-        {
-            type: 'server_name',
-            text: 'server_name:',
-            'description': 'Show entries tagged with this key/value pair',
-            example: 'server_name:hostname',
-            tag: 'Tag'
+        size: {
+            height: 250
         },
-        {
-            type: 'start_date',
-            text: 'start_date:',
-            'description': 'Show results newer than this date (press TAB for dropdown)',
-            example: 'start_date:2014-08-15T13:00',
-            tag: 'Start Date'
+        zoom: {
+            rescale: true
         },
-        {
-            type: 'end_date',
-            text: 'end_date:',
-            'description': 'Show results older than this date (press TAB for dropdown)',
-            example: 'start_date:2014-08-15T23:59',
-            tag: 'End Date'
+        grid: {
+            x: {
+                show: true
+            },
+            y: {
+                show: true
+            }
         },
-        {type: 'level', value: 'debug', text: 'level:debug'},
-        {type: 'level', value: 'info', text: 'level:info'},
-        {type: 'level', value: 'warning', text: 'level:warning'},
-        {type: 'level', value: 'critical', text: 'level:critical'}
-    ];
-    vm.filterTypeAhead = null;
-    vm.showDatePicker = false;
-    vm.manualOpen = false;
-    vm.aheadFilter = typeAheadTagHelper.aheadFilter;
-    vm.removeSearchTag = function (tag) {
-        $location.search(tag.type, null);
-        vm.refresh();
-    };
-    vm.addSearchTag = function (tag) {
-        $location.search(tag.type, tag.value);
-        vm.refresh();
-    };
-
-    vm.paginationChange = function(){
-        $location.search('page', vm.page);
-        vm.refresh();
+        tooltip: {
+            format: {
+                title: function (d) {
+                    return '' + d;
+                },
+                value: function (v) {
+                    return v
+                }
+            }
+        }
     };
+    vm.reportSlowChartData = {};
 
-
-    _.each(vm.applications, function (item) {
-        vm.filterTypeAheadOptions.push({
-            type: 'resource',
-            text: 'resource:' + item.resource_id + ':' + item.resource_name,
-            example: 'resource:' + item.resource_id,
-            'tag': item.resource_name,
-            'description': 'Restrict resultset to this application'
-        });
-    });
-
-    vm.typeAheadTag = function (event) {
-        var text = vm.filterTypeAhead;
-        if (_.isObject(vm.filterTypeAhead)) {
-            text = vm.filterTypeAhead.text;
-        };
-        if (!vm.filterTypeAhead) {
-            return
-        }
-        var parsed = text.split(':');
-        var tag = {'type': null, 'value': null};
-        // app tags have : twice
-        if (parsed.length > 2 && parsed[0] == 'resource') {
-            tag.type = 'resource';
-            tag.value = parsed[1];
-        }
-        // normal tag:value
-        else if (parsed.length > 1) {
-            tag.type = parsed[0];
-            tag.value = parsed.slice(1).join(':');
-        }
-        else {
-            tag.type = 'message';
-            tag.value = parsed.join(':');
-        }
-
-        // set datepicker hour based on type of field
-        if ('start_date:' == text) {
-            vm.showDatePicker = true;
-            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
-        }
-        else if ('end_date:' == text) {
-            vm.showDatePicker = true;
-            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
-        }
-
-        if (event.keyCode != 13 || !tag.type || !tag.value) {
-            return
-        }
-        vm.showDatePicker = false;
-        // aka we selected one of main options
-        vm.addSearchTag({type: tag.type, value: tag.value});
-        // clear typeahead
-        vm.filterTypeAhead = undefined;
-    };
-
-
-    vm.pickerDateChanged = function(){
-        if (vm.filterTypeAhead.indexOf('start_date:') == '0') {
-            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
-        }
-        else if (vm.filterTypeAhead.indexOf('end_date:') == '0') {
-            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
-        }
-        vm.showDatePicker = false;
-    };
-
-    vm.fetchLogs = function (searchParams) {
-        vm.isLoading.logs = true;
-        logsNoIdResource.query(searchParams, function (data, getResponseHeaders) {
-            vm.isLoading.logs = false;
-            var headers = getResponseHeaders();
-            vm.logsPage = data;
-            vm.itemCount = headers['x-total-count'];
-            vm.itemsPerPage = headers['x-items-per-page'];
-        }, function () {
-            vm.isLoading.logs = false;
-        });
-    };
-
-    vm.fetchSeriesData = function (searchParams) {
-        searchParams['section'] = 'logs_section';
-        searchParams['view'] = 'fetch_series';
-        vm.isLoading.series = true;
-        sectionViewResource.query(searchParams, function (data) {
-            
-            vm.logEventsChartData = {
-                json: data,
-                xFormat: '%Y-%m-%dT%H:%M:%S',
-                keys: {
-                    x: 'x',
-                    value: ["logs"]
-                },
-                names: {
-                    logs: 'Log events'
+    vm.metricsChartConfig = {
+        data: {
+            json: [],
+            xFormat: '%Y-%m-%dT%H:%M:%S',
+            keys: {
+                x: 'x',
+                value: ["main", "sql", "nosql", "tmpl", "remote", "custom"]
+            },
+            names: {
+                main: 'View/Application logic',
+                sql: 'Relational database queries',
+                nosql: 'NoSql datastore calls',
+                tmpl: 'Template rendering',
+                custom: 'Custom timed calls',
+                remote: 'Requests to remote resources'
+            },
+            type: 'area',
+            groups: [["main", "sql", "nosql", "remote", "custom", "tmpl"]],
+            order: null
+        },
+        color: {
+            pattern: ['#6baed6', '#c7e9c0', '#fd8d3c', '#d6616b', '#ffcc00', '#c6dbef']
+        },
+        axis: {
+            x: {
+                type: 'timeseries',
+                tick: {
+                    culling: {
+                        max: 6 // the number of tick texts will be adjusted to less than this value
+                    },
+                    format: '%Y-%m-%d %H:%M'
+                }
+            },
+            y: {
+                tick: {
+                    count: 5,
+                    format: d3.format('.2f')
+                }
+            }
+        },
+        point: {
+            show: false
+        },
+        subchart: {
+            show: true,
+            size: {
+                height: 20
+            }
+        },
+        size: {
+            height: 350
+        },
+        zoom: {
+            rescale: true
+        },
+        grid: {
+            x: {
+                show: true
+            },
+            y: {
+                show: true
+            }
+        },
+        tooltip: {
+            format: {
+                title: function (d) {
+                    return '' + d;
                 },
-                type: 'bar'
-            };
-            vm.isLoading.series = false;
-        }, function () {
-            vm.isLoading.series = false;
-        });
-    };
-
-    vm.filterId = function (log) {
-        $location.search('request_id', log.request_id);
-        vm.refresh();
-    };
-
-    vm.refresh = function(){
-        vm.searchParams = parseSearchToTags($location.search());
-        vm.page = Number(vm.searchParams.page) || 1;
-        var params = parseTagsToSearch(vm.searchParams);
-        vm.fetchLogs(params);
-        vm.fetchSeriesData(params);
+                value: function (v) {
+                    return v
+                }
+            }
+        }
     };
-    console.info('page load');
-    vm.refresh();
-}
-
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
-
-angular.module('appenlight.components.reportView', [])
-    .component('reportView', {
-        templateUrl: 'components/views/report-view/report-view.html',
-        controller: ReportViewController
-    });
-
-ReportViewController.$inject = ['$window', '$location', '$state', '$uibModal',
-    '$cookies', 'reportGroupPropertyResource', 'reportGroupResource',
-    'logsNoIdResource', 'stateHolder'];
+    vm.metricsChartData = {};
 
-function ReportViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, stateHolder) {
-    var vm = this;
-    vm.window = $window;
-    vm.stateHolder = stateHolder;
-    vm.$state = $state;
-    vm.reportHistoryConfig = {
+    vm.responseChartConfig = {
         data: {
             json: [],
             xFormat: '%Y-%m-%dT%H:%M:%S'
         },
         color: {
-            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
+            pattern: ['#d6616b', '#6baed6', '#fd8d3c']
         },
         axis: {
             x: {
                 type: 'timeseries',
                 tick: {
-                    format: '%Y-%m-%d'
+                    culling: {
+                        max: 6 // the number of tick texts will be adjusted to less than this value
+                    },
+                    format: '%Y-%m-%d %H:%M'
                 }
             },
             y: {
                 tick: {
                     count: 5,
-                    format: d3.format('.2s')
+                    format: d3.format('.2f')
                 }
             }
         },
+        point: {
+            show: false
+        },
         subchart: {
             show: true,
             size: {
@@ -8826,7 +8643,7 @@ function ReportViewController($window, $location, $state, $uibModal, $cookies, r
             }
         },
         size: {
-            height: 250
+            height: 350
         },
         zoom: {
             rescale: true
@@ -8850,599 +8667,499 @@ function ReportViewController($window, $location, $state, $uibModal, $cookies, r
             }
         }
     };
-    vm.mentionedPeople = [];
-    vm.reportHistoryData = {};
-    vm.textTraceback = true;
-    vm.rawTraceback = '';
-    vm.traceback = '';
-    vm.reportType = 'report';
-    vm.report = null;
-    vm.showLong = false;
-    vm.reportLogs = null;
-    vm.requestStats = null;
-    vm.comment = null;
-    vm.is_loading = {
-        report: true,
-        logs: true,
-        history: true
-    };
-
-    vm.searchMentionedPeople = function(term){
-        //vm.mentionedPeople = [];
-        var term = term.toLowerCase();
-        reportGroupPropertyResource.get({
-                groupId: vm.report.group_id,
-                key: 'assigned_users'
-            }, null,
-            function (data) {
-                var users = [];
-                _.each(data.assigned, function(u){
-                    users.push({label: u.user_name});
-                });
-                _.each(data.unassigned, function(u){
-                    users.push({label: u.user_name});
-                });
-
-                var result = _.filter(users, function(u){
-                   return u.label.toLowerCase().indexOf(term) !== -1;
-                });
-                vm.mentionedPeople = result;
-            });
-    };
+    vm.responseChartData = {};
 
-    vm.searchTag = function (tag, value) {
-        
-        if (vm.report.report_type === 3) {
-            $location.url($state.href('report.list_slow'));
-        }
-        else {
-            $location.url($state.href('report.list'));
+    vm.requestsChartConfig = {
+        data: {
+            json: [],
+            xFormat: '%Y-%m-%dT%H:%M:%S'
+        },
+        color: {
+            pattern: ['#d6616b', '#6baed6', '#fd8d3c']
+        },
+        axis: {
+            x: {
+                type: 'timeseries',
+                tick: {
+                    culling: {
+                        max: 6 // the number of tick texts will be adjusted to less than this value
+                    },
+                    format: '%Y-%m-%d %H:%M'
+                }
+            },
+            y: {
+                tick: {
+                    count: 5,
+                    format: d3.format('.2f')
+                }
+            }
+        },
+        point: {
+            show: false
+        },
+        subchart: {
+            show: true,
+            size: {
+                height: 20
+            }
+        },
+        size: {
+            height: 350
+        },
+        zoom: {
+            rescale: true
+        },
+        grid: {
+            x: {
+                show: true
+            },
+            y: {
+                show: true
+            }
+        },
+        tooltip: {
+            format: {
+                title: function (d) {
+                    return '' + d;
+                },
+                value: function (v) {
+                    return v
+                }
+            }
         }
-        $location.search(tag, value);
     };
+    vm.requestsChartData = {};
 
-    vm.tabs = {
-        slow_calls:false,
-        request_details:false,
-        logs:false,
-        comments:false,
-        affected_users:false
+    vm.loading = {
+        'apdex': true,
+        'reports': true,
+        'graphs': true,
+        'slowCalls': true,
+        'slowURIS': true,
+        'requestsBreakdown': true,
+        'series': true
     };
-    if ($cookies.selectedReportTab) {
-        vm.tabs[$cookies.selectedReportTab] = true;
-    }
-    else{
-        $cookies.selectedReportTab = 'request_details';
-        vm.tabs.request_details = true;
-    }
+    vm.stream = {paused: false, filtered: false, messages: [], reports: []};
 
-    vm.fetchLogs = function () {
-        if (!vm.report.request_id){
+    $rootScope.$on('channelstream-message.front_dashboard.new_topic', function(event, message){
+        var ws_report = message.message.report;
+        if (ws_report.http_status != 500) {
             return
         }
-        vm.is_loading.logs = true;
-        logsNoIdResource.query({request_id: vm.report.request_id},
-            function (data) {
-            vm.is_loading.logs = false;
-            vm.reportLogs = data;
-        }, function () {
-            vm.is_loading.logs = false;
+        if (vm.stream.paused == true) {
+            return
+        }
+        if (vm.stream.filtered && ws_report.resource_id != vm.resource) {
+            return
+        }
+        var should_insert = true;
+        _.each(vm.stream.reports, function (report) {
+            if (report.report_id == ws_report.report_id) {
+                report.occurences = ws_report.occurences;
+                should_insert = false;
+            }
         });
-    };
-    vm.addComment = function () {
-        reportGroupPropertyResource.save({
-                groupId: vm.report.group_id,
-                key: 'comments'
-            }, {body: vm.comment},
-            function (data) {
-                vm.report.comments.push(data);
-            });
-        vm.comment = '';
-    };
+        if (should_insert) {
+            if (vm.stream.reports.length > 7) {
+                vm.stream.reports.pop();
+            }
+            vm.stream.reports.unshift(ws_report);
+        }
+    });
 
-    vm.fetchReport = function () {
-        vm.is_loading.report = true;
-        reportGroupResource.get($state.params, function (data) {
-            vm.is_loading.report = false;
-            if (data.request) {
-                try {
-                    var to_sort = _.pairs(data.request);
-                    data.request = _.object(_.sortBy(to_sort, function (i) {
-                        return i[0]
-                    }));
+    vm.determineStartState = function () {
+        if (stateHolder.AeUser.applications.length) {
+            vm.resource = Number($location.search().resource);
+
+            if (!vm.resource){
+                var cookieResource = $cookies.getObject('resource');
+                
+
+                if (cookieResource) {
+                    vm.resource = cookieResource;
                 }
-                catch (err) {
+                else{
+                    vm.resource = stateHolder.AeUser.applications[0].resource_id;
                 }
             }
-            vm.report = data;
-            if (vm.report.req_stats) {
-                vm.requestStats = [];
-                _.each(_.pairs(vm.report.req_stats['percentages']), function (p) {
-                    vm.requestStats.push({
-                        name: p[0],
-                        value: vm.report.req_stats[p[0]].toFixed(3),
-                        percent: p[1],
-                        calls: vm.report.req_stats[p[0] + '_calls']
-                    })
-                });
-            }
-            vm.traceback = data.traceback;
-            _.each(vm.traceback, function (frame) {
-                if (frame.line) {
-                    vm.rawTraceback += 'File ' + frame.file + ' line ' + frame.line + ' in ' + frame.fn + ": \r\n";
-                }
-                vm.rawTraceback += '    ' + frame.cline + "\r\n";
-            });
+        }
 
-            if (stateHolder.AeUser.id){
-                vm.fetchHistory();
-            }
+        var timespan = $location.search().timespan;
 
-            vm.selectedTab($cookies.selectedReportTab);
+        if(_.has(vm.timeOptions, timespan)){
+            vm.timeSpan = vm.timeOptions[timespan];
+        }
+        else{
+            vm.timeSpan = vm.timeOptions['1h'];
+        }
 
-        }, function (response) {
-            
-            if (response.status == 403) {
-                var uid = response.headers('x-appenlight-uid');
-                if (!uid) {
-                    window.location = '/register?came_from=' + encodeURIComponent(window.location);
-                }
-            }
-            vm.is_loading.report = false;
-        });
+        var graphType = $location.search().graphtype;
+        if(!graphType){
+            vm.graphType = {selected: 'metrics_graphs'};
+        }
+        else{
+            vm.graphType = {selected: graphType};
+        }
+        vm.updateSearchParams();
     };
 
-    vm.selectedTab = function(tab_name){
-        $cookies.selectedReportTab = tab_name;
-        if (tab_name == 'logs' && vm.reportLogs === null) {
-            vm.fetchLogs();
+    vm.updateSearchParams = function () {
+        $location.search('resource', vm.resource);
+        $location.search('timespan', vm.timeSpan.key);
+        $location.search('graphtype', vm.graphType.selected);
+        stateHolder.resource = vm.resource;
+
+        if (vm.resource){
+            $cookies.putObject('resource', vm.resource,
+                {expires:new Date(3000, 1, 1)});
         }
+        vm.refreshData();
     };
 
-    vm.markFixed = function () {
-        reportGroupResource.update({
-                groupId: vm.report.group_id
-            }, {fixed: !vm.report.group.fixed},
-            function (data) {
-                vm.report.group.fixed = data.fixed;
-            });
+    vm.refreshData = function () {
+        vm.fetchApdexStats();
+        vm.fetchTrendingReports();
+        vm.fetchMetrics();
+        vm.fetchRequestsBreakdown();
+        vm.fetchSlowCalls();
     };
 
-    vm.markPublic = function () {
-        reportGroupResource.update({
-                groupId: vm.report.group_id
-            }, {public: !vm.report.group.public},
-            function (data) {
-                vm.report.group.public = data.public;
-            });
+    vm.changedTimeSpan = function(){
+        vm.startDateFilter = timeSpanToStartDate(vm.timeSpan.key);
+        vm.refreshData();
     };
 
-    vm.delete = function () {
-        reportGroupResource.delete({'groupId': vm.report.group_id},
-            function (data) {
-            $state.go('report.list');
-        })
-    };
+    vm.intervalId = $interval(function () {
+        if (_.contains(['30m', "1h"], vm.timeSpan.key)) {
+            // don't do anything if window is unfocused
+            if(document.hidden === true){
+                return ;
+            }
+            vm.refreshData();
+        }
+    }, 60000);
 
-    vm.assignUsersModal = function (index) {
-        vm.opts = {
-            backdrop: 'static',
-            templateUrl: 'AssignReportCtrl.html',
-            controller: 'AssignReportCtrl as ctrl',
-            resolve: {
-                report: function () {
-                    return vm.report;
-                }
-            }
-        };
-        var modalInstance = $uibModal.open(vm.opts);
-        modalInstance.result.then(function (report) {
+    vm.fetchApdexStats = function () {
+        vm.loading.apdex = true;
+        vm.apdexStats = applicationsPropertyResource.query({
+                'key': 'apdex_stats',
+                'resourceId': vm.resource,
+                "start_date": timeSpanToStartDate(vm.timeSpan.key)
+            },
+            function (data) {
+                vm.loading.apdex = false;
 
-        }, function () {
-            console.info('Modal dismissed at: ' + new Date());
-        });
+                vm.exceptions = _.reduce(data, function (memo, row) {
+                    return memo + row.errors;
+                }, 0);
+                vm.satisfyingRequests = _.reduce(data, function (memo, row) {
+                    return memo + row.satisfying_requests;
+                }, 0);
+                vm.toleratedRequests = _.reduce(data, function (memo, row) {
+                    return memo + row.tolerated_requests;
+                }, 0);
+                vm.frustratingRequests = _.reduce(data, function (memo, row) {
+                    return memo + row.frustrating_requests;
+                }, 0);
+                if (data.length) {
+                    vm.uptimeStats = data[0].uptime;
+                }
 
-    };
+            },
+            function () {
+                vm.loading.apdex = false;
+            }
+        );
+    }
 
-    vm.fetchHistory = function () {
-        reportGroupPropertyResource.query({
-            groupId: vm.report.group_id,
-            key: 'history'
+    vm.fetchMetrics = function () {
+        vm.loading.series = true;
+        applicationsPropertyResource.query({
+            'resourceId': vm.resource,
+            'key': vm.graphType.selected,
+            "start_date": timeSpanToStartDate(vm.timeSpan.key)
         }, function (data) {
-            vm.reportHistoryData = {
-                json: data,
-                keys: {
-                    x: 'x',
-                    value: ["reports"]
-                },
-                names: {
-                    reports: 'Reports history'
-                },
-                type: 'bar'
-            };
-            vm.is_loading.history = false;
-        });
-    };
-
-    vm.nextDetail = function () {
-        $state.go('report.view_detail', {
-            groupId: vm.report.group_id,
-            reportId: vm.report.group.next_report
-        });
-    };
-    vm.previousDetail = function () {
-        $state.go('report.view_detail', {
-            groupId: vm.report.group_id,
-            reportId: vm.report.group.previous_report
-        });
-    };
-
-    vm.runIntegration = function (integration_name) {
-        
-        if (integration_name == 'bitbucket') {
-            var controller = 'BitbucketIntegrationCtrl as ctrl';
-            var template_url = 'templates/integrations/bitbucket.html';
-        }
-        else if (integration_name == 'github') {
-            var controller = 'GithubIntegrationCtrl as ctrl';
-            var template_url = 'templates/integrations/github.html';
-        }
-        else if (integration_name == 'jira') {
-            var controller = 'JiraIntegrationCtrl as ctrl';
-            var template_url = 'templates/integrations/jira.html';
-        }
-        else {
-            return false;
-        }
-
-        vm.opts = {
-            backdrop: 'static',
-            templateUrl: template_url,
-            controller: controller,
-            resolve: {
-                integrationName: function () {
-                    return integration_name
-                },
-                report: function () {
-                    return vm.report;
-                }
+            if (vm.graphType.selected == 'metrics_graphs') {
+                vm.metricsChartData = {
+                    json: data,
+                    xFormat: '%Y-%m-%dT%H:%M:%S',
+                    keys: {
+                        x: 'x',
+                        value: ["main", "sql", "nosql", "tmpl", "remote", "custom"]
+                    },
+                    names: {
+                        main: 'View/Application logic',
+                        sql: 'Relational database queries',
+                        nosql: 'NoSql datastore calls',
+                        tmpl: 'Template rendering',
+                        custom: 'Custom timed calls',
+                        remote: 'Requests to remote resources'
+                    },
+                    type: 'area',
+                    groups: [["main", "sql", "nosql", "remote", "custom", "tmpl"]],
+                    order: null
+                };
             }
-        };
-        var modalInstance = $uibModal.open(vm.opts);
-        modalInstance.result.then(function (report) {
-
-        }, function () {
-            console.info('Modal dismissed at: ' + new Date());
-        });
-
-    };
-
-    // load report
-    vm.fetchReport();
-
-
-}
-
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
-
-angular.module('appenlight.components.reportsBrowserView', [])
-    .component('reportsBrowserView', {
-        templateUrl: 'components/views/reports-browser-view/reports-browser-view.html',
-        controller: reportsBrowserViewController
-    });
-
-reportsBrowserViewController.$inject = ['$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'reportsResource'];
-
-function reportsBrowserViewController($location, $cookies, stateHolder,
-                               typeAheadTagHelper, reportsResource) {
-    var vm = this;
-    vm.applications = stateHolder.AeUser.applications_map;
-    stateHolder.section = 'reports';
-    vm.today = function () {
-        vm.pickerDate = new Date();
-    };
-    vm.today();
-    vm.reportsPage = [];
-    vm.page = 1;
-    vm.itemCount = 0;
-    vm.itemsPerPage = 250;
-    typeAheadTagHelper.tags = [];
-    vm.searchParams = {tags: [], page: 1, type: 'report'};
-    vm.is_loading = false;
-    vm.filterTypeAheadOptions = [
-        {
-            type: 'error',
-            text: 'error:',
-            'description': 'Full-text search in your reports',
-            example: 'error:text-im-looking-for',
-            tag: 'Error'
-        },
-        {
-            type: 'view_name',
-            text: 'view_name:',
-            'description': 'Query reports occured in specific views',
-            example: "view_name:module.foo",
-            tag: 'View Name'
-        },
-        {
-            type: 'resource',
-            text: 'resource:',
-            'description': 'Restrict resultset to application',
-            example: "resource:ID",
-            tag: 'Application'
-        },
-        {
-            type: 'priority',
-            text: 'priority:',
-            'description': 'Show reports with specific priority',
-            example: 'priority:8',
-            tag: 'Priority'
-        },
-        {
-            type: 'min_occurences',
-            text: 'min_occurences:',
-            'description': 'Show reports from groups with at least X occurences',
-            example: 'min_occurences:25',
-            tag: 'Occurences'
-        },
-        {
-            type: 'url_path',
-            text: 'url_path:',
-            'description': 'Show reports from specific URL paths',
-            example: 'url_path:/foo/bar/baz',
-            tag: 'Url Path'
-        },
-        {
-            type: 'url_domain',
-            text: 'url_domain:',
-            'description': 'Show reports from specific domain',
-            example: 'url_domain:domain.com',
-            tag: 'Domain'
-        },
-        {
-            type: 'report_status',
-            text: 'report_status:',
-            'description': 'Show reports from groups with specific status',
-            example: 'report_status:never_reviewed',
-            tag: 'Status'
-        },
-        {
-            type: 'request_id',
-            text: 'request_id:',
-            'description': 'Show reports with specific request id',
-            example: "request_id:883143dc572e4c38aceae92af0ea5ae0",
-            tag: 'Request ID'
-        },
-        {
-            type: 'server_name',
-            text: 'server_name:',
-            'description': 'Show reports tagged with this key/value pair',
-            example: 'server_name:hostname',
-            tag: 'Tag'
-        },
-        {
-            type: 'http_status',
-            text: 'http_status:',
-            'description': 'Show reports with specific HTTP status code',
-            example: "http_status:",
-            tag: 'HTTP Status'
-        },
-        {
-            type: 'http_status',
-            text: 'http_status:500',
-            'description': 'Show reports with specific HTTP status code',
-            example: "http_status:500",
-            tag: 'HTTP Status'
-        },
-        {
-            type: 'http_status',
-            text: 'http_status:404',
-            'description': 'Include 404 reports in your search',
-            example: "http_status:404",
-            tag: 'HTTP Status'
-        },
-        {
-            type: 'start_date',
-            text: 'start_date:',
-            'description': 'Show reports newer than this date (press TAB for dropdown)',
-            example: 'start_date:2014-08-15T13:00',
-            tag: 'Start Date'
-        },
-        {
-            type: 'end_date',
-            text: 'end_date:',
-            'description': 'Show reports older than this date (press TAB for dropdown)',
-            example: 'start_date:2014-08-15T23:59',
-            tag: 'End Date'
-        }
-    ];
-
-    vm.filterTypeAhead = undefined;
-    vm.showDatePicker = false;
-    vm.manualOpen = false;
-    vm.aheadFilter = typeAheadTagHelper.aheadFilter;
-    vm.removeSearchTag = function (tag) {
-        $location.search(tag.type, null);
-        vm.refresh();
-    };
-    vm.addSearchTag = function (tag) {
-        $location.search(tag.type, tag.value);
-        vm.refresh();
-    };
-    vm.notRelativeTime = false;
-    if ($cookies.notRelativeTime) {
-        vm.notRelativeTime = JSON.parse($cookies.notRelativeTime);
+            else if (vm.graphType.selected == 'report_graphs') {
+                vm.reportChartData = {
+                    json: data,
+                    xFormat: '%Y-%m-%dT%H:%M:%S',
+                    keys: {
+                        x: 'x',
+                        value: ["not_found", "report"]
+                    },
+                    names: {
+                        report: 'Errors',
+                        not_found: '404\'s requests'
+                    },
+                    type: 'bar'
+                };
+            }
+            else if (vm.graphType.selected == 'slow_report_graphs') {
+                vm.reportSlowChartData = {
+                    json: data,
+                    xFormat: '%Y-%m-%dT%H:%M:%S',
+                    keys: {
+                        x: 'x',
+                        value: ["slow_report"]
+                    },
+                    names: {
+                        slow_report: 'Slow reports'
+                    },
+                    type: 'bar'
+                };
+            }
+            else if (vm.graphType.selected == 'response_graphs') {
+                vm.responseChartData = {
+                    json: data,
+                    xFormat: '%Y-%m-%dT%H:%M:%S',
+                    keys: {
+                        x: 'x',
+                        value: ["today", "days_ago_2", "days_ago_7"]
+                    },
+                    names: {
+                        today: 'Today',
+                        "days_ago_2": '2 days ago',
+                        "days_ago_7": '7 days ago'
+                    }
+                };
+            }
+            else if (vm.graphType.selected == 'requests_graphs') {
+                vm.requestsChartData = {
+                    json: data,
+                    xFormat: '%Y-%m-%dT%H:%M:%S',
+                    keys: {
+                        x: 'x',
+                        value: ["requests"]
+                    },
+                    names: {
+                        requests: 'Requests/s'
+                    }
+                };
+            }
+            vm.loading.series = false;
+        }, function(){
+            vm.loading.series = false;
+        });
     }
 
-    vm.changeRelativeTime = function () {
-        $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
-    };
-
-    _.each(_.range(1, 11), function (priority) {
-        vm.filterTypeAheadOptions.push({
-            type: 'priority',
-            text: 'priority:' + priority.toString(),
-            description: 'Show entries with specific priority',
-            example: 'priority:' + priority,
-            tag: 'Priority'
-        });
-    });
-    _.each(['never_reviewed', 'reviewed', 'fixed', 'public'], function (status) {
-        vm.filterTypeAheadOptions.push({
-            type: 'report_status',
-            text: 'report_status:' + status,
-            'description': 'Show only reports with this status',
-            example: 'report_status:' + status,
-            tag: 'Status ' + status.toUpperCase()
+    vm.fetchSlowCalls = function () {
+        vm.loading.slowCalls = true;
+        applicationsPropertyResource.query({
+            'resourceId': vm.resource,
+            "start_date": timeSpanToStartDate(vm.timeSpan.key),
+            'key': 'slow_calls'
+        }, function (data) {
+            vm.slowCalls = data;
+            vm.loading.slowCalls = false;
+        }, function () {
+            vm.loading.slowCalls = false;
         });
-    });
-    _.each(stateHolder.AeUser.applications, function (item) {
-        vm.filterTypeAheadOptions.push({
-            type: 'resource',
-            text: 'resource:' + item.resource_id + ':' + item.resource_name,
-            example: 'resource:' + item.resource_id,
-            'tag': item.resource_name,
-            'description': 'Restrict resultset to this application'
+    }
+
+    vm.fetchRequestsBreakdown = function () {
+        vm.loading.requestsBreakdown = true;
+        applicationsPropertyResource.query({
+            'resourceId': vm.resource,
+            "start_date": timeSpanToStartDate(vm.timeSpan.key),
+            'key': 'requests_breakdown'
+        }, function (data) {
+            vm.requestsBreakdown = data;
+            vm.loading.requestsBreakdown = false;
+        }, function () {
+            vm.loading.requestsBreakdown = false;
         });
-    });
+    }
 
-    vm.paginationChange = function(){
-        $location.search('page', vm.page);
-        vm.refresh();
-    };
+    vm.fetchTrendingReports = function () {
 
-    vm.typeAheadTag = function (event) {
-        var text = vm.filterTypeAhead;
-        if (_.isObject(vm.filterTypeAhead)) {
-            text = vm.filterTypeAhead.text;
+        if (vm.graphType.selected == 'slow_report_graphs') {
+            var report_type = 'slow';
         }
-        if (!vm.filterTypeAhead) {
-            return
+        else {
+            var report_type = 'error';
         }
 
-        var parsed = text.split(':');
-        var tag = {'type': null, 'value': null};
-        // app tags have : twice
-        if (parsed.length > 2 && parsed[0] == 'resource') {
-            tag.type = 'resource';
-            tag.value = parsed[1];
-        }
-        // normal tag:value
-        else if (parsed.length > 1) {
-            tag.type = parsed[0];
-            var tagValue = parsed.slice(1);
-            if (tagValue) {
-                tag.value = tagValue.join(':');
+        vm.loading.reports = true;
+        vm.trendingReports = applicationsPropertyResource.query({
+                'key': 'trending_reports',
+                'resourceId': vm.resource,
+                "start_date": timeSpanToStartDate(vm.timeSpan.key),
+                "report_type": report_type
+            },
+            function () {
+                vm.loading.reports = false;
+            },
+            function () {
+                vm.loading.reports = false;
             }
-        }
-        else {
-            tag.type = 'error';
-            tag.value = parsed.join(':');
-        }
+        );
+    };
 
-        // set datepicker hour based on type of field
-        if ('start_date:' == text) {
-            vm.showDatePicker = true;
-            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
-        }
-        else if ('end_date:' == text) {
-            vm.showDatePicker = true;
-            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
-        }
+    $scope.$on('$destroy',function(){
+        $interval.cancel(vm.intervalId);
+    });
 
-        if (event.keyCode != 13 || !tag.type || !tag.value) {
-            return
-        }
-        vm.showDatePicker = false;
-        // aka we selected one of main options
-        vm.addSearchTag({type: tag.type, value: tag.value});
-        // clear typeahead
-        vm.filterTypeAhead = undefined;
-    };
+    if (stateHolder.AeUser.applications.length){
+        vm.show_dashboard = true;
+        vm.determineStartState();
+    }
+}
 
-    vm.pickerDateChanged = function(){
-        if (vm.filterTypeAhead.indexOf('start_date:') == '0') {
-            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
-        }
-        else if (vm.filterTypeAhead.indexOf('end_date:') == '0') {
-            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
-        }
-        vm.showDatePicker = false;
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
+
+
+ApplicationsIntegrationsEditViewController.$inject = ['$state', 'integrationResource'];
+
+function ApplicationsIntegrationsEditViewController($state, integrationResource) {
+    
+    var vm = this;
+    vm.$state = $state;
+    vm.loading = {integration: true};
+    vm.config = integrationResource.get(
+        {
+            integration: $state.params.integration,
+            action: 'setup',
+            resourceId: $state.params.resourceId
+        }, function (data) {
+            vm.loading.integration = false;
+        });
+
+    vm.configureIntegration = function () {
+        console.info('configureIntegration');
+        vm.loading.integration = true;
+        integrationResource.save(
+            {
+                integration: $state.params.integration,
+                action: 'setup',
+                resourceId: $state.params.resourceId
+            }, vm.config, function (data) {
+                vm.loading.integration = false;
+                setServerValidation(vm.integrationForm);
+            }, function (response) {
+                if (response.status == 422) {
+                    setServerValidation(vm.integrationForm, response.data);
+                }
+                vm.loading.integration = false;
+            });
     };
 
-    var reportPresentation = function (report) {
-        report.presentation = {};
-        if (report.group.public) {
-            report.presentation.className = 'public';
-            report.presentation.tooltip = 'Public';
-        }
-        else if (report.group.fixed) {
-            report.presentation.className = 'fixed';
-            report.presentation.tooltip = 'Fixed';
-        }
-        else if (report.group.read) {
-            report.presentation.className = 'reviewed';
-            report.presentation.tooltip = 'Reviewed';
-        }
-        else {
-            report.presentation.className = 'new';
-            report.presentation.tooltip = 'New';
-        }
-        return report;
-    };
+    vm.removeIntegration = function () {
+        console.info('removeIntegration');
+        integrationResource.remove({
+                integration: $state.params.integration,
+                resourceId: $state.params.resourceId,
+                action: 'delete'
+            },
+            function () {
+                $state.go('applications.integrations',
+                    {resourceId: $state.params.resourceId});
+            }
+        );
+    }
+
+    vm.testIntegration = function (to_test) {
+        console.info('testIntegration', to_test);
+        vm.loading.integration = true;
+        integrationResource.save(
+            {
+                integration: $state.params.integration,
+                action: 'test_' + to_test,
+                resourceId: $state.params.resourceId
+            }, vm.config, function (data) {
+                vm.loading.integration = false;
+            }, function (response) {
+                vm.loading.integration = false;
+            });
+    }
+
+    
+}
+
+;angular.module('appenlight.components.bitbucketIntegrationConfigView', [])
+    .component('bitbucketIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/bitbucket-integration-config-view/bitbucket-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
+
+;angular.module('appenlight.components.campfireIntegrationConfigView', [])
+    .component('campfireIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/campfire-integration-config-view/campfire-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
+
+;angular.module('appenlight.components.flowdockIntegrationConfigView', [])
+    .component('flowdockIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/flowdock-integration-config-view/flowdock-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
+
+;angular.module('appenlight.components.githubIntegrationConfigView', [])
+    .component('githubIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/github-integration-config-view/github-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
 
-    vm.fetchReports = function (searchParams) {
-        vm.is_loading = true;
-        reportsResource.query(searchParams, function (data, getResponseHeaders) {
-            var headers = getResponseHeaders();
-            
-            vm.is_loading = false;
-            vm.reportsPage = _.map(data, function (item) {
-                return reportPresentation(item);
-            });
-            vm.itemCount = headers['x-total-count'];
-            vm.itemsPerPage = headers['x-items-per-page'];
-        }, function () {
-            vm.is_loading = false;
-        });
-    };
+;angular.module('appenlight.components.hipchatIntegrationConfigView', [])
+    .component('hipchatIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/hipchat-integration-config-view/hipchat-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
 
-    vm.filterId = function (log) {
-        vm.searchParams.tags.push({
-            type: "request_id",
-            value: log.request_id
-        });
-        vm.refresh();
-    };
+;angular.module('appenlight.components.jiraIntegrationConfigView', [])
+    .component('jiraIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/jira-integration-config-view/jira-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
 
-    vm.refresh = function(){
-        vm.searchParams = parseSearchToTags($location.search());
-        vm.page = Number(vm.searchParams.page) || 1;
-        var params = parseTagsToSearch(vm.searchParams);
-        
-        vm.fetchReports(params);
-    };
-    // initial load
-    vm.refresh();
-}
+;angular.module('appenlight.components.slackIntegrationConfigView', [])
+    .component('slackIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/slack-integration-config-view/slack-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
+
+;angular.module('appenlight.components.webhooksIntegrationConfigView', [])
+    .component('webhooksIntegrationConfigView', {
+        templateUrl: 'components/views/integrations/webhooks-integration-config-view/webhooks-integration-config-view.html',
+        controller: ApplicationsIntegrationsEditViewController
+    });
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -9463,41 +9180,100 @@ function reportsBrowserViewController($location, $cookies, stateHolder,
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-'use strict';
-
-/* Controllers */
-
-angular.module('appenlight.components.reportsSlowBrowserView', [])
-    .component('reportsSlowBrowserView', {
-        templateUrl: 'components/views/reports-slow-browser-view/reports-slow-browser-view.html',
-        controller: ReportsSlowBrowserViewController
+angular.module('appenlight.components.logsBrowserView', [])
+    .component('logsBrowserView', {
+        templateUrl: 'components/views/logs-browser/logs-browser.html',
+        controller: LogsBrowserController
     });
 
-ReportsSlowBrowserViewController.$inject = ['$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'slowReportsResource']
+LogsBrowserController.$inject = ['$location', 'stateHolder', 'typeAheadTagHelper', 'logsNoIdResource', 'sectionViewResource'];
 
-function ReportsSlowBrowserViewController($location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource) {
+function LogsBrowserController($location, stateHolder, typeAheadTagHelper, logsNoIdResource, sectionViewResource) {
     var vm = this;
-    vm.applications = stateHolder.AeUser.applications_map;
-    stateHolder.section = 'slow_reports';
+    vm.logEventsChartConfig = {
+        data: {
+            json: [],
+            xFormat: '%Y-%m-%dT%H:%M:%S'
+        },
+        color: {
+            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
+        },
+        axis: {
+            x: {
+                type: 'timeseries',
+                tick: {
+                    format: '%Y-%m-%d'
+                }
+            },
+            y: {
+                tick: {
+                    count: 5,
+                    format: d3.format('.2s')
+                }
+            }
+        },
+        subchart: {
+            show: true,
+            size: {
+                height: 20
+            }
+        },
+        size: {
+            height: 250
+        },
+        zoom: {
+            rescale: true
+        },
+        grid: {
+            x: {
+                show: true
+            },
+            y: {
+                show: true
+            }
+        },
+        tooltip: {
+            format: {
+                title: function (d) {
+                    return '' + d;
+                },
+                value: function (v) {
+                    return v
+                }
+            }
+        }
+    };
+    vm.logEventsChartData = {};
+    stateHolder.section = 'logs';
     vm.today = function () {
         vm.pickerDate = new Date();
     };
     vm.today();
-    vm.reportsPage = [];
-    vm.page = 1;
+
+    vm.applications = stateHolder.AeUser.applications_map;
+    vm.logsPage = [];
     vm.itemCount = 0;
     vm.itemsPerPage = 250;
-    typeAheadTagHelper.tags = [];
-    vm.searchParams = {tags: [], page: 1, type: 'slow_report'};
-    vm.is_loading = false;
+    vm.page = 1;
+    vm.$location = $location;
+    vm.isLoading = {
+        logs: true,
+        series: true
+    };
     vm.filterTypeAheadOptions = [
         {
-            type: 'view_name',
-            text: 'view_name:',
-            'description': 'Query reports occured in specific views',
-            tag: 'View Name',
-            example: "view_name:module.foo"
+            type: 'message',
+            text: 'message:',
+            'description': 'Full-text search in your logs',
+            tag: 'Message',
+            example: 'message:text-im-looking-for'
+        },
+        {
+            type: 'namespace',
+            text: 'namespace:',
+            'description': 'Query logs from specific namespace',
+            tag: 'Namespace',
+            example: "namespace:module.foo"
         },
         {
             type: 'resource',
@@ -9507,79 +9283,48 @@ function ReportsSlowBrowserViewController($location, $cookies, stateHolder, type
             example: "resource:ID"
         },
         {
-            type: 'priority',
-            text: 'priority:',
-            'description': 'Show reports with specific priority',
-            example: 'priority:8',
-            tag: 'Priority'
-        },
-        {
-            type: 'min_occurences',
-            text: 'min_occurences:',
-            'description': 'Show reports from groups with at least X occurences',
-            example: 'min_occurences:25',
-            tag: 'Min. occurences'
-        },
-        {
-            type: 'min_duration',
-            text: 'min_duration:',
-            'description': 'Show reports from groups with average duration >= Xs',
-            example: 'min_duration:4.5',
-            tag: 'Min. duration'
-        },
-        {
-            type: 'url_path',
-            text: 'url_path:',
-            'description': 'Show reports from specific URL paths',
-            example: 'url_path:/foo/bar/baz',
-            tag: 'Url Path'
-        },
-        {
-            type: 'url_domain',
-            text: 'url_domain:',
-            'description': 'Show reports from specific domain',
-            example: 'url_domain:domain.com',
-            tag: 'Domain'
-        },
-        {
             type: 'request_id',
             text: 'request_id:',
-            'description': 'Show reports with specific request id',
+            'description': 'Show logs with specific request id',
             example: "request_id:883143dc572e4c38aceae92af0ea5ae0",
             tag: 'Request ID'
         },
         {
-            type: 'report_status',
-            text: 'report_status:',
-            'description': 'Show reports from groups with specific status',
-            example: 'report_status:never_reviewed',
-            tag: 'Status'
+            type: 'level',
+            text: 'level:',
+            'description': 'Show entries with specific log level',
+            example: 'level:warning',
+            tag: 'Level'
         },
         {
             type: 'server_name',
             text: 'server_name:',
-            'description': 'Show reports tagged with this key/value pair',
+            'description': 'Show entries tagged with this key/value pair',
             example: 'server_name:hostname',
             tag: 'Tag'
         },
         {
             type: 'start_date',
             text: 'start_date:',
-            'description': 'Show reports newer than this date (press TAB for dropdown)',
+            'description': 'Show results newer than this date (press TAB for dropdown)',
             example: 'start_date:2014-08-15T13:00',
             tag: 'Start Date'
         },
         {
             type: 'end_date',
             text: 'end_date:',
-            'description': 'Show reports older than this date (press TAB for dropdown)',
+            'description': 'Show results older than this date (press TAB for dropdown)',
             example: 'start_date:2014-08-15T23:59',
             tag: 'End Date'
-        }
+        },
+        {type: 'level', value: 'debug', text: 'level:debug'},
+        {type: 'level', value: 'info', text: 'level:info'},
+        {type: 'level', value: 'warning', text: 'level:warning'},
+        {type: 'level', value: 'critical', text: 'level:critical'}
     ];
-
-    vm.filterTypeAhead = undefined;
+    vm.filterTypeAhead = null;
     vm.showDatePicker = false;
+    vm.manualOpen = false;
     vm.aheadFilter = typeAheadTagHelper.aheadFilter;
     vm.removeSearchTag = function (tag) {
         $location.search(tag.type, null);
@@ -9589,36 +9334,14 @@ function ReportsSlowBrowserViewController($location, $cookies, stateHolder, type
         $location.search(tag.type, tag.value);
         vm.refresh();
     };
-    vm.manualOpen = false;
-    vm.notRelativeTime = false;
-    if ($cookies.notRelativeTime) {
-        vm.notRelativeTime = JSON.parse($cookies.notRelativeTime);
-    }
 
-
-    vm.changeRelativeTime = function () {
-        $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
+    vm.paginationChange = function(){
+        $location.search('page', vm.page);
+        vm.refresh();
     };
 
-    _.each(_.range(1, 11), function (priority) {
-        vm.filterTypeAheadOptions.push({
-            type: 'priority',
-            text: 'priority:' + priority.toString(),
-            description: 'Show entries with specific priority',
-            example: 'priority:' + priority,
-            tag: 'Priority'
-        });
-    });
-    _.each(['never_reviewed', 'reviewed', 'fixed', 'public'], function (status) {
-        vm.filterTypeAheadOptions.push({
-            type: 'report_status',
-            text: 'report_status:' + status,
-            'description': 'Show only reports with this status',
-            example: 'report_status:' + status,
-            tag: 'Status ' + status.toUpperCase()
-        });
-    });
-    _.each(stateHolder.AeUser.applications, function (item) {
+
+    _.each(vm.applications, function (item) {
         vm.filterTypeAheadOptions.push({
             type: 'resource',
             text: 'resource:' + item.resource_id + ':' + item.resource_name,
@@ -9646,10 +9369,11 @@ function ReportsSlowBrowserViewController($location, $cookies, stateHolder, type
         // normal tag:value
         else if (parsed.length > 1) {
             tag.type = parsed[0];
-            var tagValue = parsed.slice(1);
-            if (tagValue) {
-                tag.value = tagValue.join(':');
-            }
+            tag.value = parsed.slice(1).join(':');
+        }
+        else {
+            tag.type = 'message';
+            tag.value = parsed.join(':');
         }
 
         // set datepicker hour based on type of field
@@ -9672,10 +9396,6 @@ function ReportsSlowBrowserViewController($location, $cookies, stateHolder, type
         vm.filterTypeAhead = undefined;
     };
 
-    vm.paginationChange = function(){
-        $location.search('page', vm.page);
-        vm.refresh();
-    };
 
     vm.pickerDateChanged = function(){
         if (vm.filterTypeAhead.indexOf('start_date:') == '0') {
@@ -9687,58 +9407,56 @@ function ReportsSlowBrowserViewController($location, $cookies, stateHolder, type
         vm.showDatePicker = false;
     };
 
-    var reportPresentation = function (report) {
-        report.presentation = {};
-        if (report.group.public) {
-            report.presentation.className = 'public';
-            report.presentation.tooltip = 'Public';
-        }
-        else if (report.group.fixed) {
-            report.presentation.className = 'fixed';
-            report.presentation.tooltip = 'Fixed';
-        }
-        else if (report.group.read) {
-            report.presentation.className = 'reviewed';
-            report.presentation.tooltip = 'Reviewed';
-        }
-        else {
-            report.presentation.className = 'new';
-            report.presentation.tooltip = 'New';
-        }
-        return report;
-    };
-
-    vm.fetchReports = function (searchParams) {
-        vm.is_loading = true;
-        slowReportsResource.query(searchParams, function (data, getResponseHeaders) {
+    vm.fetchLogs = function (searchParams) {
+        vm.isLoading.logs = true;
+        logsNoIdResource.query(searchParams, function (data, getResponseHeaders) {
+            vm.isLoading.logs = false;
             var headers = getResponseHeaders();
-            
-            vm.is_loading = false;
-            vm.reportsPage = _.map(data, function (item) {
-                return reportPresentation(item);
-            });
+            vm.logsPage = data;
             vm.itemCount = headers['x-total-count'];
             vm.itemsPerPage = headers['x-items-per-page'];
         }, function () {
-            vm.is_loading = false;
+            vm.isLoading.logs = false;
         });
     };
 
-    vm.filterId = function (log) {
-        vm.searchParams.tags.push({
-            type: "request_id",
-            value: log.request_id
+    vm.fetchSeriesData = function (searchParams) {
+        searchParams['section'] = 'logs_section';
+        searchParams['view'] = 'fetch_series';
+        vm.isLoading.series = true;
+        sectionViewResource.query(searchParams, function (data) {
+            
+            vm.logEventsChartData = {
+                json: data,
+                xFormat: '%Y-%m-%dT%H:%M:%S',
+                keys: {
+                    x: 'x',
+                    value: ["logs"]
+                },
+                names: {
+                    logs: 'Log events'
+                },
+                type: 'bar'
+            };
+            vm.isLoading.series = false;
+        }, function () {
+            vm.isLoading.series = false;
         });
+    };
+
+    vm.filterId = function (log) {
+        $location.search('request_id', log.request_id);
         vm.refresh();
     };
+
     vm.refresh = function(){
         vm.searchParams = parseSearchToTags($location.search());
         vm.page = Number(vm.searchParams.page) || 1;
         var params = parseTagsToSearch(vm.searchParams);
-        vm.fetchReports(params);
+        vm.fetchLogs(params);
+        vm.fetchSeriesData(params);
     };
-
-    //initial load
+    console.info('page load');
     vm.refresh();
 }
 
@@ -9761,275 +9479,345 @@ function ReportsSlowBrowserViewController($location, $cookies, stateHolder, type
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.settingsView', [])
-    .component('settingsView', {
-        templateUrl: 'components/views/settings-view/settings-view.html',
-        controller: SettingsViewController
-    });
-
-SettingsViewController.$inject = ['$state'];
-
-function SettingsViewController($state) {
-    this.$state = $state;
-    console.info('SettingsViewController');
-}
-
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
-
-angular.module('appenlight.components.userAlertChannelsEmailNewView', [])
-    .component('userAlertChannelsEmailNewView', {
-        templateUrl: 'components/views/user-alert-channel-email-new-view/user-alert-channel-email-new-view.html',
-        controller: AlertChannelsEmailController
+angular.module('appenlight.components.reportView', [])
+    .component('reportView', {
+        templateUrl: 'components/views/report-view/report-view.html',
+        controller: ReportViewController
     });
 
-AlertChannelsEmailController.$inject = ['$state','userSelfPropertyResource'];
+ReportViewController.$inject = ['$window', '$location', '$state', '$uibModal',
+    '$cookies', 'reportGroupPropertyResource', 'reportGroupResource',
+    'logsNoIdResource', 'stateHolder'];
 
-function AlertChannelsEmailController($state, userSelfPropertyResource) {
-    
+function ReportViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, stateHolder) {
     var vm = this;
+    vm.window = $window;
+    vm.stateHolder = stateHolder;
     vm.$state = $state;
-    vm.loading = {email: false};
-    vm.form = {};
-
-    vm.createChannel = function () {
-        vm.loading.email = true;
-        
-        userSelfPropertyResource.save({key: 'alert_channels'}, vm.form, function () {
-            //vm.loading.email = false;
-            //setServerValidation(vm.channelForm);
-            //vm.form = {};
-            $state.go('user.alert_channels.list');
-        }, function (response) {
-            if (response.status == 422) {
-                setServerValidation(vm.channelForm, response.data);
+    vm.reportHistoryConfig = {
+        data: {
+            json: [],
+            xFormat: '%Y-%m-%dT%H:%M:%S'
+        },
+        color: {
+            pattern: ['#6baed6', '#e6550d', '#74c476', '#fdd0a2', '#8c564b']
+        },
+        axis: {
+            x: {
+                type: 'timeseries',
+                tick: {
+                    format: '%Y-%m-%d'
+                }
+            },
+            y: {
+                tick: {
+                    count: 5,
+                    format: d3.format('.2s')
+                }
             }
-            vm.loading.email = false;
-        });
-    }
-}
-
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
+        },
+        subchart: {
+            show: true,
+            size: {
+                height: 20
+            }
+        },
+        size: {
+            height: 250
+        },
+        zoom: {
+            rescale: true
+        },
+        grid: {
+            x: {
+                show: true
+            },
+            y: {
+                show: true
+            }
+        },
+        tooltip: {
+            format: {
+                title: function (d) {
+                    return '' + d;
+                },
+                value: function (v) {
+                    return v
+                }
+            }
+        }
+    };
+    vm.mentionedPeople = [];
+    vm.reportHistoryData = {};
+    vm.textTraceback = true;
+    vm.rawTraceback = '';
+    vm.traceback = '';
+    vm.reportType = 'report';
+    vm.report = null;
+    vm.showLong = false;
+    vm.reportLogs = null;
+    vm.requestStats = null;
+    vm.comment = null;
+    vm.is_loading = {
+        report: true,
+        logs: true,
+        history: true
+    };
 
-angular.module('appenlight.components.userAlertChannelsListView', [])
-    .component('userAlertChannelsListView', {
-        templateUrl: 'components/views/user-alert-channels-list-view/user-alert-channels-list-view.html',
-        controller: userAlertChannelsListViewController
-    });
+    vm.searchMentionedPeople = function(term){
+        //vm.mentionedPeople = [];
+        var term = term.toLowerCase();
+        reportGroupPropertyResource.get({
+                groupId: vm.report.group_id,
+                key: 'assigned_users'
+            }, null,
+            function (data) {
+                var users = [];
+                _.each(data.assigned, function(u){
+                    users.push({label: u.user_name});
+                });
+                _.each(data.unassigned, function(u){
+                    users.push({label: u.user_name});
+                });
 
-userAlertChannelsListViewController.$inject = ['$state','userSelfPropertyResource', 'applicationsNoIdResource'];
+                var result = _.filter(users, function(u){
+                   return u.label.toLowerCase().indexOf(term) !== -1;
+                });
+                vm.mentionedPeople = result;
+            });
+    };
 
-function userAlertChannelsListViewController($state, userSelfPropertyResource, applicationsNoIdResource) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {channels: true, applications: true, actions:true};
+    vm.searchTag = function (tag, value) {
+        
+        if (vm.report.report_type === 3) {
+            $location.url($state.href('report.list_slow'));
+        }
+        else {
+            $location.url($state.href('report.list'));
+        }
+        $location.search(tag, value);
+    };
 
-    vm.alertChannels = userSelfPropertyResource.query({key: 'alert_channels'},
-        function (data) {
-            vm.loading.channels = false;
-        });
+    vm.tabs = {
+        slow_calls:false,
+        request_details:false,
+        logs:false,
+        comments:false,
+        affected_users:false
+    };
+    if ($cookies.selectedReportTab) {
+        vm.tabs[$cookies.selectedReportTab] = true;
+    }
+    else{
+        $cookies.selectedReportTab = 'request_details';
+        vm.tabs.request_details = true;
+    }
 
-    vm.alertActions = userSelfPropertyResource.query({key: 'alert_actions'},
-        function (data) {
-            vm.loading.actions = false;
+    vm.fetchLogs = function () {
+        if (!vm.report.request_id){
+            return
+        }
+        vm.is_loading.logs = true;
+        logsNoIdResource.query({request_id: vm.report.request_id},
+            function (data) {
+            vm.is_loading.logs = false;
+            vm.reportLogs = data;
+        }, function () {
+            vm.is_loading.logs = false;
         });
+    };
+    vm.addComment = function () {
+        reportGroupPropertyResource.save({
+                groupId: vm.report.group_id,
+                key: 'comments'
+            }, {body: vm.comment},
+            function (data) {
+                vm.report.comments.push(data);
+            });
+        vm.comment = '';
+    };
 
-    vm.applications = applicationsNoIdResource.query({permission: 'view'},
-        function (data) {
-            vm.loading.applications = false;
+    vm.fetchReport = function () {
+        vm.is_loading.report = true;
+        reportGroupResource.get($state.params, function (data) {
+            vm.is_loading.report = false;
+            if (data.request) {
+                try {
+                    var to_sort = _.pairs(data.request);
+                    data.request = _.object(_.sortBy(to_sort, function (i) {
+                        return i[0]
+                    }));
+                }
+                catch (err) {
+                }
+            }
+            vm.report = data;
+            if (vm.report.req_stats) {
+                vm.requestStats = [];
+                _.each(_.pairs(vm.report.req_stats['percentages']), function (p) {
+                    vm.requestStats.push({
+                        name: p[0],
+                        value: vm.report.req_stats[p[0]].toFixed(3),
+                        percent: p[1],
+                        calls: vm.report.req_stats[p[0] + '_calls']
+                    })
+                });
+            }
+            vm.traceback = data.traceback;
+            _.each(vm.traceback, function (frame) {
+                if (frame.line) {
+                    vm.rawTraceback += 'File ' + frame.file + ' line ' + frame.line + ' in ' + frame.fn + ": \r\n";
+                }
+                vm.rawTraceback += '    ' + frame.cline + "\r\n";
+            });
+
+            if (stateHolder.AeUser.id){
+                vm.fetchHistory();
+            }
+
+            vm.selectedTab($cookies.selectedReportTab);
+
+        }, function (response) {
+            
+            if (response.status == 403) {
+                var uid = response.headers('x-appenlight-uid');
+                if (!uid) {
+                    window.location = '/register?came_from=' + encodeURIComponent(window.location);
+                }
+            }
+            vm.is_loading.report = false;
         });
+    };
 
-    var allOps = {
-        'eq': 'Equal',
-        'ne': 'Not equal',
-        'ge': 'Greater or equal',
-        'gt': 'Greater than',
-        'le': 'Lesser or equal',
-        'lt': 'Lesser than',
-        'startswith': 'Starts with',
-        'endswith': 'Ends with',
-        'contains': 'Contains'
+    vm.selectedTab = function(tab_name){
+        $cookies.selectedReportTab = tab_name;
+        if (tab_name == 'logs' && vm.reportLogs === null) {
+            vm.fetchLogs();
+        }
     };
 
-    var fieldOps = {};
-    fieldOps['http_status'] = ['eq', 'ne', 'ge', 'le'];
-    fieldOps['group:priority'] = ['eq', 'ne', 'ge', 'le'];
-    fieldOps['duration'] = ['ge', 'le'];
-    fieldOps['url_domain'] = ['eq', 'ne', 'startswith', 'endswith',
-        'contains'];
-    fieldOps['url_path'] = ['eq', 'ne', 'startswith', 'endswith',
-        'contains'];
-    fieldOps['error'] = ['eq', 'ne', 'startswith', 'endswith',
-        'contains'];
-    fieldOps['tags:server_name'] = ['eq', 'ne', 'startswith', 'endswith',
-        'contains'];
-    fieldOps['group:occurences'] = ['eq', 'ne', 'ge', 'le'];
+    vm.markFixed = function () {
+        reportGroupResource.update({
+                groupId: vm.report.group_id
+            }, {fixed: !vm.report.group.fixed},
+            function (data) {
+                vm.report.group.fixed = data.fixed;
+            });
+    };
 
-    var possibleFields = {
-        '__AND__': 'All met (composite rule)',
-        '__OR__': 'One met (composite rule)',
-        '__NOT__': 'Not met (composite rule)',
-        'http_status': 'HTTP Status',
-        'duration': 'Request duration',
-        'group:priority': 'Group -> Priority',
-        'url_domain': 'Domain',
-        'url_path': 'URL Path',
-        'error': 'Error',
-        'tags:server_name': 'Tag -> Server name',
-        'group:occurences': 'Group -> Occurences'
+    vm.markPublic = function () {
+        reportGroupResource.update({
+                groupId: vm.report.group_id
+            }, {public: !vm.report.group.public},
+            function (data) {
+                vm.report.group.public = data.public;
+            });
     };
 
-    vm.ruleDefinitions = {
-        fieldOps: fieldOps,
-        allOps: allOps,
-        possibleFields: possibleFields
+    vm.delete = function () {
+        reportGroupResource.delete({'groupId': vm.report.group_id},
+            function (data) {
+            $state.go('report.list');
+        })
     };
 
-    vm.addAction = function (channel) {
-        
-        userSelfPropertyResource.save({key: 'alert_channels_rules'}, {}, function (data) {
-            vm.alertActions.push(data);
-        }, function (response) {
-            if (response.status == 422) {
-                
+    vm.assignUsersModal = function (index) {
+        vm.opts = {
+            backdrop: 'static',
+            templateUrl: 'AssignReportCtrl.html',
+            controller: 'AssignReportCtrl as ctrl',
+            resolve: {
+                report: function () {
+                    return vm.report;
+                }
             }
+        };
+        var modalInstance = $uibModal.open(vm.opts);
+        modalInstance.result.then(function (report) {
+
+        }, function () {
+            console.info('Modal dismissed at: ' + new Date());
         });
+
     };
 
-    vm.updateChannel = function (channel, subKey) {
-        var params = {
-            key: 'alert_channels',
-            channel_name: channel['channel_name'],
-            channel_value: channel['channel_value']
-        };
-        var toUpdate = {};
-        if (['daily_digest', 'send_alerts'].indexOf(subKey) !== -1) {
-            toUpdate[subKey] = !channel[subKey];
-        }
-        userSelfPropertyResource.update(params, toUpdate, function (data) {
-            _.extend(channel, data);
+    vm.fetchHistory = function () {
+        reportGroupPropertyResource.query({
+            groupId: vm.report.group_id,
+            key: 'history'
+        }, function (data) {
+            vm.reportHistoryData = {
+                json: data,
+                keys: {
+                    x: 'x',
+                    value: ["reports"]
+                },
+                names: {
+                    reports: 'Reports history'
+                },
+                type: 'bar'
+            };
+            vm.is_loading.history = false;
         });
     };
 
-    vm.removeChannel = function (channel) {
-        
-        userSelfPropertyResource.delete({
-            key: 'alert_channels',
-            channel_name: channel.channel_name,
-            channel_value: channel.channel_value
-        }, function () {
-            vm.alertChannels = _.filter(vm.alertChannels, function(item){
-                return item != channel;
-            });
+    vm.nextDetail = function () {
+        $state.go('report.view_detail', {
+            groupId: vm.report.group_id,
+            reportId: vm.report.group.next_report
         });
+    };
+    vm.previousDetail = function () {
+        $state.go('report.view_detail', {
+            groupId: vm.report.group_id,
+            reportId: vm.report.group.previous_report
+        });
+    };
 
-    }
-
-}
-
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
-
-angular.module('appenlight.components.userAuthTokensView', [])
-    .component('userAuthTokensView', {
-        templateUrl: 'components/views/user-auth-tokens-view/user-auth-tokens-view.html',
-        controller: userAuthTokensViewController
-    });
-
-userAuthTokensViewController.$inject = ['$state', 'userSelfPropertyResource', 'AeConfig'];
-
-function userAuthTokensViewController($state, userSelfPropertyResource, AeConfig) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {tokens: true};
+    vm.runIntegration = function (integration_name) {
+        
+        if (integration_name == 'bitbucket') {
+            var controller = 'BitbucketIntegrationCtrl as ctrl';
+            var template_url = 'templates/integrations/bitbucket.html';
+        }
+        else if (integration_name == 'github') {
+            var controller = 'GithubIntegrationCtrl as ctrl';
+            var template_url = 'templates/integrations/github.html';
+        }
+        else if (integration_name == 'jira') {
+            var controller = 'JiraIntegrationCtrl as ctrl';
+            var template_url = 'templates/integrations/jira.html';
+        }
+        else {
+            return false;
+        }
 
-    vm.expireOptions = AeConfig.timeOptions;
+        vm.opts = {
+            backdrop: 'static',
+            templateUrl: template_url,
+            controller: controller,
+            resolve: {
+                integrationName: function () {
+                    return integration_name
+                },
+                report: function () {
+                    return vm.report;
+                }
+            }
+        };
+        var modalInstance = $uibModal.open(vm.opts);
+        modalInstance.result.then(function (report) {
 
-    vm.tokens = userSelfPropertyResource.query({key: 'auth_tokens'},
-        function (data) {
-            vm.loading.tokens = false;
+        }, function () {
+            console.info('Modal dismissed at: ' + new Date());
         });
 
-    vm.addToken = function () {
-        vm.loading.tokens = true;
-        userSelfPropertyResource.save({key: 'auth_tokens'},
-            vm.form,
-            function (data) {
-                vm.loading.tokens = false;
-                setServerValidation(vm.TokenForm);
-                vm.form = {};
-                vm.tokens.push(data);
-            }, function (response) {
-                vm.loading.tokens = false;
-                if (response.status == 422) {
-                    setServerValidation(vm.TokenForm, response.data);
-                }
-            })
     };
 
-    vm.removeToken = function (token) {
-        userSelfPropertyResource.delete({
-                key: 'auth_tokens',
-                token: token.token
-            },
-            function () {
-                var index = vm.tokens.indexOf(token);
-                if (index !== -1) {
-                    vm.tokens.splice(index, 1);
-                }
-            })
-    }
+    // load report
+    vm.fetchReport();
+
+
 }
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
@@ -10051,151 +9839,306 @@ function userAuthTokensViewController($state, userSelfPropertyResource, AeConfig
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.components.userIdentitiesView', [])
-    .component('userIdentitiesView', {
-        templateUrl: 'components/views/user-identities-view/user-identities-view.html',
-        controller: UserIdentitiesController
+angular.module('appenlight.components.reportsBrowserView', [])
+    .component('reportsBrowserView', {
+        templateUrl: 'components/views/reports-browser-view/reports-browser-view.html',
+        controller: reportsBrowserViewController
     });
 
-UserIdentitiesController.$inject = ['$state', 'userSelfPropertyResource', 'AeConfig'];
+reportsBrowserViewController.$inject = ['$location', '$cookies',
+    'stateHolder', 'typeAheadTagHelper', 'reportsResource'];
 
-function UserIdentitiesController($state, userSelfPropertyResource, AeConfig) {
-    
+function reportsBrowserViewController($location, $cookies, stateHolder,
+                               typeAheadTagHelper, reportsResource) {
     var vm = this;
-    vm.$state = $state;
-    vm.AeConfig = AeConfig;
-    vm.loading = {identities: true};
-
-    vm.identities = userSelfPropertyResource.query(
-        {key: 'external_identities'},
-        function (data) {
-            vm.loading.identities = false;
-            
-        });
-
-    vm.removeProvider = function (provider) {
-        
-        userSelfPropertyResource.delete(
-            {
-                key: 'external_identities',
-                provider: provider.provider,
-                id: provider.id
-            },
-            function (status) {
-                if (status){
-                    vm.identities = _.filter(vm.identities, function (item) {
-                        return item != provider
-                    });
-                }
+    vm.applications = stateHolder.AeUser.applications_map;
+    stateHolder.section = 'reports';
+    vm.today = function () {
+        vm.pickerDate = new Date();
+    };
+    vm.today();
+    vm.reportsPage = [];
+    vm.page = 1;
+    vm.itemCount = 0;
+    vm.itemsPerPage = 250;
+    typeAheadTagHelper.tags = [];
+    vm.searchParams = {tags: [], page: 1, type: 'report'};
+    vm.is_loading = false;
+    vm.filterTypeAheadOptions = [
+        {
+            type: 'error',
+            text: 'error:',
+            'description': 'Full-text search in your reports',
+            example: 'error:text-im-looking-for',
+            tag: 'Error'
+        },
+        {
+            type: 'view_name',
+            text: 'view_name:',
+            'description': 'Query reports occured in specific views',
+            example: "view_name:module.foo",
+            tag: 'View Name'
+        },
+        {
+            type: 'resource',
+            text: 'resource:',
+            'description': 'Restrict resultset to application',
+            example: "resource:ID",
+            tag: 'Application'
+        },
+        {
+            type: 'priority',
+            text: 'priority:',
+            'description': 'Show reports with specific priority',
+            example: 'priority:8',
+            tag: 'Priority'
+        },
+        {
+            type: 'min_occurences',
+            text: 'min_occurences:',
+            'description': 'Show reports from groups with at least X occurences',
+            example: 'min_occurences:25',
+            tag: 'Occurences'
+        },
+        {
+            type: 'url_path',
+            text: 'url_path:',
+            'description': 'Show reports from specific URL paths',
+            example: 'url_path:/foo/bar/baz',
+            tag: 'Url Path'
+        },
+        {
+            type: 'url_domain',
+            text: 'url_domain:',
+            'description': 'Show reports from specific domain',
+            example: 'url_domain:domain.com',
+            tag: 'Domain'
+        },
+        {
+            type: 'report_status',
+            text: 'report_status:',
+            'description': 'Show reports from groups with specific status',
+            example: 'report_status:never_reviewed',
+            tag: 'Status'
+        },
+        {
+            type: 'request_id',
+            text: 'request_id:',
+            'description': 'Show reports with specific request id',
+            example: "request_id:883143dc572e4c38aceae92af0ea5ae0",
+            tag: 'Request ID'
+        },
+        {
+            type: 'server_name',
+            text: 'server_name:',
+            'description': 'Show reports tagged with this key/value pair',
+            example: 'server_name:hostname',
+            tag: 'Tag'
+        },
+        {
+            type: 'http_status',
+            text: 'http_status:',
+            'description': 'Show reports with specific HTTP status code',
+            example: "http_status:",
+            tag: 'HTTP Status'
+        },
+        {
+            type: 'http_status',
+            text: 'http_status:500',
+            'description': 'Show reports with specific HTTP status code',
+            example: "http_status:500",
+            tag: 'HTTP Status'
+        },
+        {
+            type: 'http_status',
+            text: 'http_status:404',
+            'description': 'Include 404 reports in your search',
+            example: "http_status:404",
+            tag: 'HTTP Status'
+        },
+        {
+            type: 'start_date',
+            text: 'start_date:',
+            'description': 'Show reports newer than this date (press TAB for dropdown)',
+            example: 'start_date:2014-08-15T13:00',
+            tag: 'Start Date'
+        },
+        {
+            type: 'end_date',
+            text: 'end_date:',
+            'description': 'Show reports older than this date (press TAB for dropdown)',
+            example: 'start_date:2014-08-15T23:59',
+            tag: 'End Date'
+        }
+    ];
 
-            });
+    vm.filterTypeAhead = undefined;
+    vm.showDatePicker = false;
+    vm.manualOpen = false;
+    vm.aheadFilter = typeAheadTagHelper.aheadFilter;
+    vm.removeSearchTag = function (tag) {
+        $location.search(tag.type, null);
+        vm.refresh();
+    };
+    vm.addSearchTag = function (tag) {
+        $location.search(tag.type, tag.value);
+        vm.refresh();
+    };
+    vm.notRelativeTime = false;
+    if ($cookies.notRelativeTime) {
+        vm.notRelativeTime = JSON.parse($cookies.notRelativeTime);
     }
-}
 
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
+    vm.changeRelativeTime = function () {
+        $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
+    };
 
-angular.module('appenlight.components.userPasswordView', [])
-    .component('userPasswordView', {
-        templateUrl: 'components/views/user-password-view/user-password-view.html',
-        controller: UserPasswordViewController
+    _.each(_.range(1, 11), function (priority) {
+        vm.filterTypeAheadOptions.push({
+            type: 'priority',
+            text: 'priority:' + priority.toString(),
+            description: 'Show entries with specific priority',
+            example: 'priority:' + priority,
+            tag: 'Priority'
+        });
+    });
+    _.each(['never_reviewed', 'reviewed', 'fixed', 'public'], function (status) {
+        vm.filterTypeAheadOptions.push({
+            type: 'report_status',
+            text: 'report_status:' + status,
+            'description': 'Show only reports with this status',
+            example: 'report_status:' + status,
+            tag: 'Status ' + status.toUpperCase()
+        });
+    });
+    _.each(stateHolder.AeUser.applications, function (item) {
+        vm.filterTypeAheadOptions.push({
+            type: 'resource',
+            text: 'resource:' + item.resource_id + ':' + item.resource_name,
+            example: 'resource:' + item.resource_id,
+            'tag': item.resource_name,
+            'description': 'Restrict resultset to this application'
+        });
     });
 
-UserPasswordViewController.$inject = ['$state', 'userSelfPropertyResource'];
+    vm.paginationChange = function(){
+        $location.search('page', vm.page);
+        vm.refresh();
+    };
 
-function UserPasswordViewController($state, userSelfPropertyResource) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {password: false};
-    vm.form = {};
+    vm.typeAheadTag = function (event) {
+        var text = vm.filterTypeAhead;
+        if (_.isObject(vm.filterTypeAhead)) {
+            text = vm.filterTypeAhead.text;
+        }
+        if (!vm.filterTypeAhead) {
+            return
+        }
 
-    vm.updatePassword = function () {
-        vm.loading.password = true;
-        
-        userSelfPropertyResource.update({key: 'password'}, vm.form, function () {
-            vm.loading.password = false;
-            vm.form = {};
-            setServerValidation(vm.passwordForm);
-        }, function (response) {
-            if (response.status == 422) {
-                
-                setServerValidation(vm.passwordForm, response.data);
-                
+        var parsed = text.split(':');
+        var tag = {'type': null, 'value': null};
+        // app tags have : twice
+        if (parsed.length > 2 && parsed[0] == 'resource') {
+            tag.type = 'resource';
+            tag.value = parsed[1];
+        }
+        // normal tag:value
+        else if (parsed.length > 1) {
+            tag.type = parsed[0];
+            var tagValue = parsed.slice(1);
+            if (tagValue) {
+                tag.value = tagValue.join(':');
             }
-            vm.loading.password = false;
-        });
-    }
-}
+        }
+        else {
+            tag.type = 'error';
+            tag.value = parsed.join(':');
+        }
 
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
+        // set datepicker hour based on type of field
+        if ('start_date:' == text) {
+            vm.showDatePicker = true;
+            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
+        }
+        else if ('end_date:' == text) {
+            vm.showDatePicker = true;
+            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
+        }
 
-angular.module('appenlight.components.userProfileView', [])
-    .component('userProfileView', {
-        templateUrl: 'components/views/user-profile-view/user-profile-view.html',
-        controller: UserProfileViewController
-    });
+        if (event.keyCode != 13 || !tag.type || !tag.value) {
+            return
+        }
+        vm.showDatePicker = false;
+        // aka we selected one of main options
+        vm.addSearchTag({type: tag.type, value: tag.value});
+        // clear typeahead
+        vm.filterTypeAhead = undefined;
+    };
 
-UserProfileViewController.$inject = ['$state', 'userSelfResource'];
+    vm.pickerDateChanged = function(){
+        if (vm.filterTypeAhead.indexOf('start_date:') == '0') {
+            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
+        }
+        else if (vm.filterTypeAhead.indexOf('end_date:') == '0') {
+            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
+        }
+        vm.showDatePicker = false;
+    };
 
-function UserProfileViewController($state, userSelfResource) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {profile: true};
+    var reportPresentation = function (report) {
+        report.presentation = {};
+        if (report.group.public) {
+            report.presentation.className = 'public';
+            report.presentation.tooltip = 'Public';
+        }
+        else if (report.group.fixed) {
+            report.presentation.className = 'fixed';
+            report.presentation.tooltip = 'Fixed';
+        }
+        else if (report.group.read) {
+            report.presentation.className = 'reviewed';
+            report.presentation.tooltip = 'Reviewed';
+        }
+        else {
+            report.presentation.className = 'new';
+            report.presentation.tooltip = 'New';
+        }
+        return report;
+    };
 
-    vm.user = userSelfResource.get(null, function (data) {
-        vm.loading.profile = false;
-        
-    });
+    vm.fetchReports = function (searchParams) {
+        vm.is_loading = true;
+        reportsResource.query(searchParams, function (data, getResponseHeaders) {
+            var headers = getResponseHeaders();
+            
+            vm.is_loading = false;
+            vm.reportsPage = _.map(data, function (item) {
+                return reportPresentation(item);
+            });
+            vm.itemCount = headers['x-total-count'];
+            vm.itemsPerPage = headers['x-items-per-page'];
+        }, function () {
+            vm.is_loading = false;
+        });
+    };
 
-    vm.updateProfile = function () {
-        vm.loading.profile = true;
+    vm.filterId = function (log) {
+        vm.searchParams.tags.push({
+            type: "request_id",
+            value: log.request_id
+        });
+        vm.refresh();
+    };
 
+    vm.refresh = function(){
+        vm.searchParams = parseSearchToTags($location.search());
+        vm.page = Number(vm.searchParams.page) || 1;
+        var params = parseTagsToSearch(vm.searchParams);
         
-        vm.user.$update(null, function () {
-            vm.loading.profile = false;
-            setServerValidation(vm.profileForm);
-        }, function (response) {
-            if (response.status == 422) {
-                setServerValidation(vm.profileForm, response.data);
-            }
-            vm.loading.profile = false;
-        });
-    }
+        vm.fetchReports(params);
+    };
+    // initial load
+    vm.refresh();
 }
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
@@ -10217,58 +10160,284 @@ function UserProfileViewController($state, userSelfResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-var aeconfig = angular.module('appenlight.config', []);
-aeconfig.factory('AeConfig', function () {
-    var obj = {};
-    obj.flashMessages = decodeEncodedJSON(window.AE.flash_messages);
-    obj.timeOptions = decodeEncodedJSON(window.AE.timeOptions);
-    obj.plugins = decodeEncodedJSON(window.AE.plugins);
-    obj.topNav = decodeEncodedJSON(window.AE.topNav);
-    obj.ws_url = window.AE.ws_url;
-    obj.urls = window.AE.urls;
-    // set keys on values because we wont be able to retrieve them everywhere
-    for (var key in obj.timeOptions) {
-        obj.timeOptions[key]['key'] = key;
+'use strict';
+
+/* Controllers */
+
+angular.module('appenlight.components.reportsSlowBrowserView', [])
+    .component('reportsSlowBrowserView', {
+        templateUrl: 'components/views/reports-slow-browser-view/reports-slow-browser-view.html',
+        controller: ReportsSlowBrowserViewController
+    });
+
+ReportsSlowBrowserViewController.$inject = ['$location', '$cookies',
+    'stateHolder', 'typeAheadTagHelper', 'slowReportsResource']
+
+function ReportsSlowBrowserViewController($location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource) {
+    var vm = this;
+    vm.applications = stateHolder.AeUser.applications_map;
+    stateHolder.section = 'slow_reports';
+    vm.today = function () {
+        vm.pickerDate = new Date();
+    };
+    vm.today();
+    vm.reportsPage = [];
+    vm.page = 1;
+    vm.itemCount = 0;
+    vm.itemsPerPage = 250;
+    typeAheadTagHelper.tags = [];
+    vm.searchParams = {tags: [], page: 1, type: 'slow_report'};
+    vm.is_loading = false;
+    vm.filterTypeAheadOptions = [
+        {
+            type: 'view_name',
+            text: 'view_name:',
+            'description': 'Query reports occured in specific views',
+            tag: 'View Name',
+            example: "view_name:module.foo"
+        },
+        {
+            type: 'resource',
+            text: 'resource:',
+            'description': 'Restrict resultset to application',
+            tag: 'Application',
+            example: "resource:ID"
+        },
+        {
+            type: 'priority',
+            text: 'priority:',
+            'description': 'Show reports with specific priority',
+            example: 'priority:8',
+            tag: 'Priority'
+        },
+        {
+            type: 'min_occurences',
+            text: 'min_occurences:',
+            'description': 'Show reports from groups with at least X occurences',
+            example: 'min_occurences:25',
+            tag: 'Min. occurences'
+        },
+        {
+            type: 'min_duration',
+            text: 'min_duration:',
+            'description': 'Show reports from groups with average duration >= Xs',
+            example: 'min_duration:4.5',
+            tag: 'Min. duration'
+        },
+        {
+            type: 'url_path',
+            text: 'url_path:',
+            'description': 'Show reports from specific URL paths',
+            example: 'url_path:/foo/bar/baz',
+            tag: 'Url Path'
+        },
+        {
+            type: 'url_domain',
+            text: 'url_domain:',
+            'description': 'Show reports from specific domain',
+            example: 'url_domain:domain.com',
+            tag: 'Domain'
+        },
+        {
+            type: 'request_id',
+            text: 'request_id:',
+            'description': 'Show reports with specific request id',
+            example: "request_id:883143dc572e4c38aceae92af0ea5ae0",
+            tag: 'Request ID'
+        },
+        {
+            type: 'report_status',
+            text: 'report_status:',
+            'description': 'Show reports from groups with specific status',
+            example: 'report_status:never_reviewed',
+            tag: 'Status'
+        },
+        {
+            type: 'server_name',
+            text: 'server_name:',
+            'description': 'Show reports tagged with this key/value pair',
+            example: 'server_name:hostname',
+            tag: 'Tag'
+        },
+        {
+            type: 'start_date',
+            text: 'start_date:',
+            'description': 'Show reports newer than this date (press TAB for dropdown)',
+            example: 'start_date:2014-08-15T13:00',
+            tag: 'Start Date'
+        },
+        {
+            type: 'end_date',
+            text: 'end_date:',
+            'description': 'Show reports older than this date (press TAB for dropdown)',
+            example: 'start_date:2014-08-15T23:59',
+            tag: 'End Date'
+        }
+    ];
+
+    vm.filterTypeAhead = undefined;
+    vm.showDatePicker = false;
+    vm.aheadFilter = typeAheadTagHelper.aheadFilter;
+    vm.removeSearchTag = function (tag) {
+        $location.search(tag.type, null);
+        vm.refresh();
+    };
+    vm.addSearchTag = function (tag) {
+        $location.search(tag.type, tag.value);
+        vm.refresh();
+    };
+    vm.manualOpen = false;
+    vm.notRelativeTime = false;
+    if ($cookies.notRelativeTime) {
+        vm.notRelativeTime = JSON.parse($cookies.notRelativeTime);
     }
-    console.info('config', obj);
-    return obj;
-});
 
-;// # Copyright (C) 2010-2016  RhodeCode GmbH
-// #
-// # This program is free software: you can redistribute it and/or modify
-// # it under the terms of the GNU Affero General Public License, version 3
-// # (only), as published by the Free Software Foundation.
-// #
-// # This program is distributed in the hope that it will be useful,
-// # but WITHOUT ANY WARRANTY; without even the implied warranty of
-// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// # GNU General Public License for more details.
-// #
-// # You should have received a copy of the GNU Affero General Public License
-// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// #
-// # This program is dual-licensed. If you wish to learn more about the
-// # AppEnlight Enterprise Edition, including its added features, Support
-// # services, and proprietary license terms, please see
-// # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminApplicationsListController', AdminApplicationsListController);
+    vm.changeRelativeTime = function () {
+        $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
+    };
+
+    _.each(_.range(1, 11), function (priority) {
+        vm.filterTypeAheadOptions.push({
+            type: 'priority',
+            text: 'priority:' + priority.toString(),
+            description: 'Show entries with specific priority',
+            example: 'priority:' + priority,
+            tag: 'Priority'
+        });
+    });
+    _.each(['never_reviewed', 'reviewed', 'fixed', 'public'], function (status) {
+        vm.filterTypeAheadOptions.push({
+            type: 'report_status',
+            text: 'report_status:' + status,
+            'description': 'Show only reports with this status',
+            example: 'report_status:' + status,
+            tag: 'Status ' + status.toUpperCase()
+        });
+    });
+    _.each(stateHolder.AeUser.applications, function (item) {
+        vm.filterTypeAheadOptions.push({
+            type: 'resource',
+            text: 'resource:' + item.resource_id + ':' + item.resource_name,
+            example: 'resource:' + item.resource_id,
+            'tag': item.resource_name,
+            'description': 'Restrict resultset to this application'
+        });
+    });
+
+    vm.typeAheadTag = function (event) {
+        var text = vm.filterTypeAhead;
+        if (_.isObject(vm.filterTypeAhead)) {
+            text = vm.filterTypeAhead.text;
+        };
+        if (!vm.filterTypeAhead) {
+            return
+        }
+        var parsed = text.split(':');
+        var tag = {'type': null, 'value': null};
+        // app tags have : twice
+        if (parsed.length > 2 && parsed[0] == 'resource') {
+            tag.type = 'resource';
+            tag.value = parsed[1];
+        }
+        // normal tag:value
+        else if (parsed.length > 1) {
+            tag.type = parsed[0];
+            var tagValue = parsed.slice(1);
+            if (tagValue) {
+                tag.value = tagValue.join(':');
+            }
+        }
+
+        // set datepicker hour based on type of field
+        if ('start_date:' == text) {
+            vm.showDatePicker = true;
+            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
+        }
+        else if ('end_date:' == text) {
+            vm.showDatePicker = true;
+            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
+        }
+
+        if (event.keyCode != 13 || !tag.type || !tag.value) {
+            return
+        }
+        vm.showDatePicker = false;
+        // aka we selected one of main options
+        vm.addSearchTag({type: tag.type, value: tag.value});
+        // clear typeahead
+        vm.filterTypeAhead = undefined;
+    };
+
+    vm.paginationChange = function(){
+        $location.search('page', vm.page);
+        vm.refresh();
+    };
 
-AdminApplicationsListController.$inject = ['applicationsResource'];
+    vm.pickerDateChanged = function(){
+        if (vm.filterTypeAhead.indexOf('start_date:') == '0') {
+            vm.filterTypeAhead = 'start_date:' + moment(vm.pickerDate).utc().format();
+        }
+        else if (vm.filterTypeAhead.indexOf('end_date:') == '0') {
+            vm.filterTypeAhead = 'end_date:' + moment(vm.pickerDate).utc().hour(23).minute(59).format();
+        }
+        vm.showDatePicker = false;
+    };
 
-function AdminApplicationsListController(applicationsResource) {
-    
-    var vm = this;
-    vm.loading = {applications: true};
+    var reportPresentation = function (report) {
+        report.presentation = {};
+        if (report.group.public) {
+            report.presentation.className = 'public';
+            report.presentation.tooltip = 'Public';
+        }
+        else if (report.group.fixed) {
+            report.presentation.className = 'fixed';
+            report.presentation.tooltip = 'Fixed';
+        }
+        else if (report.group.read) {
+            report.presentation.className = 'reviewed';
+            report.presentation.tooltip = 'Reviewed';
+        }
+        else {
+            report.presentation.className = 'new';
+            report.presentation.tooltip = 'New';
+        }
+        return report;
+    };
 
-    vm.applications = applicationsResource.query({
-        root_list: true,
-        resource_type: 'application'
-    }, function (data) {
-        vm.loading = {applications: false};
-    });
-};
+    vm.fetchReports = function (searchParams) {
+        vm.is_loading = true;
+        slowReportsResource.query(searchParams, function (data, getResponseHeaders) {
+            var headers = getResponseHeaders();
+            
+            vm.is_loading = false;
+            vm.reportsPage = _.map(data, function (item) {
+                return reportPresentation(item);
+            });
+            vm.itemCount = headers['x-total-count'];
+            vm.itemsPerPage = headers['x-items-per-page'];
+        }, function () {
+            vm.is_loading = false;
+        });
+    };
+
+    vm.filterId = function (log) {
+        vm.searchParams.tags.push({
+            type: "request_id",
+            value: log.request_id
+        });
+        vm.refresh();
+    };
+    vm.refresh = function(){
+        vm.searchParams = parseSearchToTags($location.search());
+        vm.page = Number(vm.searchParams.page) || 1;
+        var params = parseTagsToSearch(vm.searchParams);
+        vm.fetchReports(params);
+    };
+
+    //initial load
+    vm.refresh();
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10289,44 +10458,18 @@ function AdminApplicationsListController(applicationsResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('ConfigsListController', ConfigsListController);
-
-ConfigsListController.$inject = ['configsResource', 'configsNoIdResource'];
-
-function ConfigsListController(configsResource, configsNoIdResource) {
-    var vm = this;
-    vm.loading = {config: true};
-
-    var filters = [
-        'template_footer_html:global',
-        'list_groups_to_non_admins:global',
-        'per_application_reports_rate_limit:global',
-        'per_application_logs_rate_limit:global',
-        'per_application_metrics_rate_limit:global',
-    ];
-
-    vm.configs = {};
-
-    vm.configList = configsResource.query({filter: filters},
-        function (data) {
-            vm.loading = {config: false};
-            _.each(data, function (item) {
-                if (vm.configs[item.section] === undefined) {
-                    vm.configs[item.section] = {};
-                }
-                vm.configs[item.section][item.key] = item;
-            });
-        });
+angular.module('appenlight.components.settingsView', [])
+    .component('settingsView', {
+        templateUrl: 'components/views/settings-view/settings-view.html',
+        controller: SettingsViewController
+    });
 
-    vm.save = function () {
-        vm.loading.config = true;
-        _.each(vm.configList, function (item) {
-            item.$save();
-        });
-        vm.loading.config = false;
-    };
+SettingsViewController.$inject = ['$state'];
 
-};
+function SettingsViewController($state) {
+    this.$state = $state;
+    console.info('SettingsViewController');
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10347,128 +10490,37 @@ function ConfigsListController(configsResource, configsNoIdResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminGroupsCreateController', AdminGroupsCreateController);
+angular.module('appenlight.components.userAlertChannelsEmailNewView', [])
+    .component('userAlertChannelsEmailNewView', {
+        templateUrl: 'components/views/user-alert-channel-email-new-view/user-alert-channel-email-new-view.html',
+        controller: AlertChannelsEmailController
+    });
 
-AdminGroupsCreateController.$inject = ['$state', 'groupsResource', 'groupsPropertyResource', 'sectionViewResource', 'AeConfig'];
+AlertChannelsEmailController.$inject = ['$state','userSelfPropertyResource'];
 
-function AdminGroupsCreateController($state, groupsResource, groupsPropertyResource, sectionViewResource, AeConfig) {
+function AlertChannelsEmailController($state, userSelfPropertyResource) {
     
     var vm = this;
-    vm.loading = {
-        group: false,
-        resource_permissions: false,
-        users: false
-    };
-
-    vm.form = {
-        autocompleteUser: '',
-    }
-
-
-    if (typeof $state.params.groupId !== 'undefined') {
-        vm.loading.group = true;
-        var groupId = $state.params.groupId;
-        vm.group = groupsResource.get({groupId: groupId}, function (data) {
-            vm.loading.group = false;
-        });
-
-        vm.resource_permissions = groupsPropertyResource.query(
-            {groupId: groupId, key: 'resource_permissions'}, function (data) {
-                vm.loading.resource_permissions = false;
-                var tmpObj = {
-                    'group': {
-                        'application': {},
-                        'dashboard': {}
-                    }
-                };
-                _.each(data, function (item) {
-                    
-                    var section = tmpObj[item.type][item.resource_type];
-                    if (typeof section[item.resource_id] == 'undefined') {
-                        section[item.resource_id] = {
-                            self: item,
-                            permissions: []
-                        }
-                    }
-                    section[item.resource_id].permissions.push(item.perm_name);
-
-                });
-                vm.resourcePermissions = tmpObj;
-            });
-
-        vm.users = groupsPropertyResource.query(
-            {groupId: groupId, key: 'users'}, function (data) {
-                vm.loading.users = false;
-            }, function () {
-                vm.loading.users = false;
-            });
-
-    }
-    else {
-        var groupId = null;
-    }
-
-    var formResponse = function (response) {
-        if (response.status === 422) {
-            setServerValidation(vm.groupForm, response.data);
-        }
-        vm.loading.group = false;
-    };
-
-    vm.createGroup = function () {
-        vm.loading.group = true;
-        if (groupId) {
-            groupsResource.update({groupId: vm.group.id}, vm.group, function (data) {
-                setServerValidation(vm.groupForm);
-                vm.loading.group = false;
-            }, formResponse);
-        }
-        else {
-            groupsResource.save(vm.group, function (data) {
-                $state.go('admin.group.update', {groupId: data.id});
-            }, formResponse);
-        }
-    };
-
-    vm.removeUser = function (user) {
-        groupsPropertyResource.delete(
-            {groupId: groupId, key: 'users', user_name: user.user_name},
-            function (data) {
-                vm.loading.users = false;
-                vm.users = _.filter(vm.users, function (item) {
-                    return item != user;
-                });
-            }, function () {
-                vm.loading.users = false;
-            });
-    };
-
-    vm.addUser = function () {
-        groupsPropertyResource.save(
-            {groupId: groupId, key: 'users'},
-            {user_name: vm.form.autocompleteUser},
-            function (data) {
-                vm.loading.users = false;
-                vm.users.push(data);
-                vm.form.autocompleteUser = '';
-            }, function () {
-                vm.loading.users = false;
-            });
-    }
+    vm.$state = $state;
+    vm.loading = {email: false};
+    vm.form = {};
 
-    vm.searchUsers = function (searchPhrase) {
+    vm.createChannel = function () {
+        vm.loading.email = true;
         
-        return sectionViewResource.query({
-            section: 'users_section',
-            view: 'search_users',
-            'user_name': searchPhrase
-        }).$promise.then(function (data) {
-                return _.map(data, function (item) {
-                    return item.user;
-                });
-            });
+        userSelfPropertyResource.save({key: 'alert_channels'}, vm.form, function () {
+            //vm.loading.email = false;
+            //setServerValidation(vm.channelForm);
+            //vm.form = {};
+            $state.go('user.alert_channels.list');
+        }, function (response) {
+            if (response.status == 422) {
+                setServerValidation(vm.channelForm, response.data);
+            }
+            vm.loading.email = false;
+        });
     }
-};
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10489,40 +10541,122 @@ function AdminGroupsCreateController($state, groupsResource, groupsPropertyResou
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminGroupsController', AdminGroupsController);
+angular.module('appenlight.components.userAlertChannelsListView', [])
+    .component('userAlertChannelsListView', {
+        templateUrl: 'components/views/user-alert-channels-list-view/user-alert-channels-list-view.html',
+        controller: userAlertChannelsListViewController
+    });
 
-AdminGroupsController.$inject = ['groupsResource'];
+userAlertChannelsListViewController.$inject = ['$state','userSelfPropertyResource', 'applicationsNoIdResource'];
 
-function AdminGroupsController(groupsResource) {
+function userAlertChannelsListViewController($state, userSelfPropertyResource, applicationsNoIdResource) {
     
     var vm = this;
-    vm.loading = {groups: true};
+    vm.$state = $state;
+    vm.loading = {channels: true, applications: true, actions:true};
 
-    vm.groups = groupsResource.query({}, function (data) {
-        vm.loading = {groups: false};
-        vm.activeUsers = _.reduce(vm.groups, function(memo, val){
-            if (val.status == 1){
-                return memo + 1;
-            }
-            return memo;
-        }, 0);
-        
-    });
+    vm.alertChannels = userSelfPropertyResource.query({key: 'alert_channels'},
+        function (data) {
+            vm.loading.channels = false;
+        });
+
+    vm.alertActions = userSelfPropertyResource.query({key: 'alert_actions'},
+        function (data) {
+            vm.loading.actions = false;
+        });
 
+    vm.applications = applicationsNoIdResource.query({permission: 'view'},
+        function (data) {
+            vm.loading.applications = false;
+        });
 
-    vm.removeGroup = function (group) {
-        groupsResource.remove({groupId: group.id}, function (data, responseHeaders) {
-            
-            if (data) {
-                var index = vm.groups.indexOf(group);
-                if (index !== -1) {
-                    vm.groups.splice(index, 1);
-                    vm.activeGroups -= 1;
-                }
+    var allOps = {
+        'eq': 'Equal',
+        'ne': 'Not equal',
+        'ge': 'Greater or equal',
+        'gt': 'Greater than',
+        'le': 'Lesser or equal',
+        'lt': 'Lesser than',
+        'startswith': 'Starts with',
+        'endswith': 'Ends with',
+        'contains': 'Contains'
+    };
+
+    var fieldOps = {};
+    fieldOps['http_status'] = ['eq', 'ne', 'ge', 'le'];
+    fieldOps['group:priority'] = ['eq', 'ne', 'ge', 'le'];
+    fieldOps['duration'] = ['ge', 'le'];
+    fieldOps['url_domain'] = ['eq', 'ne', 'startswith', 'endswith',
+        'contains'];
+    fieldOps['url_path'] = ['eq', 'ne', 'startswith', 'endswith',
+        'contains'];
+    fieldOps['error'] = ['eq', 'ne', 'startswith', 'endswith',
+        'contains'];
+    fieldOps['tags:server_name'] = ['eq', 'ne', 'startswith', 'endswith',
+        'contains'];
+    fieldOps['group:occurences'] = ['eq', 'ne', 'ge', 'le'];
+
+    var possibleFields = {
+        '__AND__': 'All met (composite rule)',
+        '__OR__': 'One met (composite rule)',
+        '__NOT__': 'Not met (composite rule)',
+        'http_status': 'HTTP Status',
+        'duration': 'Request duration',
+        'group:priority': 'Group -> Priority',
+        'url_domain': 'Domain',
+        'url_path': 'URL Path',
+        'error': 'Error',
+        'tags:server_name': 'Tag -> Server name',
+        'group:occurences': 'Group -> Occurences'
+    };
+
+    vm.ruleDefinitions = {
+        fieldOps: fieldOps,
+        allOps: allOps,
+        possibleFields: possibleFields
+    };
+
+    vm.addAction = function (channel) {
+        
+        userSelfPropertyResource.save({key: 'alert_channels_rules'}, {}, function (data) {
+            vm.alertActions.push(data);
+        }, function (response) {
+            if (response.status == 422) {
+                
             }
         });
+    };
+
+    vm.updateChannel = function (channel, subKey) {
+        var params = {
+            key: 'alert_channels',
+            channel_name: channel['channel_name'],
+            channel_value: channel['channel_value']
+        };
+        var toUpdate = {};
+        if (['daily_digest', 'send_alerts'].indexOf(subKey) !== -1) {
+            toUpdate[subKey] = !channel[subKey];
+        }
+        userSelfPropertyResource.update(params, toUpdate, function (data) {
+            _.extend(channel, data);
+        });
+    };
+
+    vm.removeChannel = function (channel) {
+        
+        userSelfPropertyResource.delete({
+            key: 'alert_channels',
+            channel_name: channel.channel_name,
+            channel_value: channel.channel_value
+        }, function () {
+            vm.alertChannels = _.filter(vm.alertChannels, function(item){
+                return item != channel;
+            });
+        });
+
     }
-};
+
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10543,110 +10677,56 @@ function AdminGroupsController(groupsResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminPartitionsController', AdminPartitionsController);
+angular.module('appenlight.components.userAuthTokensView', [])
+    .component('userAuthTokensView', {
+        templateUrl: 'components/views/user-auth-tokens-view/user-auth-tokens-view.html',
+        controller: userAuthTokensViewController
+    });
 
-AdminPartitionsController.$inject = ['sectionViewResource'];
+userAuthTokensViewController.$inject = ['$state', 'userSelfPropertyResource', 'AeConfig'];
 
-function AdminPartitionsController(sectionViewResource) {
+function userAuthTokensViewController($state, userSelfPropertyResource, AeConfig) {
+    
     var vm = this;
-    vm.permanentPartitions = [];
-    vm.dailyPartitions = [];
-    vm.loading = {partitions: true};
-    vm.dailyChecked = false;
-    vm.permChecked = false;
-    vm.dailyConfirm = '';
-    vm.permConfirm = '';
-
-
-    vm.loadPartitions = function (data) {
-        var permanentPartitions = vm.transformPartitionList(
-            data.permanent_partitions);
-        var dailyPartitions = vm.transformPartitionList(
-            data.daily_partitions);
-        vm.permanentPartitions = permanentPartitions;
-        vm.dailyPartitions = dailyPartitions;
-        vm.loading = {partitions: false};
-    };
-
-    vm.setCheckedList = function (scope) {
-        var toTest = null;
-        if (scope === 'dailyPartitions'){
-            toTest = 'dailyChecked';
-        }
-        else{
-            toTest = 'permChecked';
-        }
-
-        if (vm[toTest]) {
-            var val = true;
-        }
-        else {
-            var val = false;
-        }
-        
-        _.each(vm[scope], function (item) {
-            _.each(item[1].pg, function (index) {
-                index.checked = val;
-            });
-            _.each(item[1].elasticsearch, function (index) {
-                index.checked = val;
-            });
-        });
-    }
-
+    vm.$state = $state;
+    vm.loading = {tokens: true};
 
-    vm.transformPartitionList = function (inputList) {
-        var outputList = [];
+    vm.expireOptions = AeConfig.timeOptions;
 
-        _.each(inputList, function (item) {
-            var time = [item[0], {
-                elasticsearch: [],
-                pg: []
-            }]
-            _.each(item[1].pg, function (index) {
-                time[1].pg.push({name: index, checked: false})
-            });
-            _.each(item[1].elasticsearch, function (index) {
-                time[1].elasticsearch.push({
-                    name: index,
-                    checked: false
-                })
-            });
-            outputList.push(time);
+    vm.tokens = userSelfPropertyResource.query({key: 'auth_tokens'},
+        function (data) {
+            vm.loading.tokens = false;
         });
-        return outputList;
-    };
-
-    sectionViewResource.get({section:'admin_section', view: 'partitions'},
-        vm.loadPartitions);
 
-    vm.partitionsDelete = function (partitionType) {
-        var es_indices = [];
-        var pg_indices = [];
-        _.each(vm[partitionType], function (item) {
-            _.each(item[1].pg, function (index) {
-                if (index.checked) {
-                    pg_indices.push(index.name)
-                }
-            });
-            _.each(item[1].elasticsearch, function (index) {
-                if (index.checked) {
-                    es_indices.push(index.name)
+    vm.addToken = function () {
+        vm.loading.tokens = true;
+        userSelfPropertyResource.save({key: 'auth_tokens'},
+            vm.form,
+            function (data) {
+                vm.loading.tokens = false;
+                setServerValidation(vm.TokenForm);
+                vm.form = {};
+                vm.tokens.push(data);
+            }, function (response) {
+                vm.loading.tokens = false;
+                if (response.status == 422) {
+                    setServerValidation(vm.TokenForm, response.data);
                 }
-            });
-        });
-        
-
-        vm.loading = {partitions: true};
-        sectionViewResource.save({section:'admin_section',
-            view: 'partitions_remove'}, {
-            es_indices: es_indices,
-            pg_indices: pg_indices,
-            confirm: 'CONFIRM'
-        }, vm.loadPartitions);
+            })
+    };
 
+    vm.removeToken = function (token) {
+        userSelfPropertyResource.delete({
+                key: 'auth_tokens',
+                token: token.token
+            },
+            function () {
+                var index = vm.tokens.indexOf(token);
+                if (index !== -1) {
+                    vm.tokens.splice(index, 1);
+                }
+            })
     }
-
 }
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
@@ -10668,31 +10748,46 @@ function AdminPartitionsController(sectionViewResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminSystemController', AdminSystemController);
+angular.module('appenlight.components.userIdentitiesView', [])
+    .component('userIdentitiesView', {
+        templateUrl: 'components/views/user-identities-view/user-identities-view.html',
+        controller: UserIdentitiesController
+    });
 
-AdminSystemController.$inject = ['sectionViewResource'];
+UserIdentitiesController.$inject = ['$state', 'userSelfPropertyResource', 'AeConfig'];
 
-function AdminSystemController(sectionViewResource) {
+function UserIdentitiesController($state, userSelfPropertyResource, AeConfig) {
+    
     var vm = this;
-    vm.tables = [];
-    vm.loading = {system: true};
-    sectionViewResource.get({
-        section: 'admin_section',
-        view: 'system'
-    }, null, function (data) {
-        vm.DBtables = data.db_tables;
-        vm.ESIndices = data.es_indices;
-        vm.queueStats = data.queue_stats;
-        vm.systemLoad = data.system_load;
-        vm.packages = data.packages;
-        vm.processInfo = data.process_info;
-        vm.disks = data.disks;
-        vm.memory = data.memory;
-        vm.selfInfo = data.self_info;
+    vm.$state = $state;
+    vm.AeConfig = AeConfig;
+    vm.loading = {identities: true};
 
-        vm.loading.system = false;
-    });
-};
+    vm.identities = userSelfPropertyResource.query(
+        {key: 'external_identities'},
+        function (data) {
+            vm.loading.identities = false;
+            
+        });
+
+    vm.removeProvider = function (provider) {
+        
+        userSelfPropertyResource.delete(
+            {
+                key: 'external_identities',
+                provider: provider.provider,
+                id: provider.id
+            },
+            function (status) {
+                if (status){
+                    vm.identities = _.filter(vm.identities, function (item) {
+                        return item != provider
+                    });
+                }
+
+            });
+    }
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10713,107 +10808,38 @@ function AdminSystemController(sectionViewResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminUsersCreateController', AdminUsersCreateController);
+angular.module('appenlight.components.userPasswordView', [])
+    .component('userPasswordView', {
+        templateUrl: 'components/views/user-password-view/user-password-view.html',
+        controller: UserPasswordViewController
+    });
 
-AdminUsersCreateController.$inject = ['$state', 'usersResource', 'usersPropertyResource', 'sectionViewResource', 'AeConfig'];
+UserPasswordViewController.$inject = ['$state', 'userSelfPropertyResource'];
 
-function AdminUsersCreateController($state, usersResource, usersPropertyResource, sectionViewResource, AeConfig) {
+function UserPasswordViewController($state, userSelfPropertyResource) {
     
     var vm = this;
-    vm.loading = {user: false};
-
-
-    if (typeof $state.params.userId !== 'undefined') {
-        vm.loading.user = true;
-        var userId = $state.params.userId;
-        vm.user = usersResource.get({userId: userId}, function (data) {
-            vm.loading.user = false;
-            // cast to true for angular checkbox
-            if (vm.user.status === 1) {
-                vm.user.status = true;
-            }
-        });
-
-        vm.resource_permissions = usersPropertyResource.query(
-            {userId: userId, key: 'resource_permissions'}, function (data) {
-                vm.loading.resource_permissions = false;
-                var tmpObj = {
-                    'user': {
-                        'application': {},
-                        'dashboard': {}
-                    },
-                    'group': {
-                        'application': {},
-                        'dashboard': {}
-                    }
-                };
-                _.each(data, function (item) {
-                    
-                    var section = tmpObj[item.type][item.resource_type];
-                    if (typeof section[item.resource_id] == 'undefined'){
-                        section[item.resource_id] = {
-                            self:item,
-                            permissions: []
-                        }
-                    }
-                    section[item.resource_id].permissions.push(item.perm_name);
-
-                });
-                vm.resourcePermissions = tmpObj;
-            });
-
-    }
-    else {
-        var userId = null;
-        vm.user = {
-            status: true
-        }
-    }
-
-    var formResponse = function (response) {
-        if (response.status == 422) {
-            setServerValidation(vm.profileForm, response.data);
-        }
-        vm.loading.user = false;
-    }
-
-    vm.createUser = function () {
-        vm.loading.user = true;
-        
-        if (userId) {
-            usersResource.update({userId: vm.user.id}, vm.user, function (data) {
-                setServerValidation(vm.profileForm);
-                vm.loading.user = false;
-            }, formResponse);
-        }
-        else {
-            usersResource.save(vm.user, function (data) {
-                $state.go('admin.user.update', {userId: data.id});
-            }, formResponse);
-        }
-    }
+    vm.$state = $state;
+    vm.loading = {password: false};
+    vm.form = {};
 
-    vm.generatePassword = function () {
-        var length = 8;
-        var charset = "abcdefghijklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-        vm.gen_pass = "";
-        for (var i = 0, n = charset.length; i < length; ++i) {
-            vm.gen_pass += charset.charAt(Math.floor(Math.random() * n));
-        }
-        vm.user.user_password = '' + vm.gen_pass;
+    vm.updatePassword = function () {
+        vm.loading.password = true;
         
-    }
-
-    vm.reloginUser = function () {
-        sectionViewResource.get({
-            section: 'admin_section', view: 'relogin_user',
-            user_id: vm.user.id
-        }, function () {
-            window.location = AeConfig.urls.baseUrl;
+        userSelfPropertyResource.update({key: 'password'}, vm.form, function () {
+            vm.loading.password = false;
+            vm.form = {};
+            setServerValidation(vm.passwordForm);
+        }, function (response) {
+            if (response.status == 422) {
+                
+                setServerValidation(vm.passwordForm, response.data);
+                
+            }
+            vm.loading.password = false;
         });
-
     }
-};
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10834,40 +10860,76 @@ function AdminUsersCreateController($state, usersResource, usersPropertyResource
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminUsersController', AdminUsersController);
+angular.module('appenlight.components.userProfileView', [])
+    .component('userProfileView', {
+        templateUrl: 'components/views/user-profile-view/user-profile-view.html',
+        controller: UserProfileViewController
+    });
 
-AdminUsersController.$inject = ['usersResource'];
+UserProfileViewController.$inject = ['$state', 'userSelfResource'];
 
-function AdminUsersController(usersResource) {
+function UserProfileViewController($state, userSelfResource) {
     
     var vm = this;
-    vm.loading = {users: true};
+    vm.$state = $state;
+    vm.loading = {profile: true};
 
-    vm.users = usersResource.query({}, function (data) {
-        vm.loading = {users: false};
-        vm.activeUsers = _.reduce(vm.users, function(memo, val){
-            if (val.status == 1){
-                return memo + 1;
-            }
-            return memo;
-        }, 0);
+    vm.user = userSelfResource.get(null, function (data) {
+        vm.loading.profile = false;
         
     });
 
+    vm.updateProfile = function () {
+        vm.loading.profile = true;
 
-    vm.removeUser = function (user) {
-        usersResource.remove({userId: user.id}, function (data, responseHeaders) {
-            
-            if (data) {
-                var index = vm.users.indexOf(user);
-                if (index !== -1) {
-                    vm.users.splice(index, 1);
-                    vm.activeUsers -= 1;
-                }
+        
+        vm.user.$update(null, function () {
+            vm.loading.profile = false;
+            setServerValidation(vm.profileForm);
+        }, function (response) {
+            if (response.status == 422) {
+                setServerValidation(vm.profileForm, response.data);
             }
+            vm.loading.profile = false;
         });
     }
-};
+}
+
+;// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
+
+var aeconfig = angular.module('appenlight.config', []);
+aeconfig.factory('AeConfig', function () {
+    var obj = {};
+    obj.flashMessages = decodeEncodedJSON(window.AE.flash_messages);
+    obj.timeOptions = decodeEncodedJSON(window.AE.timeOptions);
+    obj.plugins = decodeEncodedJSON(window.AE.plugins);
+    obj.topNav = decodeEncodedJSON(window.AE.topNav);
+    obj.ws_url = window.AE.ws_url;
+    obj.urls = window.AE.urls;
+    // set keys on values because we wont be able to retrieve them everywhere
+    for (var key in obj.timeOptions) {
+        obj.timeOptions[key]['key'] = key;
+    }
+    console.info('config', obj);
+    return obj;
+});
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -12438,84 +12500,74 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun
     });
     $stateProvider.state('admin', {
         url: '/ui/admin',
-        templateUrl: 'templates/admin/parent_view.html'
+        component: 'adminView'
     });
     $stateProvider.state('admin.user', {
         abstract: true,
         url: '/user',
-        templateUrl: 'templates/admin/users/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
     $stateProvider.state('admin.user.list', {
         url: '/list',
-        templateUrl: 'templates/admin/users/users_list.html',
-        controller: 'AdminUsersController as users'
+        component: 'adminUsersListView'
     });
     $stateProvider.state('admin.user.create', {
         url: '/create',
-        templateUrl: 'templates/admin/users/users_create.html',
-        controller: 'AdminUsersCreateController as user'
+        component: 'adminUsersCreateView'
     });
     $stateProvider.state('admin.user.update', {
         url: '/{userId}/update',
-        templateUrl: 'templates/admin/users/users_create.html',
-        controller: 'AdminUsersCreateController as user'
+        component: 'adminUsersCreateView'
     });
 
 
     $stateProvider.state('admin.group', {
         abstract: true,
         url: '/group',
-        templateUrl: 'templates/admin/groups/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
     $stateProvider.state('admin.group.list', {
         url: '/list',
-        templateUrl: 'templates/admin/groups/groups_list.html',
-        controller: 'AdminGroupsController as groups'
+        component: 'adminGroupsListView'
     });
     $stateProvider.state('admin.group.create', {
         url: '/create',
-        templateUrl: 'templates/admin/groups/groups_create.html',
-        controller: 'AdminGroupsCreateController as group'
+        component: 'adminGroupsCreateView'
     });
     $stateProvider.state('admin.group.update', {
         url: '/{groupId}/update',
-        templateUrl: 'templates/admin/groups/groups_create.html',
-        controller: 'AdminGroupsCreateController as group'
+        component: 'adminGroupsCreateView'
     });
 
     $stateProvider.state('admin.application', {
         abstract: true,
         url: '/application',
-        templateUrl: 'templates/admin/users/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
 
     $stateProvider.state('admin.application.list', {
         url: '/list',
-        templateUrl: 'templates/admin/applications/applications_list.html',
-        controller: 'AdminApplicationsListController as applications'
+        component: 'adminApplicationsListView'
     });
 
     $stateProvider.state('admin.partitions', {
         url: '/partitions',
-        templateUrl: 'templates/admin/partitions.html',
-        controller: 'AdminPartitionsController as partitions'
+        component: 'adminPartitionsView'
     });
     $stateProvider.state('admin.system', {
         url: '/system',
-        templateUrl: 'templates/admin/system.html',
-        controller: 'AdminSystemController as system'
+        component: 'adminSystemView'
     });
 
     $stateProvider.state('admin.configs', {
         abstract: true,
         url: '/configs',
-        templateUrl: 'templates/admin/configs/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
 
     $stateProvider.state('admin.configs.list', {
         url: '/list',
-        templateUrl: 'templates/admin/configs/edit.html',
-        controller: 'ConfigsListController as configs'
+        component: 'adminConfigurationView'
     });
 
     $stateProvider.state('user', {
diff --git a/frontend/src/app.js b/frontend/src/app.js
index bb2839e..9a641de 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -67,6 +67,15 @@ angular.module('appenlight.components', [
     'appenlight.components.jiraIntegrationConfigView',
     'appenlight.components.slackIntegrationConfigView',
     'appenlight.components.webhooksIntegrationConfigView',
+    'appenlight.components.adminView',
+    'appenlight.components.adminApplicationsListView',
+    'appenlight.components.adminUsersListView',
+    'appenlight.components.adminUsersCreateView',
+    'appenlight.components.adminGroupsListView',
+    'appenlight.components.adminGroupsCreateView',
+    'appenlight.components.adminConfigurationView',
+    'appenlight.components.adminSystemView',
+    'appenlight.components.adminPartitionsView',
     'appenlight.components.settingsView'
 ]);
 angular.module('appenlight.directives', [
diff --git a/frontend/src/templates/admin/applications/applications_list.html b/frontend/src/components/views/admin-applications-list-view/admin-applications-list-view.html
similarity index 86%
rename from frontend/src/templates/admin/applications/applications_list.html
rename to frontend/src/components/views/admin-applications-list-view/admin-applications-list-view.html
index 87f0a8a..281211a 100644
--- a/frontend/src/templates/admin/applications/applications_list.html
+++ b/frontend/src/components/views/admin-applications-list-view/admin-applications-list-view.html
@@ -1,13 +1,13 @@
-<ng-include src="'templates/loader.html'" ng-if="applications.loading.applications"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.applications"></ng-include>
 
-<div class="panel panel-default" ng-if="!applications.loading.applications">
+<div class="panel panel-default" ng-if="!$ctrl.loading.applications">
     <div class="panel-heading">
 
-        Currently active applications: {{applications.applications.length}}
+        Currently active applications: {{$ctrl.applications.length}}
 
     </div>
 
-    <table st-table="displayedCollection" st-safe-src="applications.applications" class="table table-striped">
+    <table st-table="displayedCollection" st-safe-src="$ctrl.applications" class="table table-striped">
         <thead>
         <tr>
             <th st-sort="resource_name"><a>Application name</a></th>
diff --git a/frontend/src/controllers/admin/applications/applications_list.js b/frontend/src/components/views/admin-applications-list-view/admin-applications-list-view.js
similarity index 88%
rename from frontend/src/controllers/admin/applications/applications_list.js
rename to frontend/src/components/views/admin-applications-list-view/admin-applications-list-view.js
index 7617c65..34c5d21 100644
--- a/frontend/src/controllers/admin/applications/applications_list.js
+++ b/frontend/src/components/views/admin-applications-list-view/admin-applications-list-view.js
@@ -17,7 +17,11 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminApplicationsListController', AdminApplicationsListController);
+angular.module('appenlight.components.adminApplicationsListView', [])
+    .component('adminApplicationsListView', {
+        templateUrl: 'components/views/admin-applications-list-view/admin-applications-list-view.html',
+        controller: AdminApplicationsListController
+    });
 
 AdminApplicationsListController.$inject = ['applicationsResource'];
 
diff --git a/frontend/src/templates/admin/configs/edit.html b/frontend/src/components/views/admin-configuration-view/admin-configuration-view.html
similarity index 81%
rename from frontend/src/templates/admin/configs/edit.html
rename to frontend/src/components/views/admin-configuration-view/admin-configuration-view.html
index 4e17380..77f3308 100644
--- a/frontend/src/templates/admin/configs/edit.html
+++ b/frontend/src/components/views/admin-configuration-view/admin-configuration-view.html
@@ -1,6 +1,6 @@
-<ng-include src="'templates/loader.html'" ng-if="configs.loading.config"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.config"></ng-include>
 
-<div class="panel panel-default" ng-show="!configs.loading.config">
+<div class="panel panel-default" ng-show="!$ctrl.loading.config">
     <div class="panel-heading">
         <h3 class="panel-title">Basic Configuration</h3>
     </div>
@@ -12,7 +12,7 @@
                     Footer HTML
                 </label>
                 <div class="col-sm-8 col-lg-9">
-                    <textarea class="form-control" type="text" ng-model="configs.configs.global.template_footer_html.value" style="min-height: 150px"></textarea>
+                    <textarea class="form-control" type="text" ng-model="$ctrl.configs.global.template_footer_html.value" style="min-height: 150px"></textarea>
                 </div>
             </div>
         </form>
@@ -25,7 +25,7 @@
                     Show user groups to non-admin users
                 </label>
                 <div class="col-sm-8 col-lg-9">
-                    <button type="button" class="btn btn-default" ng-model="configs.configs.global.list_groups_to_non_admins.value" uib-btn-checkbox>
+                    <button type="button" class="btn btn-default" ng-model="$ctrl.configs.global.list_groups_to_non_admins.value" uib-btn-checkbox>
                         Enable
                     </button>
                 </div>
@@ -40,7 +40,7 @@
                     Ignore reports per minute/per application
                 </label>
                 <div class="col-sm-8 col-lg-9">
-                    <input class="form-control" type="number" ng-model="configs.configs.global.per_application_reports_rate_limit.value" />
+                    <input class="form-control" type="number" ng-model="$ctrl.configs.global.per_application_reports_rate_limit.value" />
                 </div>
             </div>
 
@@ -49,7 +49,7 @@
                     Ignore logs per minute/per application
                 </label>
                 <div class="col-sm-8 col-lg-9">
-                    <input class="form-control" type="number" ng-model="configs.configs.global.per_application_logs_rate_limit.value" />
+                    <input class="form-control" type="number" ng-model="$ctrl.configs.global.per_application_logs_rate_limit.value" />
                 </div>
             </div>
 
@@ -58,7 +58,7 @@
                     Ignore metrics per minute/per application
                 </label>
                 <div class="col-sm-8 col-lg-9">
-                    <input class="form-control" type="number" ng-model="configs.configs.global.per_application_metrics_rate_limit.value" />
+                    <input class="form-control" type="number" ng-model="$ctrl.configs.global.per_application_metrics_rate_limit.value" />
                 </div>
             </div>
 
@@ -66,7 +66,7 @@
 
         <hr/>
 
-        <a class="btn btn-primary" ng-click="configs.save()">Save configuration</a>
+        <a class="btn btn-primary" ng-click="$ctrl.save()">Save configuration</a>
     </div>
 
 </div>
diff --git a/frontend/src/controllers/admin/config.js b/frontend/src/components/views/admin-configuration-view/admin-configuration-view.js
similarity index 86%
rename from frontend/src/controllers/admin/config.js
rename to frontend/src/components/views/admin-configuration-view/admin-configuration-view.js
index 3edc5ad..2a96765 100644
--- a/frontend/src/controllers/admin/config.js
+++ b/frontend/src/components/views/admin-configuration-view/admin-configuration-view.js
@@ -17,11 +17,15 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('ConfigsListController', ConfigsListController);
+angular.module('appenlight.components.adminConfigurationView', [])
+    .component('adminConfigurationView', {
+        templateUrl: 'components/views/admin-configuration-view/admin-configuration-view.html',
+        controller: AdminConfigurationViewController
+    });
 
-ConfigsListController.$inject = ['configsResource', 'configsNoIdResource'];
+AdminConfigurationViewController.$inject = ['configsResource', 'configsNoIdResource'];
 
-function ConfigsListController(configsResource, configsNoIdResource) {
+function AdminConfigurationViewController(configsResource, configsNoIdResource) {
     var vm = this;
     vm.loading = {config: true};
 
diff --git a/frontend/src/templates/admin/groups/groups_create.html b/frontend/src/components/views/admin-groups-create-view/admin-groups-create-view.html
similarity index 87%
rename from frontend/src/templates/admin/groups/groups_create.html
rename to frontend/src/components/views/admin-groups-create-view/admin-groups-create-view.html
index a917660..08d23df 100644
--- a/frontend/src/templates/admin/groups/groups_create.html
+++ b/frontend/src/components/views/admin-groups-create-view/admin-groups-create-view.html
@@ -1,29 +1,29 @@
-<ng-include src="'templates/loader.html'" ng-if="group.loading.group"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.group"></ng-include>
 
-<div ng-show="!group.loading.group">
+<div ng-show="!$ctrl.loading.group">
 
     <div class="panel panel-default">
         <div class="panel-body">
-            <form name="group.groupForm" class="form-horizontal" ng-submit="group.createGroup()">
+            <form name="$ctrl.groupForm" class="form-horizontal" ng-submit="$ctrl.createGroup()">
                 <div class="form-group" id="row-group_name">
-                    <data-form-errors errors="group.groupForm.ae_validation.group_name"></data-form-errors>
+                    <data-form-errors errors="$ctrl.groupForm.ae_validation.group_name"></data-form-errors>
                     <label for="group_name" id="label-group_name" class="control-label col-sm-4 col-lg-3">
                         Group name
                         <span class="required">*</span>
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control" id="group_name" name="group_name" type="text" ng-model="group.group.group_name">
+                        <input class="form-control" id="group_name" name="group_name" type="text" ng-model="$ctrl.group.group_name">
                     </div>
                 </div>
 
                 <div class="form-group" id="row-description">
-                    <data-form-errors errors="group.groupForm.ae_validation.description"></data-form-errors>
+                    <data-form-errors errors="$ctrl.groupForm.ae_validation.description"></data-form-errors>
                     <label for="description" id="label-description" class="control-label col-sm-4 col-lg-3">
                         Description
                         <span class="required">*</span>
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control" id="description" name="description" type="text" ng-model="group.group.description">
+                        <input class="form-control" id="description" name="description" type="text" ng-model="$ctrl.group.description">
                     </div>
                 </div>
 
@@ -32,7 +32,7 @@
                     <label for="submit" id="label-submit" class="control-label col-sm-4 col-lg-3">
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control btn btn-primary" id="submit" name="submit" type="submit" value="{{$state.params.groupId ? 'Update' : 'Add'}} Group">
+                        <input class="form-control btn btn-primary" id="submit" name="submit" type="submit" value="{{$ctrl.$state.params.groupId ? 'Update' : 'Add'}} Group">
                     </div>
                 </div>
             </form>
@@ -40,7 +40,7 @@
     </div>
 
 
-    <div class="panel panel-default" ng-if="group.group.id">
+    <div class="panel panel-default" ng-if="$ctrl.group.id">
         <div class="panel-heading">
             <h3 class="panel-title">Permissions summary</h3>
         </div>
@@ -48,7 +48,7 @@
             <h3>Direct application permissions</h3>
 
             <ul class="list-group">
-                <li ng-repeat="perm in group.resourcePermissions.group.application" class="animate-repeat list-group-item">
+                <li ng-repeat="perm in $ctrl.resourcePermissions.group.application" class="animate-repeat list-group-item">
                     <strong>{{ perm.self.resource_name }}</strong>
 
                     <div class="pull-right">
@@ -65,7 +65,7 @@
             <h3>Direct dashboard permissions</h3>
 
             <ul class="list-group">
-                <li ng-repeat="perm in group.resourcePermissions.group.dashboard" class="animate-repeat list-group-item">
+                <li ng-repeat="perm in $ctrl.resourcePermissions.group.dashboard" class="animate-repeat list-group-item">
                     <strong>{{ perm.self.resource_name }}</strong>
 
                     <div class="pull-right">
@@ -83,24 +83,24 @@
     </div>
 
 
-    <div class="panel panel-default" ng-if="group.group.id">
+    <div class="panel panel-default" ng-if="$ctrl.group.id">
         <div class="panel-heading">
             <h3 class="panel-title">User list</h3>
         </div>
         <div class="panel-body">
 
-            <form name="add_permission" class="form-inline" ng-submit="group.addUser()">
+            <form name="add_permission" class="form-inline" ng-submit="$ctrl.addUser()">
                 <div class="form-group">
-                    <input placeholder="Username or email" type="text" class="autocomplete form-control" ng-model="group.form.autocompleteUser" uib-typeahead="u for u in group.searchUsers($viewValue) | limitTo:8" typeahead-loading="searchingUsers" typeahead-wait-ms="250"/>
+                    <input placeholder="Username or email" type="text" class="autocomplete form-control" ng-model="$ctrl.form.autocompleteUser" uib-typeahead="u for u in $ctrl.searchUsers($viewValue) | limitTo:8" typeahead-loading="searchingUsers" typeahead-wait-ms="250"/>
                 </div>
                 <div class="form-group">
-                    <button class="btn btn-info" ng-disabled="!group.form.autocompleteUser"><span class="fa fa-user"></span> Add user</button>
+                    <button class="btn btn-info" ng-disabled="!$ctrl.form.autocompleteUser"><span class="fa fa-user"></span> Add user</button>
                 </div>
             </form>
 
         </div>
 
-        <table st-table="displayedCollection" st-safe-src="group.users" class="table table-striped">
+        <table st-table="displayedCollection" st-safe-src="$ctrl.users" class="table table-striped">
             <thead>
             <tr>
                 <th st-sort="user_name"><a>Username</a></th>
@@ -136,7 +136,7 @@
                             <a class="btn btn-danger btn-sm" data-uib-dropdown-toggle><span class="fa fa-trash-o"></span></a>
                           <ul class="dropdown-menu">
                               <li><a>No</a></li>
-                              <li><a ng-click="group.removeUser(user)">Yes</a></li>
+                              <li><a ng-click="$ctrl.removeUser(user)">Yes</a></li>
                           </ul>
                         </span>
             </tr>
diff --git a/frontend/src/controllers/admin/groups/groups_create.js b/frontend/src/components/views/admin-groups-create-view/admin-groups-create-view.js
similarity index 90%
rename from frontend/src/controllers/admin/groups/groups_create.js
rename to frontend/src/components/views/admin-groups-create-view/admin-groups-create-view.js
index 994f060..aa8c087 100644
--- a/frontend/src/controllers/admin/groups/groups_create.js
+++ b/frontend/src/components/views/admin-groups-create-view/admin-groups-create-view.js
@@ -17,13 +17,18 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminGroupsCreateController', AdminGroupsCreateController);
+angular.module('appenlight.components.adminGroupsCreateView', [])
+    .component('adminGroupsCreateView', {
+        templateUrl: 'components/views/admin-groups-create-view/admin-groups-create-view.html',
+        controller: AdminGroupsCreateViewController
+    });
 
-AdminGroupsCreateController.$inject = ['$state', 'groupsResource', 'groupsPropertyResource', 'sectionViewResource', 'AeConfig'];
+AdminGroupsCreateViewController.$inject = ['$state', 'groupsResource', 'groupsPropertyResource', 'sectionViewResource'];
 
-function AdminGroupsCreateController($state, groupsResource, groupsPropertyResource, sectionViewResource, AeConfig) {
+function AdminGroupsCreateViewController($state, groupsResource, groupsPropertyResource, sectionViewResource) {
     console.debug('AdminGroupsCreateController');
     var vm = this;
+    vm.$state = $state;
     vm.loading = {
         group: false,
         resource_permissions: false,
diff --git a/frontend/src/templates/admin/groups/groups_list.html b/frontend/src/components/views/admin-groups-list-view/admin-groups-list-view.html
similarity index 87%
rename from frontend/src/templates/admin/groups/groups_list.html
rename to frontend/src/components/views/admin-groups-list-view/admin-groups-list-view.html
index 9d51d25..74134fd 100644
--- a/frontend/src/templates/admin/groups/groups_list.html
+++ b/frontend/src/components/views/admin-groups-list-view/admin-groups-list-view.html
@@ -1,8 +1,8 @@
-<ng-include src="'templates/loader.html'" ng-if="groups.loading.groups"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.groups"></ng-include>
 
-<div class="panel panel-default" ng-show="!groups.loading.groups">
+<div class="panel panel-default" ng-show="!$ctrl.loading.groups">
 
-    <table st-table="displayedCollection" st-safe-src="groups.groups" class="table table-striped">
+    <table st-table="displayedCollection" st-safe-src="$ctrl.groups" class="table table-striped">
         <thead>
         <tr>
             <th st-sort="group_name"><a>Group name</a></th>
@@ -29,7 +29,7 @@
                             <a class="btn btn-danger btn-sm" data-uib-dropdown-toggle><span class="fa fa-trash-o"></span></a>
                           <ul class="dropdown-menu">
                               <li><a>No</a></li>
-                              <li><a ng-click="groups.removeGroup(group)">Yes</a></li>
+                              <li><a ng-click="$ctrl.removeGroup(group)">Yes</a></li>
                           </ul>
                         </span>
         </tr>
diff --git a/frontend/src/controllers/admin/groups/groups_list.js b/frontend/src/components/views/admin-groups-list-view/admin-groups-list-view.js
similarity index 85%
rename from frontend/src/controllers/admin/groups/groups_list.js
rename to frontend/src/components/views/admin-groups-list-view/admin-groups-list-view.js
index f60274e..6225e4a 100644
--- a/frontend/src/controllers/admin/groups/groups_list.js
+++ b/frontend/src/components/views/admin-groups-list-view/admin-groups-list-view.js
@@ -17,13 +17,18 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminGroupsController', AdminGroupsController);
+angular.module('appenlight.components.adminGroupsListView', [])
+    .component('adminGroupsListView', {
+        templateUrl: 'components/views/admin-groups-list-view/admin-groups-list-view.html',
+        controller: AdminGroupsListViewController
+    });
 
-AdminGroupsController.$inject = ['groupsResource'];
+AdminGroupsListViewController.$inject = ['$state', 'groupsResource'];
 
-function AdminGroupsController(groupsResource) {
-    console.debug('AdminGroupsController');
+function AdminGroupsListViewController($state, groupsResource) {
+    console.debug('AdminGroupsListViewController');
     var vm = this;
+    vm.$state = $state;
     vm.loading = {groups: true};
 
     vm.groups = groupsResource.query({}, function (data) {
diff --git a/frontend/src/templates/admin/partitions.html b/frontend/src/components/views/admin-partitions-view/admin-partitions-view.html
similarity index 75%
rename from frontend/src/templates/admin/partitions.html
rename to frontend/src/components/views/admin-partitions-view/admin-partitions-view.html
index 2c7c6ae..b5f0f05 100644
--- a/frontend/src/templates/admin/partitions.html
+++ b/frontend/src/components/views/admin-partitions-view/admin-partitions-view.html
@@ -1,23 +1,23 @@
-<ng-include src="'templates/loader.html'" ng-if="partitions.loading.partitions"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.partitions"></ng-include>
 
-<div ng-show="!partitions.loading.partitions">
+<div ng-show="!$ctrl.loading.partitions">
 
     <div class="panel panel-default">
         <div class="panel-heading">
             DELETE Daily Partitions
         </div>
 
-        <form name="partitions.dailyPartitionsForm"
-              novalidate ng-submit="partitions.partitionsDelete('dailyPartitions')"
+        <form name="$ctrl.dailyPartitionsForm"
+              novalidate ng-submit="$ctrl.partitionsDelete('dailyPartitions')"
               class="form-inline"
-              ng-class="{'has-error':partitions.dailyPartitionsForm.$invalid}">
+              ng-class="{'has-error':$ctrl.dailyPartitionsForm.$invalid}">
 
             <div class="panel-body">
 
                 <input type="text" name="confirm"
-                       placeholder="Enter CONFIRM to proceed" class="form-control input-autosize" confirm-validate required ng-model="partitions.dailyConfirm">
-                <input type="submit" class="btn btn-danger" ng-disabled="partitions.dailyPartitionsForm.$invalid">
-                <input type="checkbox" ng-model="partitions.dailyChecked" ng-change="partitions.setCheckedList('dailyPartitions')"> Check All
+                       placeholder="Enter CONFIRM to proceed" class="form-control input-autosize" confirm-validate required ng-model="$ctrl.dailyConfirm">
+                <input type="submit" class="btn btn-danger" ng-disabled="$ctrl.dailyPartitionsForm.$invalid">
+                <input type="checkbox" ng-model="$ctrl.dailyChecked" ng-change="$ctrl.setCheckedList('dailyPartitions')"> Check All
 
             </div>
 
@@ -26,7 +26,7 @@
                     <th class="c1 date">Date</th>
                     <th class="c2 indices">Indices</th>
                 </tr>
-                <tr class="r{{$index}}" ng-repeat="row in partitions.dailyPartitions">
+                <tr class="r{{$index}}" ng-repeat="row in $ctrl.dailyPartitions">
                     <td class="c1">{{row[0]}}</td>
                     <td class="c2">
                         <ul class="list-group">
@@ -49,19 +49,19 @@
             DELETE Permanent Partitions
         </div>
 
-        <form name="partitions.permanentPartitionsForm" novalidate
-              ng-submit="partitions.partitionsDelete('permanentPartitions')"
+        <form name="$ctrl.permanentPartitionsForm" novalidate
+              ng-submit="$ctrl.partitionsDelete('permanentPartitions')"
               class="form-inline"
-              ng-class="{'has-error':partitions.permanentPartitionsForm.$invalid}">
+              ng-class="{'has-error':$ctrl.permanentPartitionsForm.$invalid}">
 
 
             <div class="panel-body">
 
                 <div class="form-group">
                     <input type="text" name="confirm"
-                           placeholder="Enter CONFIRM to proceed" class="form-control" confirm-validate required ng-model="partitions.permConfirm">
-                    <input type="submit" class="btn btn-danger" ng-disabled="partitions.permanentPartitionsForm.$invalid">
-                    <input type="checkbox" ng-model="partitions.permChecked" ng-change="partitions.setCheckedList('permanentPartitions')"> Check All
+                           placeholder="Enter CONFIRM to proceed" class="form-control" confirm-validate required ng-model="$ctrl.permConfirm">
+                    <input type="submit" class="btn btn-danger" ng-disabled="$ctrl.permanentPartitionsForm.$invalid">
+                    <input type="checkbox" ng-model="$ctrl.permChecked" ng-change="$ctrl.setCheckedList('permanentPartitions')"> Check All
                 </div>
 
             </div>
@@ -71,7 +71,7 @@
                     <th class="c1 date">Date</th>
                     <th class="c2 indices">Indices</th>
                 </tr>
-                <tr class="r{{$index}}" ng-repeat="row in partitions.permanentPartitions">
+                <tr class="r{{$index}}" ng-repeat="row in $ctrl.permanentPartitions">
                     <td class="c1">{{row[0]}}</td>
                     <td class="c2">
                         <ul class="list-group">
diff --git a/frontend/src/controllers/admin/partitions.js b/frontend/src/components/views/admin-partitions-view/admin-partitions-view.js
similarity index 94%
rename from frontend/src/controllers/admin/partitions.js
rename to frontend/src/components/views/admin-partitions-view/admin-partitions-view.js
index dfff57c..cdada5e 100644
--- a/frontend/src/controllers/admin/partitions.js
+++ b/frontend/src/components/views/admin-partitions-view/admin-partitions-view.js
@@ -17,11 +17,15 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminPartitionsController', AdminPartitionsController);
+angular.module('appenlight.components.adminPartitionsView', [])
+    .component('adminPartitionsView', {
+        templateUrl: 'components/views/admin-partitions-view/admin-partitions-view.html',
+        controller: AdminPartitionsViewController
+    });
 
-AdminPartitionsController.$inject = ['sectionViewResource'];
+AdminPartitionsViewController.$inject = ['sectionViewResource'];
 
-function AdminPartitionsController(sectionViewResource) {
+function AdminPartitionsViewController(sectionViewResource) {
     var vm = this;
     vm.permanentPartitions = [];
     vm.dailyPartitions = [];
diff --git a/frontend/src/templates/admin/system.html b/frontend/src/components/views/admin-system-view/admin-system-view.html
similarity index 84%
rename from frontend/src/templates/admin/system.html
rename to frontend/src/components/views/admin-system-view/admin-system-view.html
index 399d162..01097b4 100644
--- a/frontend/src/templates/admin/system.html
+++ b/frontend/src/components/views/admin-system-view/admin-system-view.html
@@ -1,6 +1,6 @@
-<ng-include src="'templates/loader.html'" ng-if="system.loading.system"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.system"></ng-include>
 
-<div ng-if="system.loading.system == false">
+<div ng-if="$ctrl.loading.system == false">
     <div class="row">
         <div class="col-sm-12">
             <div class="panel panel-default">
@@ -12,27 +12,27 @@
                 <div class="panel-body">
 
                     <p><strong>System Load:</strong>
-                        1min: {{system.systemLoad[0]}}, 5min: {{system.systemLoad[1]}}, 15min: {{system.systemLoad[2]}}
+                        1min: {{$ctrl.systemLoad[0]}}, 5min: {{$ctrl.systemLoad[1]}}, 15min: {{$ctrl.systemLoad[2]}}
                     </p>
                     <p><strong>Awaiting tasks:</strong>
                     <ul>
-                        <li>reports: {{system.queueStats.waiting_reports}}</li>
-                        <li>logs: {{system.queueStats.waiting_logs}}</li>
-                        <li>metrics: {{system.queueStats.waiting_metrics}}</li>
-                        <li>other: {{system.queueStats.waiting_other}}</li>
+                        <li>reports: {{$ctrl.queueStats.waiting_reports}}</li>
+                        <li>logs: {{$ctrl.queueStats.waiting_logs}}</li>
+                        <li>metrics: {{$ctrl.queueStats.waiting_metrics}}</li>
+                        <li>other: {{$ctrl.queueStats.waiting_other}}</li>
                     </ul>
                     </p>
                     <p><strong>Queue stats from last minute:</strong>
                     <ul>
-                        <li>Processed reports: {{system.queueStats.processed_reports}}</li>
-                        <li>Processed logs: {{system.queueStats.processed_logs}}</li>
-                        <li>Processed metrics: {{system.queueStats.processed_metrics}}</li>
+                        <li>Processed reports: {{$ctrl.queueStats.processed_reports}}</li>
+                        <li>Processed logs: {{$ctrl.queueStats.processed_logs}}</li>
+                        <li>Processed metrics: {{$ctrl.queueStats.processed_metrics}}</li>
                     </ul>
                     </p>
 
                     <p><strong>Disks:</strong>
                     <ul>
-                        <li ng-repeat="disk in system.disks">
+                        <li ng-repeat="disk in $ctrl.disks">
                             <strong>{{disk.device}}</strong> {{disk.free}}/{{disk.total}}, {{disk.percentage}}% used
                         </li>
                     </ul>
@@ -40,10 +40,10 @@
 
                     <p><strong>Process stats:</strong>
                     <ul>
-                        <li>FD soft limits: {{system.selfInfo.fds.soft}}</li>
-                        <li>FD hard limits: {{system.selfInfo.fds.hard}}</li>
-                        <li>Memlock soft limits: {{system.selfInfo.memlock.soft}}</li>
-                        <li>Memlock hard limits: {{system.selfInfo.memlock.hard}}</li>
+                        <li>FD soft limits: {{$ctrl.selfInfo.fds.soft}}</li>
+                        <li>FD hard limits: {{$ctrl.selfInfo.fds.hard}}</li>
+                        <li>Memlock soft limits: {{$ctrl.selfInfo.memlock.soft}}</li>
+                        <li>Memlock hard limits: {{$ctrl.selfInfo.memlock.hard}}</li>
                     </ul>
                     </p>
 
@@ -71,7 +71,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <tr class="r{{$index}}" ng-repeat="row in system.DBtables">
+                                <tr class="r{{$index}}" ng-repeat="row in $ctrl.DBtables">
                                     <td class="c1">{{row.table_name}}</td>
                                     <td class="c2">{{row.size_human}}</td>
                                 </tr>
@@ -93,7 +93,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <tr class="r{{$index}}" ng-repeat="row in system.ESIndices">
+                                <tr class="r{{$index}}" ng-repeat="row in $ctrl.ESIndices">
                                     <td class="c1">{{row.name}}</td>
                                     <td class="c2">{{row.size_human}}</td>
                                 </tr>
@@ -118,7 +118,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <tr class="r{{$index}}" ng-repeat-start="row in system.processInfo">
+                                <tr class="r{{$index}}" ng-repeat-start="row in $ctrl.processInfo">
                                     <td class="c1">{{row.owner}}</td>
                                     <td class="c2">{{row.pid}}</td>
                                     <td class="c3">{{row.cpu}}</td>
@@ -139,7 +139,7 @@
                             </uib-tab-heading>
 
                             <table class="table">
-                                <tr ng-repeat="package in system.packages">
+                                <tr ng-repeat="package in $ctrl.packages">
                                     <td>{{package.name}}</td>
                                     <td>{{package.version}}</td>
                                 </tr>
diff --git a/frontend/src/controllers/admin/system.js b/frontend/src/components/views/admin-system-view/admin-system-view.js
similarity index 87%
rename from frontend/src/controllers/admin/system.js
rename to frontend/src/components/views/admin-system-view/admin-system-view.js
index 5a91ee1..d9a7278 100644
--- a/frontend/src/controllers/admin/system.js
+++ b/frontend/src/components/views/admin-system-view/admin-system-view.js
@@ -17,11 +17,15 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminSystemController', AdminSystemController);
+angular.module('appenlight.components.adminSystemView', [])
+    .component('adminSystemView', {
+        templateUrl: 'components/views/admin-system-view/admin-system-view.html',
+        controller: AdminSystemViewController
+    });
 
-AdminSystemController.$inject = ['sectionViewResource'];
+AdminSystemViewController.$inject = ['sectionViewResource'];
 
-function AdminSystemController(sectionViewResource) {
+function AdminSystemViewController(sectionViewResource) {
     var vm = this;
     vm.tables = [];
     vm.loading = {system: true};
diff --git a/frontend/src/templates/admin/users/users_create.html b/frontend/src/components/views/admin-users-create-view/admin-users-create-view.html
similarity index 72%
rename from frontend/src/templates/admin/users/users_create.html
rename to frontend/src/components/views/admin-users-create-view/admin-users-create-view.html
index aab3e27..dfda12c 100644
--- a/frontend/src/templates/admin/users/users_create.html
+++ b/frontend/src/components/views/admin-users-create-view/admin-users-create-view.html
@@ -1,41 +1,41 @@
-<ng-include src="'templates/loader.html'" ng-if="user.loading.user"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.user"></ng-include>
 
-<div ng-show="!user.loading.user">
+<div ng-show="!$ctrl.loading.user">
 
     <div class="panel panel-default">
         <div class="panel-body">
 
-                <span class="dropdown" data-uib-dropdown on-toggle="toggled(open)" ng-if="user.user.id">
+                <span class="dropdown" data-uib-dropdown on-toggle="toggled(open)" ng-if="$ctrl.user.id">
                     <a class="btn btn-default" data-uib-dropdown-toggle><span class="fa fa-user-secret"></span> Re-login to user</a>
                   <ul class="dropdown-menu">
                       <li><a>No</a></li>
-                      <li><a ng-click="user.reloginUser(user)">Yes</a></li>
+                      <li><a ng-click="$ctrl.reloginUser(user)">Yes</a></li>
                   </ul>
                 </span>
 
-            <form name="user.profileForm" class="form-horizontal" ng-submit="user.createUser()">
+            <form name="$ctrl.profileForm" class="form-horizontal" ng-submit="$ctrl.createUser()">
                 <div class="form-group" id="row-user_name">
-                    <data-form-errors errors="user.profileForm.ae_validation.user_name"></data-form-errors>
+                    <data-form-errors errors="$ctrl.profileForm.ae_validation.user_name"></data-form-errors>
                     <label for="user_name" id="label-user_name" class="control-label col-sm-4 col-lg-3">
                         User name
                         <span class="required">*</span>
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control" id="user_name" name="user_name" type="text" ng-model="user.user.user_name">
+                        <input class="form-control" id="user_name" name="user_name" type="text" ng-model="$ctrl.user.user_name">
                     </div>
                 </div>
 
                 <div class="form-group" id="row-user_password">
-                    <data-form-errors errors="user.profileForm.ae_validation.user_password"></data-form-errors>
+                    <data-form-errors errors="$ctrl.profileForm.ae_validation.user_password"></data-form-errors>
                     <label for="user_password" id="label-user_password" class="control-label col-sm-4 col-lg-3">
                         Password
                         <span class="required">*</span>
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control" id="user_password" name="user_password" type="password" ng-model="user.user.user_password">
+                        <input class="form-control" id="user_password" name="user_password" type="password" ng-model="$ctrl.user.user_password">
 
-                        <p class="m-t-1"><a class="btn btn-info btn-sm" ng-click="user.generatePassword()"><span class="fa fa-lock"></span> Generate password</a>
-                            <span ng-show="user.gen_pass.length > 0">(generated password: {{user.gen_pass}})</span>
+                        <p class="m-t-1"><a class="btn btn-info btn-sm" ng-click="$ctrl.generatePassword()"><span class="fa fa-lock"></span> Generate password</a>
+                            <span ng-show="$ctrl.gen_pass.length > 0">(generated password: {{$ctrl.gen_pass}})</span>
                         </p>
 
                     </div>
@@ -43,42 +43,42 @@
 
 
                 <div class="form-group" id="row-email">
-                    <data-form-errors errors="user.profileForm.ae_validation.email"></data-form-errors>
+                    <data-form-errors errors="$ctrl.profileForm.ae_validation.email"></data-form-errors>
                     <label for="email" id="label-email" class="control-label col-sm-4 col-lg-3">
                         Email Address
                         <span class="required">*</span>
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control" id="email" name="email" type="text" ng-model="user.user.email">
+                        <input class="form-control" id="email" name="email" type="text" ng-model="$ctrl.user.email">
                     </div>
                 </div>
 
                 <div class="form-group" id="row-first_name">
-                    <data-form-errors errors="user.profileForm.ae_validation.first_name"></data-form-errors>
+                    <data-form-errors errors="$ctrl.profileForm.ae_validation.first_name"></data-form-errors>
                     <label for="first_name" id="label-first_name" class="control-label col-sm-4 col-lg-3">
                         First Name
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control" id="first_name" name="first_name" type="text" ng-model="user.user.first_name">
+                        <input class="form-control" id="first_name" name="first_name" type="text" ng-model="$ctrl.user.first_name">
                     </div>
                 </div>
                 <div class="form-group" id="row-last_name">
-                    <data-form-errors errors="user.profileForm.ae_validation.last_name"></data-form-errors>
+                    <data-form-errors errors="$ctrl.profileForm.ae_validation.last_name"></data-form-errors>
                     <label for="last_name" id="label-last_name" class="control-label col-sm-4 col-lg-3">
                         Last Name
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control" id="last_name" name="last_name" type="text" ng-model="user.user.last_name">
+                        <input class="form-control" id="last_name" name="last_name" type="text" ng-model="$ctrl.user.last_name">
                     </div>
                 </div>
 
                 <div class="form-group" id="row-status">
-                    <data-form-errors errors="user.profileForm.ae_validation.status"></data-form-errors>
+                    <data-form-errors errors="$ctrl.profileForm.ae_validation.status"></data-form-errors>
                     <label for="status" id="label-status" class="control-label col-sm-4 col-lg-3">
                         Active
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input checked class="form-control" id="status" name="status" type="checkbox" ng-model="user.user.status">
+                        <input checked class="form-control" id="status" name="status" type="checkbox" ng-model="$ctrl.user.status">
                     </div>
                 </div>
 
@@ -86,7 +86,7 @@
                     <label for="submit" id="label-submit" class="control-label col-sm-4 col-lg-3">
                     </label>
                     <div class="col-sm-8 col-lg-9">
-                        <input class="form-control btn btn-primary" id="submit" name="submit" type="submit" value="{{$state.params.userId ? 'Update' : 'Add'}} User">
+                        <input class="form-control btn btn-primary" id="submit" name="submit" type="submit" value="{{$ctrl.$state.params.userId ? 'Update' : 'Add'}} User">
                     </div>
                 </div>
             </form>
@@ -94,7 +94,7 @@
     </div>
 
 
-    <div class="panel panel-default" ng-if="user.user.id">
+    <div class="panel panel-default" ng-if="$ctrl.user.id">
         <div class="panel-heading">
             <h3 class="panel-title">Permission Summary</h3>
         </div>
@@ -102,7 +102,7 @@
             <h3>Direct application permissions</h3>
 
             <ul class="list-group">
-                <li ng-repeat="perm in user.resourcePermissions.user.application" class="animate-repeat list-group-item">
+                <li ng-repeat="perm in $ctrl.resourcePermissions.user.application" class="animate-repeat list-group-item">
                     <strong>{{ perm.self.resource_name }}</strong>
                     <div class="pull-right">
 
@@ -118,7 +118,7 @@
             <h3>Direct dashboard permissions</h3>
 
             <ul class="list-group">
-                <li ng-repeat="perm in user.resourcePermissions.user.dashboard" class="animate-repeat list-group-item">
+                <li ng-repeat="perm in $ctrl.resourcePermissions.user.dashboard" class="animate-repeat list-group-item">
                     <strong>{{ perm.self.resource_name }}</strong>
                     <div class="pull-right">
 
diff --git a/frontend/src/controllers/admin/users/users_create.js b/frontend/src/components/views/admin-users-create-view/admin-users-create-view.js
similarity index 91%
rename from frontend/src/controllers/admin/users/users_create.js
rename to frontend/src/components/views/admin-users-create-view/admin-users-create-view.js
index c80bb88..ddbe7b2 100644
--- a/frontend/src/controllers/admin/users/users_create.js
+++ b/frontend/src/components/views/admin-users-create-view/admin-users-create-view.js
@@ -17,13 +17,18 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminUsersCreateController', AdminUsersCreateController);
+angular.module('appenlight.components.adminUsersCreateView', [])
+    .component('adminUsersCreateView', {
+        templateUrl: 'components/views/admin-users-create-view/admin-users-create-view.html',
+        controller: AdminUsersCreateViewController
+    });
 
-AdminUsersCreateController.$inject = ['$state', 'usersResource', 'usersPropertyResource', 'sectionViewResource', 'AeConfig'];
+AdminUsersCreateViewController.$inject = ['$state', 'usersResource', 'usersPropertyResource', 'sectionViewResource', 'AeConfig'];
 
-function AdminUsersCreateController($state, usersResource, usersPropertyResource, sectionViewResource, AeConfig) {
-    console.debug('AdminUsersCreateController');
+function AdminUsersCreateViewController($state, usersResource, usersPropertyResource, sectionViewResource, AeConfig) {
+    console.debug('AdminUsersCreateViewController');
     var vm = this;
+    vm.$state = $state;
     vm.loading = {user: false};
 
 
diff --git a/frontend/src/templates/admin/users/users_list.html b/frontend/src/components/views/admin-users-list-view/admin-users-list-view.html
similarity index 92%
rename from frontend/src/templates/admin/users/users_list.html
rename to frontend/src/components/views/admin-users-list-view/admin-users-list-view.html
index af1a596..cb1bff3 100644
--- a/frontend/src/templates/admin/users/users_list.html
+++ b/frontend/src/components/views/admin-users-list-view/admin-users-list-view.html
@@ -1,15 +1,15 @@
-<ng-include src="'templates/loader.html'" ng-if="users.loading.users"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.loading.users"></ng-include>
 
-<div ng-show="!users.loading.users">
+<div ng-show="!$ctrl.loading.users">
 
     <div class="panel panel-default">
 
         <div class="panel-heading">
-            {{users.activeUsers}} active out of {{users.users.length}} users
+            {{$ctrl.activeUsers}} active out of {{$ctrl.users.length}} users
         </div>
 
 
-        <table st-table="displayedCollection" st-safe-src="users.users" class="table table-striped">
+        <table st-table="displayedCollection" st-safe-src="$ctrl.users" class="table table-striped">
             <thead>
             <tr>
                 <th class="user_name" st-sort="user_name"><a>Username</a></th>
@@ -45,7 +45,7 @@
                         <a class="btn btn-danger btn-sm" data-uib-dropdown-toggle><span class="fa fa-trash-o"></span></a>
                       <ul class="dropdown-menu">
                           <li><a>No</a></li>
-                          <li><a ng-click="users.removeUser(user)">Yes</a></li>
+                          <li><a ng-click="$ctrl.removeUser(user)">Yes</a></li>
                       </ul>
                     </span>
             </tr>
diff --git a/frontend/src/controllers/admin/users/users_list.js b/frontend/src/components/views/admin-users-list-view/admin-users-list-view.js
similarity index 88%
rename from frontend/src/controllers/admin/users/users_list.js
rename to frontend/src/components/views/admin-users-list-view/admin-users-list-view.js
index c18c9ef..1d8b69f 100644
--- a/frontend/src/controllers/admin/users/users_list.js
+++ b/frontend/src/components/views/admin-users-list-view/admin-users-list-view.js
@@ -17,11 +17,15 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminUsersController', AdminUsersController);
+angular.module('appenlight.components.adminUsersListView', [])
+    .component('adminUsersListView', {
+        templateUrl: 'components/views/admin-users-list-view/admin-users-list-view.html',
+        controller: AdminUserListViewController
+    });
 
-AdminUsersController.$inject = ['usersResource'];
+AdminUserListViewController.$inject = ['usersResource'];
 
-function AdminUsersController(usersResource) {
+function AdminUserListViewController(usersResource) {
     console.debug('AdminUsersController');
     var vm = this;
     vm.loading = {users: true};
diff --git a/frontend/src/templates/admin/parent_view.html b/frontend/src/components/views/admin-view/admin-view.html
similarity index 97%
rename from frontend/src/templates/admin/parent_view.html
rename to frontend/src/components/views/admin-view/admin-view.html
index fcd4b1d..bcf4df0 100644
--- a/frontend/src/templates/admin/parent_view.html
+++ b/frontend/src/components/views/admin-view/admin-view.html
@@ -1,29 +1,30 @@
-<div class="col-sm-3" id="menu">
-    <div class="panel panel-default">
-        <div class="panel-heading">Users and groups</div>
-        <ul class="list-group">
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.user.list"> Users</a></li>
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.user.create"> Create user</a></li>
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.group.list"> Groups</a></li>
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.group.create"> Create group</a></li>
-        </ul>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">Resources</div>
-        <ul class="list-group">
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.application.list"> List applications</a></li>
-        </ul>
-    </div>
+<div class="row">
+    <div class="col-sm-3" id="menu">
+        <div class="panel panel-default">
+            <div class="panel-heading">Users and groups</div>
+            <ul class="list-group">
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.user.list"> Users</a></li>
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.user.create"> Create user</a></li>
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.group.list"> Groups</a></li>
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.group.create"> Create group</a></li>
+            </ul>
+        </div>
+        <div class="panel panel-default">
+            <div class="panel-heading">Resources</div>
+            <ul class="list-group">
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.application.list"> List applications</a></li>
+            </ul>
+        </div>
 
-    <div class="panel panel-default">
-        <div class="panel-heading">System</div>
-        <ul class="list-group">
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.configs.list"> Config variables</a></li>
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.system"> System</a></li>
-            <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.partitions"> Partition Management</a></li>
-        </ul>
+        <div class="panel panel-default">
+            <div class="panel-heading">System</div>
+            <ul class="list-group">
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.configs.list"> Config variables</a></li>
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.system"> System</a></li>
+                <li class="list-group-item" ui-sref-active="active"><a data-ui-sref="admin.partitions"> Partition Management</a></li>
+            </ul>
+        </div>
     </div>
-</div>
 
-
-<div class="col-sm-9" ui-view></div>
+    <div class="col-sm-9" ui-view></div>
+</div>
diff --git a/frontend/src/components/views/admin-view/admin-view.js b/frontend/src/components/views/admin-view/admin-view.js
new file mode 100644
index 0000000..30d2e6b
--- /dev/null
+++ b/frontend/src/components/views/admin-view/admin-view.js
@@ -0,0 +1,31 @@
+// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # AppEnlight Enterprise Edition, including its added features, Support
+// # services, and proprietary license terms, please see
+// # https://rhodecode.com/licenses/
+
+angular.module('appenlight.components.adminView', [])
+    .component('adminView', {
+        templateUrl: 'components/views/admin-view/admin-view.html',
+        controller: AdminViewController
+    });
+
+AdminViewController.$inject = ['$state'];
+
+function AdminViewController($state) {
+    this.$state = $state;
+    console.info('AdminViewController');
+}
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index f10c5f4..ccd2bd2 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -61,84 +61,74 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun
     });
     $stateProvider.state('admin', {
         url: '/ui/admin',
-        templateUrl: 'templates/admin/parent_view.html'
+        component: 'adminView'
     });
     $stateProvider.state('admin.user', {
         abstract: true,
         url: '/user',
-        templateUrl: 'templates/admin/users/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
     $stateProvider.state('admin.user.list', {
         url: '/list',
-        templateUrl: 'templates/admin/users/users_list.html',
-        controller: 'AdminUsersController as users'
+        component: 'adminUsersListView'
     });
     $stateProvider.state('admin.user.create', {
         url: '/create',
-        templateUrl: 'templates/admin/users/users_create.html',
-        controller: 'AdminUsersCreateController as user'
+        component: 'adminUsersCreateView'
     });
     $stateProvider.state('admin.user.update', {
         url: '/{userId}/update',
-        templateUrl: 'templates/admin/users/users_create.html',
-        controller: 'AdminUsersCreateController as user'
+        component: 'adminUsersCreateView'
     });
 
 
     $stateProvider.state('admin.group', {
         abstract: true,
         url: '/group',
-        templateUrl: 'templates/admin/groups/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
     $stateProvider.state('admin.group.list', {
         url: '/list',
-        templateUrl: 'templates/admin/groups/groups_list.html',
-        controller: 'AdminGroupsController as groups'
+        component: 'adminGroupsListView'
     });
     $stateProvider.state('admin.group.create', {
         url: '/create',
-        templateUrl: 'templates/admin/groups/groups_create.html',
-        controller: 'AdminGroupsCreateController as group'
+        component: 'adminGroupsCreateView'
     });
     $stateProvider.state('admin.group.update', {
         url: '/{groupId}/update',
-        templateUrl: 'templates/admin/groups/groups_create.html',
-        controller: 'AdminGroupsCreateController as group'
+        component: 'adminGroupsCreateView'
     });
 
     $stateProvider.state('admin.application', {
         abstract: true,
         url: '/application',
-        templateUrl: 'templates/admin/users/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
 
     $stateProvider.state('admin.application.list', {
         url: '/list',
-        templateUrl: 'templates/admin/applications/applications_list.html',
-        controller: 'AdminApplicationsListController as applications'
+        component: 'adminApplicationsListView'
     });
 
     $stateProvider.state('admin.partitions', {
         url: '/partitions',
-        templateUrl: 'templates/admin/partitions.html',
-        controller: 'AdminPartitionsController as partitions'
+        component: 'adminPartitionsView'
     });
     $stateProvider.state('admin.system', {
         url: '/system',
-        templateUrl: 'templates/admin/system.html',
-        controller: 'AdminSystemController as system'
+        component: 'adminSystemView'
     });
 
     $stateProvider.state('admin.configs', {
         abstract: true,
         url: '/configs',
-        templateUrl: 'templates/admin/configs/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
 
     $stateProvider.state('admin.configs.list', {
         url: '/list',
-        templateUrl: 'templates/admin/configs/edit.html',
-        controller: 'ConfigsListController as configs'
+        component: 'adminConfigurationView'
     });
 
     $stateProvider.state('user', {
diff --git a/frontend/src/templates/admin/configs/parent_view.html b/frontend/src/templates/admin/configs/parent_view.html
deleted file mode 100644
index f182cdd..0000000
--- a/frontend/src/templates/admin/configs/parent_view.html
+++ /dev/null
@@ -1 +0,0 @@
-<div ui-view></div>
\ No newline at end of file
diff --git a/frontend/src/templates/admin/users/parent_view.html b/frontend/src/templates/admin/users/parent_view.html
deleted file mode 100644
index f182cdd..0000000
--- a/frontend/src/templates/admin/users/parent_view.html
+++ /dev/null
@@ -1 +0,0 @@
-<div ui-view></div>
\ No newline at end of file