diff --git a/backend/src/appenlight/models/alert_channel.py b/backend/src/appenlight/models/alert_channel.py
index d9310d3..fd910e7 100644
--- a/backend/src/appenlight/models/alert_channel.py
+++ b/backend/src/appenlight/models/alert_channel.py
@@ -210,7 +210,7 @@ class AlertChannel(Base, BaseModel):
         tmpl_vars["confirmed_total"] = len(reports)
 
         tmpl_vars["report_type"] = "error reports"
-        tmpl_vars["url_report_type"] = 'report'
+        tmpl_vars["url_report_type"] = 'report/list'
 
         alert_type = tmpl_vars.get('alert_type', '')
         if 'slow_report' in alert_type:
diff --git a/backend/src/appenlight/static/js/appenlight.js b/backend/src/appenlight/static/js/appenlight.js
index c9ab9da..5594949 100644
--- a/backend/src/appenlight/static/js/appenlight.js
+++ b/backend/src/appenlight/static/js/appenlight.js
@@ -2681,6 +2681,9 @@ angular.module('appenlight.components', [
     'appenlight.components.appenlightHeader',
     'appenlight.components.indexDashboardView',
     'appenlight.components.logsBrowserView',
+    'appenlight.components.reportView',
+    'appenlight.components.reportsBrowserView',
+    'appenlight.components.reportsSlowBrowserView',
     'appenlight.components.eventBrowserView',
     'appenlight.components.userProfileView',
     'appenlight.components.userIdentitiesView',
@@ -4609,1459 +4612,1574 @@ function kickstartAE(initialUserData) {
   );
 
 
-  $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" +
+  $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-if=\"call.children.length > 0\" class=\"subcalls p-l-8\">\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" +
+    "        <p><strong>\n" +
+    "            <small>Sub-calls</small>\n" +
+    "        </strong></p>\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 ng-repeat=\"call in call.children\" ng-include=\"'slow_call.html'\" class=\"panel-body\"/>\n" +
     "        </div>\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" +
+    "</script>\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.email\">\n" +
+    "<script type=\"text/ng-template\" id=\"AssignReportCtrl.html\">\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" +
-    "                    <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 class=\"modal-header\">\n" +
+    "        <h3>Assign users to report</h3>\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" +
+    "    <div class=\"modal-body\">\n" +
     "\n" +
-    "<div ng-if=\"!$ctrl.loading.channels && !$ctrl.loading.applications && !$ctrl.loading.actions\">\n" +
+    "        <ng-include src=\"'templates/loader.html'\" ng-if=\"ctrl.loading\"></ng-include>\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" +
+    "        <div class=\"row\" ng-if=\"!ctrl.loading\">\n" +
+    "            <div class=\"col-sm-6\">\n" +
+    "                <strong>Unassigned</strong>\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=\"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" +
     "\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 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 class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-body\">\n" +
-    "            <h1>Alert channels</h1>\n" +
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.is_loading.report\"></ng-include>\n" +
     "\n" +
-    "            <p>Here you can configure your <em>alert channels</em>.</p>\n" +
+    "<div ng-if=\"!$ctrl.is_loading.report && $ctrl.report === null\">\n" +
+    "    <strong>OOPS something went wrong :(</strong>\n" +
+    "</div>\n" +
     "\n" +
-    "            <p>An alert channel serves as means of delivery of notifications about important events that happen in your applications.</p>\n" +
+    "<div ng-if=\"$ctrl.report !== null && !$ctrl.is_loading.report\">\n" +
     "\n" +
-    "            <div class=\"alert alert-success\">You can add more integrations that support different alert channels via application management panel.</div>\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" +
-    "            <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" +
+    "        <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" +
-    "                        <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" +
+    "        <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" +
-    "                    </td>\n" +
-    "                </tr>\n" +
-    "            </table>\n" +
+    "        <a class=\"btn btn-default\" ng-click=\"$ctrl.markPublic()\">Make {{$ctrl.group.public ? 'private' : 'public'}}</a>\n" +
     "\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" +
     "\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" +
+    "    <div class=\"row\">\n" +
+    "        <div class=\"col-lg-4\">\n" +
     "\n" +
-    "<div ng-show=\"!$ctrl.loading.tokens\">\n" +
+    "            <div class=\"panel panel-default m-t-1\">\n" +
+    "                <div class=\"panel-body\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
+    "                    <h3 class=\"m-t-0\">Report Information</h3>\n" +
     "\n" +
-    "        <div class=\"panel-body\">\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 class=\"alert alert-success\">You can use those tokens to authenticate yourself when performing various API calls</div>\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" +
-    "            <hr/>\n" +
+    "                    <div ng-if=\"$ctrl.requestStats\">\n" +
+    "                        <h3>Performance stats</h3>\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" +
-    "\n" +
-    "        </div>\n" +
-    "\n" +
-    "\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" +
-    "            <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" +
-    "            <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" +
+    "                        <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>\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" +
+    "                            <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" +
-    "<div ng-show=\"!$ctrl.loading.identities\">\n" +
+    "                    <h3>Tags</h3>\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" +
+    "                    <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=\"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" +
-    "    </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" +
     "\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" +
+    "        </div>\n" +
+    "        <div class=\"col-lg-8\">\n" +
+    "            <div class=\"frames\">\n" +
+    "                <p class=\"text-center\">Report history</p>\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 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" +
-    "                <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" +
+    "\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" +
     "                    </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 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>\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 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" +
-    "            </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" +
+    "                <h3 class=\"word-wrap\">{{$ctrl.report.error}}</h3>\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" +
+    "                <div ng-if=\"$ctrl.report.traceback\">\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" +
+    "                    <h3><strong>Traceback</strong></h3>\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" +
+    "\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 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" +
+    "\n" +
+    "                    <div ng-if=\"$ctrl.showRaw\" class=\"m-t-1\">\n" +
+    "                        <pre>{{$ctrl.rawTraceback}}</pre>\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" +
+    "                    <div ng-if=\"!$ctrl.showRaw\" class=\"m-t-1\">\n" +
     "\n" +
-    "        <p>For example you can let other staff member view or alter error reports.</p>\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" +
-    "        <div ng-if=\"permissions.possibleGroups.length > 0\">\n" +
-    "            <h3>Group permissions</h3>\n" +
+    "                                <span class=\"no-vars\" ng-if=\"frame.vars.length == 0\"></span>\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" +
+    "                <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" +
-    "            <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" +
+    "                <span ng-if=\"frame.fn\"><span class=\"mono\">in</span> <strong\n" +
+    "                        class=\"fn mono\">{{frame.fn || 'Unknown function'}}</strong></span>\n" +
     "\n" +
-    "        </div>\n" +
+    "                            </div>\n" +
+    "                            <div class=\"cline mono\" ng-if=\"frame.cline\">{{frame.cline || 'Unknown context'}}</div>\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 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" +
+    "                            </div>\n" +
+    "                        </div>\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" +
     "\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" +
+    "\n" +
     "                </div>\n" +
-    "            </form>\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" +
+    "                <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" +
-    "        <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><strong>Slow Calls</strong></h3>\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 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 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 ng-if=\"$ctrl.report.slow_calls.length == 0\">\n" +
+    "                            No slow calls reported\n" +
+    "                        </div>\n" +
+    "\n" +
+    "                    </uib-tab>\n" +
+    "\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" +
+    "\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" +
+    "                    </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 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" +
+    "                            <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" +
+    "                            </tbody>\n" +
+    "                        </table>\n" +
+    "\n" +
+    "                    </uib-tab>\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" +
+    "\n" +
+    "                        </uib-tab-heading>\n" +
+    "\n" +
+    "                        <h3><strong>Comments</strong></h3>\n" +
+    "\n" +
+    "                        <p ng-if=\"$ctrl.report.comments.length == 0\">No comments yet - be first to add one!</p>\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" +
+    "\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" +
+    "\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" +
-    "            <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" +
+  $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" +
-    "    <span class=\"form-group\">\n" +
-    "        {{rule_ctrlr.readOnlyPossibleFields[rule_ctrlr.rule.field]}}\n" +
-    "    </span>\n" +
+    "<div ng-if=\"$ctrl.is_loading === false\">\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" +
+    "    <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" +
-    "    <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" +
+    "            <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-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" +
+    "    <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" +
-    "    </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 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 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" +
+    "    </p>\n" +
     "\n" +
-    "        <input type=\"text\" placeholder=\"Value\" ng-model=\"rule_ctrlr.rule.value\" ng-change=\"rule_ctrlr.setDirty()\" class=\"form-control\">\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" +
-    "    <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 class=\"panel panel-default\">\n" +
+    "        <!-- Default panel contents -->\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" +
+    "        <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" +
     "\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" +
+    "            </tbody>\n" +
+    "        </table>\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/applications/applications_list.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"applications.loading.applications\"></ng-include>\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" +
-    "<div class=\"panel panel-default\" ng-if=\"!applications.loading.applications\">\n" +
-    "    <div class=\"panel-heading\">\n" +
+    "<div ng-if=\"$ctrl.is_loading === false\">\n" +
     "\n" +
-    "        Currently active applications: {{applications.applications.length}}\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" +
+    "            <a ng-click=\"$ctrl.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
+    "        </span>\n" +
+    "    </p>\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" +
+    "    <p>\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" +
+    "    <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>\n"
-  );
-
-
-  $templateCache.put('templates/admin/configs/edit.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"configs.loading.config\"></ng-include>\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 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=\"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" +
-    "\n" +
-    "        <h2>Functional</h2>\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" +
+    "    </p>\n" +
     "\n" +
-    "        <h2>Global Rate Limiting</h2>\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" +
+    "    <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=\"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" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <!-- Default panel contents -->\n" +
     "\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" +
-    "        <hr/>\n" +
+    "            </tbody>\n" +
+    "        </table>\n" +
     "\n" +
-    "        <a class=\"btn btn-primary\" ng-click=\"configs.save()\">Save configuration</a>\n" +
     "    </div>\n" +
     "\n" +
-    "</div>\n" +
-    "\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 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/configs/parent_view.html',
-    "<div ui-view></div>"
+  $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" +
+    "\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 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('templates/admin/groups/groups_create.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"group.loading.group\"></ng-include>\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=\"!group.loading.group\">\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" +
-    "            <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" +
-    "\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" +
+    "            <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\" id=\"description\" name=\"description\" type=\"text\" ng-model=\"group.group.description\">\n" +
+    "                        <input class=\"form-control\" type=\"text\" ng-model=\"$ctrl.form.email\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "\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" +
+    "                <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\" id=\"submit\" name=\"submit\" type=\"submit\" value=\"{{$state.params.groupId ? 'Update' : 'Add'}} Group\">\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 ng-if=\"!$ctrl.loading.channels && !$ctrl.loading.applications && !$ctrl.loading.actions\">\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 panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></div>\n" +
     "        <div class=\"panel-body\">\n" +
-    "            <h3>Direct application permissions</h3>\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" +
-    "            <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" +
+    "            <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 class=\"pull-right\">\n" +
+    "        </div>\n" +
+    "    </div>\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 class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <h1>Alert channels</h1>\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" +
+    "            <p>Here you can configure your <em>alert channels</em>.</p>\n" +
     "\n" +
-    "            <h3>Direct dashboard permissions</h3>\n" +
+    "            <p>An alert channel serves as means of delivery of notifications about important events that happen in your applications.</p>\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" +
+    "            <div class=\"alert alert-success\">You can add more integrations that support different alert channels via application management panel.</div>\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" +
-    "\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" +
+    "            <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" +
-    "                </li>\n" +
-    "            </ul>\n" +
     "\n" +
-    "        </div>\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" +
     "\n" +
+    "        </div>\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" +
+    "\n" +
+    "<div ng-show=\"!$ctrl.loading.tokens\">\n" +
+    "\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\" ng-include=\"'templates/settings_breadcrumbs.html'\"></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" +
     "\n" +
-    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"group.addUser()\">\n" +
+    "            <div class=\"alert alert-success\">You can use those tokens to authenticate yourself when performing various API calls</div>\n" +
+    "\n" +
+    "            <hr/>\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" +
-    "                    <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" +
+    "                    <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" +
-    "                    <button class=\"btn btn-info\" ng-disabled=\"!group.form.autocompleteUser\"><span class=\"fa fa-user\"></span> Add user</button>\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" +
     "        </div>\n" +
     "\n" +
-    "        <table st-table=\"displayedCollection\" st-safe-src=\"group.users\" class=\"table table-striped\">\n" +
+    "\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" +
     "            <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" +
+    "                <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=\"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><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><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\">\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" +
+    "            <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" +
-    "                    <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" +
+    "                            <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=\"group.removeUser(user)\">Yes</a></li>\n" +
+    "                              <li><a ng-click=\"$ctrl.removeToken(token)\">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" +
     "    </div>\n" +
     "\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/user-identities-view/user-identities-view.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"$ctrl.loading.identities\"></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-show=\"!$ctrl.loading.identities\">\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" +
+    "    <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>\n" +
-    "\n"
-  );
-
-
-  $templateCache.put('templates/admin/groups/parent_view.html',
-    "<div ui-view></div>"
+    "            <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" +
+    "</div>\n"
   );
 
 
-  $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" +
+  $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 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" +
+    "<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" +
-    "<div class=\"col-sm-9\" ui-view></div>\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>\n" +
+    "            </form>\n" +
+    "\n" +
+    "        </div>\n" +
+    "    </div>\n" +
+    "</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" +
+  $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\">\n" +
-    "            DELETE Daily Partitions\n" +
-    "        </div>\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" +
+    "        <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" +
     "\n" +
-    "            <div class=\"panel-body\">\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" +
-    "                <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" +
+    "        <p>For example you can let other staff member view or alter error reports.</p>\n" +
     "\n" +
-    "            </div>\n" +
+    "        <div ng-if=\"permissions.possibleGroups.length > 0\">\n" +
+    "            <h3>Group permissions</h3>\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" +
+    "            <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" +
     "\n" +
-    "    </div>\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" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <div class=\"panel-heading\">\n" +
-    "            DELETE Permanent Partitions\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" +
-    "\n" +
-    "            <div class=\"panel-body\">\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" +
     "\n" +
+    "            <form name=\"add_permission\" class=\"form-inline\" ng-submit=\"permissions.setUserPermission()\">\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" +
+    "                    <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" +
-    "\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 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" +
-    "                    </td>\n" +
-    "                </tr>\n" +
-    "            </table>\n" +
-    "        </form>\n" +
-    "\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" +
     "</div>\n"
   );
 
 
-  $templateCache.put('templates/admin/system.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"system.loading.system\"></ng-include>\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 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" +
+    "        <div class=\"form-group\">\n" +
+    "        <label>Action</label>\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 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" +
-    "                    <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" +
+    "        <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" +
-    "                    <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>\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" +
     "\n" +
-    "                </div>\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 class=\"row\">\n" +
-    "        <div class=\"col-sm-12\">\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('directives/rule_read_only/rule_read_only.html',
+    "<div class=\"rule-read-only\">\n" +
     "\n" +
-    "            <div class=\"panel panel-default\">\n" +
-    "                <div class=\"panel-body\">\n" +
+    "    <span class=\"form-group\">\n" +
+    "        {{rule_ctrlr.readOnlyPossibleFields[rule_ctrlr.rule.field]}}\n" +
+    "    </span>\n" +
     "\n" +
-    "                    <uib-tabset>\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Postgresql Tables\n" +
-    "                            </uib-tab-heading>\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" +
-    "                            <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" +
+    "    <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" +
-    "                        </uib-tab>\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" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Elasticsearch Indices\n" +
-    "                            </uib-tab-heading>\n" +
+    "    </span>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('directives/rule/rule.html',
+    "<div class=\"rule form-inline\">\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 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" +
-    "                        </uib-tab>\n" +
+    "    <div ng-if=\"rule_ctrlr.rule.field != '__AND__' && rule_ctrlr.rule.field !='__OR__' && rule_ctrlr.rule.field !='__NOT__'\" class=\"form-group\">\n" +
     "\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Processes\n" +
-    "                            </uib-tab-heading>\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" +
-    "                            <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" +
+    "        <input type=\"text\" placeholder=\"Value\" ng-model=\"rule_ctrlr.rule.value\" ng-change=\"rule_ctrlr.setDirty()\" class=\"form-control\">\n" +
     "\n" +
-    "                        </uib-tab>\n" +
+    "    </div>\n" +
     "\n" +
-    "                        <uib-tab>\n" +
-    "                            <uib-tab-heading>\n" +
-    "                                Python packages\n" +
-    "                            </uib-tab-heading>\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" +
-    "                            <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" +
+    "        <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" +
-    "                        </uib-tab>\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" +
     "\n" +
-    "                    </uib-tabset>\n" +
+    "<div class=\"panel panel-default\" ng-if=\"!applications.loading.applications\">\n" +
+    "    <div class=\"panel-heading\">\n" +
+    "\n" +
+    "        Currently active applications: {{applications.applications.length}}\n" +
+    "\n" +
+    "    </div>\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" +
+    "\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('templates/admin/configs/edit.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"configs.loading.config\"></ng-include>\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" +
-    "        </div>\n" +
+    "        </form>\n" +
+    "\n" +
+    "        <h2>Functional</h2>\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" +
+    "\n" +
+    "        <h2>Global Rate Limiting</h2>\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" +
+    "\n" +
+    "        <hr/>\n" +
+    "\n" +
+    "        <a class=\"btn btn-primary\" ng-click=\"configs.save()\">Save configuration</a>\n" +
+    "    </div>\n" +
+    "\n" +
+    "</div>\n" +
+    "\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/users/parent_view.html',
+  $templateCache.put('templates/admin/configs/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('templates/admin/groups/groups_create.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"group.loading.group\"></ng-include>\n" +
     "\n" +
-    "<div ng-show=\"!user.loading.user\">\n" +
+    "<div ng-show=\"!group.loading.group\">\n" +
     "\n" +
     "    <div class=\"panel panel-default\">\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 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=\"user_name\" name=\"user_name\" type=\"text\" ng-model=\"user.user.user_name\">\n" +
+    "                        <input class=\"form-control\" id=\"group_name\" name=\"group_name\" type=\"text\" ng-model=\"group.group.group_name\">\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-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=\"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=\"description\" name=\"description\" type=\"text\" ng-model=\"group.group.description\">\n" +
     "                    </div>\n" +
     "                </div>\n" +
     "\n" +
     "\n" +
-    "                <div class=\"form-group\" id=\"row-email\">\n" +
-    "                    <data-form-errors errors=\"user.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" +
+    "                <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\" id=\"email\" name=\"email\" type=\"text\" ng-model=\"user.user.email\">\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" +
     "\n" +
-    "                <div class=\"form-group\" id=\"row-first_name\">\n" +
-    "                    <data-form-errors errors=\"user.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" +
-    "                    </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" +
-    "                    <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" +
-    "                    </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" +
-    "                    </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" +
-    "                    </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" +
-    "                    </div>\n" +
-    "                </div>\n" +
-    "            </form>\n" +
-    "        </div>\n" +
-    "    </div>\n" +
     "\n" +
-    "\n" +
-    "    <div class=\"panel panel-default\" ng-if=\"user.user.id\">\n" +
+    "    <div class=\"panel panel-default\" ng-if=\"group.group.id\">\n" +
     "        <div class=\"panel-heading\">\n" +
-    "            <h3 class=\"panel-title\">Permission Summary</h3>\n" +
+    "            <h3 class=\"panel-title\">Permissions summary</h3>\n" +
     "        </div>\n" +
     "        <div class=\"panel-body\">\n" +
     "            <h3>Direct application 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" +
+    "                <li ng-repeat=\"perm in group.resourcePermissions.group.application\" class=\"animate-repeat list-group-item\">\n" +
     "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
+    "\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" +
@@ -6076,10 +6194,10 @@ function kickstartAE(initialUserData) {
     "            <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" +
+    "                <li ng-repeat=\"perm in group.resourcePermissions.group.dashboard\" class=\"animate-repeat list-group-item\">\n" +
     "                    <strong>{{ perm.self.resource_name }}</strong>\n" +
-    "                    <div class=\"pull-right\">\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" +
     "\n" +
     "                        <a class=\"btn btn-default btn-xs\" data-uib-tooltip=\"Visit Dashboard\" data-ui-sref=\"dashboard.update({resourceId:perm.self.resource_id})\">\n" +
@@ -6094,32 +6212,33 @@ function kickstartAE(initialUserData) {
     "    </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 panel-default\" ng-if=\"group.group.id\">\n" +
     "        <div class=\"panel-heading\">\n" +
-    "            {{users.activeUsers}} active out of {{users.users.length}} users\n" +
+    "            <h3 class=\"panel-title\">User list</h3>\n" +
     "        </div>\n" +
+    "        <div class=\"panel-body\">\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" +
     "\n" +
+    "        </div>\n" +
     "\n" +
-    "        <table st-table=\"displayedCollection\" st-safe-src=\"users.users\" class=\"table table-striped\">\n" +
+    "        <table st-table=\"displayedCollection\" st-safe-src=\"group.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=\"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\"></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" +
@@ -6133,959 +6252,838 @@ function kickstartAE(initialUserData) {
     "            </thead>\n" +
     "            <tbody>\n" +
     "\n" +
-    "            <tr ng-repeat=\"user in displayedCollection track by user.id\">\n" +
+    "            <tr ng-repeat=\"user in displayedCollection\">\n" +
     "                <td><img src=\"{{user.gravatar_url}}\" class=\"avatar\"> {{user.user_name}}</td>\n" +
-    "                <td class=\"word-wrap small\">{{user.email}}</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 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>{{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=\"users.removeUser(user)\">Yes</a></li>\n" +
-    "                      </ul>\n" +
-    "                    </span>\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=\"6\" class=\"text-center\">\n" +
-    "                    <div st-pagination=\"\" st-items-by-page=\"100\" st-displayed-pages=\"7\"></div>\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" +
-    "\n" +
     "    </div>\n" +
+    "\n" +
+    "\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('templates/admin/groups/groups_list.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"groups.loading.groups\"></ng-include>\n" +
     "\n" +
-    "</a>\n"
+    "<div class=\"panel panel-default\" ng-show=\"!groups.loading.groups\">\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" +
+    "\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" +
+    "\n" +
+    "</div>\n" +
+    "\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/admin/groups/parent_view.html',
+    "<div ui-view></div>"
   );
 
 
-  $templateCache.put('templates/integrations/bitbucket.html',
-    "      <div class=\"modal-header\">\n" +
-    "        <h3 class=\"m-t-0\">Add issue to Bitbucket</h3>\n" +
-    "      </div>\n" +
-    "      <div class=\"modal-body\">\n" +
-    "        <div class=\"alert alert-danger\" ng-repeat=\"msg in ctrl.error_messages\">{{msg}}</div>\n" +
-    "        <div class=\"text-center\" ng-show=\"ctrl.loading\">\n" +
-    "            <span class=\"fa fa-cog fa-spin fa-5x loader m-a-4\"></span>\n" +
-    "        </div>\n" +
+  $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" +
     "\n" +
-    "        <form role=\"form\" ng-show=\"!ctrl.loading\">\n" +
-    "          <div class=\"form-group\">\n" +
-    "            <label for=\"issue_title\">Issue Title</label>\n" +
-    "            <input type=\"text\" class=\"form-control\" id=\"issue_title\" placeholder=\"Issue title\" ng-model=\"ctrl.form.title\">\n" +
-    "          </div>\n" +
-    "          <div class=\"form-group row\">\n" +
-    "              <div class=\"col-sm-6\">\n" +
-    "            <label for=\"issue_priority\">Priority</label>\n" +
-    "            <select class=\"form-control\" id=\"issue_priority\" ng-options=\"s for s in ctrl.priorities\" ng-model=\"ctrl.form.priority\"></select>\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-6\">\n" +
-    "            <label for=\"issue_responsible\">Assignee</label>\n" +
-    "            <select class=\"form-control\" id=\"issue_responsible\" ng-options=\"a.user for a in ctrl.assignees\" ng-model=\"ctrl.form.responsible\"></select>\n" +
-    "              </div>\n" +
-    "          </div>\n" +
-    "          <div class=\"form-group\">\n" +
-    "            <label for=\"issue_content\">Description</label>\n" +
-    "            <textarea id=\"issue_content\" class=\"form-control\" ng-model=\"ctrl.form.content\" style=\"min-height: 100px\"></textarea>\n" +
-    "          </div>\n" +
-    "        </form>\n" +
     "\n" +
-    "      </div>\n" +
-    "      <div class=\"modal-footer\">\n" +
-    "                <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">Add issue</button>\n" +
-    "                <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
-    "      </div>\n"
+    "<div class=\"col-sm-9\" ui-view></div>\n"
   );
 
 
-  $templateCache.put('templates/integrations/github.html',
-    "      <div class=\"modal-header\">\n" +
-    "        <h3 class=\"m-t-0\">Add issue to Github</h3>\n" +
-    "      </div>\n" +
-    "      <div class=\"modal-body\">\n" +
-    "        <div class=\"alert alert-danger\" ng-repeat=\"msg in ctrl.error_messages\">{{msg}}</div>\n" +
+  $templateCache.put('templates/admin/partitions.html',
+    "<ng-include src=\"'templates/loader.html'\" ng-if=\"partitions.loading.partitions\"></ng-include>\n" +
     "\n" +
-    "        <div class=\"text-center\" ng-show=\"ctrl.loading\">\n" +
-    "            <span class=\"fa fa-cog fa-spin fa-5x loader m-a-4\"></span>\n" +
+    "<div ng-show=\"!partitions.loading.partitions\">\n" +
+    "\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            DELETE Daily Partitions\n" +
     "        </div>\n" +
     "\n" +
-    "        <form role=\"form\" ng-show=\"!ctrl.loading\">\n" +
-    "          <div class=\"form-group\">\n" +
-    "            <label for=\"issue_title\">Issue Title</label>\n" +
-    "            <input type=\"text\" class=\"form-control\" id=\"issue_title\" placeholder=\"Issue title\" ng-model=\"ctrl.form.title\">\n" +
-    "          </div>\n" +
-    "          <div class=\"form-group row\">\n" +
-    "              <div class=\"col-sm-6\">\n" +
-    "            <label for=\"issue_status\">Tag</label>\n" +
-    "            <select class=\"form-control\" id=\"issue_status\" ng-options=\"s for s in ctrl.statuses\" ng-model=\"ctrl.form.status\"></select>\n" +
-    "              </div>\n" +
-    "\n" +
-    "              <div class=\"col-sm-6\">\n" +
-    "            <label for=\"issue_responsible\">Assignee</label>\n" +
-    "            <select class=\"form-control\" id=\"issue_responsible\" ng-options=\"a.user for a in ctrl.assignees\" ng-model=\"ctrl.form.responsible\"></select>\n" +
-    "              </div>\n" +
-    "          </div>\n" +
-    "          <div class=\"form-group\">\n" +
-    "            <label for=\"issue_description\">Description</label>\n" +
-    "            <textarea id=\"issue_description\" class=\"form-control\" ng-model=\"ctrl.form.content\" style=\"min-height: 100px\"></textarea>\n" +
-    "          </div>\n" +
-    "        </form>\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>\n" +
-    "      <div class=\"modal-footer\">\n" +
-    "                <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">Add issue</button>\n" +
-    "                <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
-    "      </div>\n"
-  );
-
-
-  $templateCache.put('templates/integrations/jira.html',
-    "      <div class=\"modal-header\">\n" +
-    "        <h3 class=\"m-t-0\">Add issue to Jira</h3>\n" +
-    "      </div>\n" +
-    "      <div class=\"modal-body\">\n" +
-    "        <div class=\"alert alert-danger\" ng-repeat=\"msg in ctrl.error_messages\">{{msg}}</div>\n" +
-    "        <div class=\"text-center\" ng-show=\"ctrl.loading\">\n" +
-    "            <span class=\"fa fa-cog fa-spin fa-5x loader m-a-4\"></span>\n" +
-    "        </div>\n" +
+    "            <div class=\"panel-body\">\n" +
     "\n" +
-    "        <form role=\"form\" ng-show=\"!ctrl.loading\">\n" +
-    "          <div class=\"form-group\">\n" +
-    "            <label for=\"issue_title\">Issue Title</label>\n" +
-    "            <input type=\"text\" class=\"form-control\" id=\"issue_title\" placeholder=\"Issue title\" ng-model=\"ctrl.form.title\">\n" +
-    "          </div>\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 class=\"form-group\">\n" +
-    "            <label for=\"issue_type\">Issue Type</label>\n" +
-    "            <select class=\"form-control\" id=\"issue_type\" ng-options=\"i.name for i in ctrl.issue_types\" ng-model=\"ctrl.form.issue_type\"></select>\n" +
-    "        </div>\n" +
-    "          <div class=\"form-group row\">\n" +
-    "              <div class=\"col-sm-6\">\n" +
-    "            <label for=\"issue_priority\">Priority</label>\n" +
-    "            <select class=\"form-control\" id=\"issue_priority\" ng-options=\"s.name for s in ctrl.priorities\" ng-model=\"ctrl.form.priority\"></select>\n" +
-    "              </div>\n" +
+    "            </div>\n" +
     "\n" +
-    "              <div class=\"col-sm-6\">\n" +
-    "            <label for=\"issue_responsible\">Assignee</label>\n" +
-    "            <select class=\"form-control\" id=\"issue_responsible\" ng-options=\"a.name for a in ctrl.assignees\" ng-model=\"ctrl.form.responsible\"></select>\n" +
-    "              </div>\n" +
-    "          </div>\n" +
-    "          <div class=\"form-group\">\n" +
-    "            <label for=\"issue_content\">Description</label>\n" +
-    "            <textarea id=\"issue_content\" class=\"form-control\" ng-model=\"ctrl.form.content\" style=\"min-height: 100px\"></textarea>\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 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" +
     "\n" +
-    "      </div>\n" +
-    "      <div class=\"modal-footer\">\n" +
-    "                <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">Add issue</button>\n" +
-    "                <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
-    "      </div>\n"
-  );
-
-
-  $templateCache.put('templates/loader.html',
-    "<div class=\"text-center\">\n" +
-    "    <span class=\"fa fa-cog fa-spin fa-5x m-a-4\"></span>\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('templates/quickstart.html',
-    "<h2>AppEnlight quickstart</h2>\n" +
+    "    </div>\n" +
     "\n" +
-    "<p>\n" +
-    "    <span class=\"point\">1</span>\n" +
-    "    For AppEnlight to operate, you need to\n" +
-    "    <a data-ui-sref=\"applications.update({resourceId:'new'})\" target=\"_blank\"><strong>create an app profile</strong></a> that allows\n" +
-    "    you to\n" +
-    "    obtain an <strong>API key</strong> that one of the clients can use.\n" +
-    "</p>\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            DELETE Permanent Partitions\n" +
+    "        </div>\n" +
     "\n" +
-    "<div class=\"clear\"></div>\n" +
-    "<hr/>\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" +
-    "<p>\n" +
-    "    <span class=\"point\">2</span>\n" +
-    "    It is a good idea to configure an\n" +
-    "    <a data-ui-sref=\"user.alert_channels.email\" target=\"_blank\">\n" +
-    "        <strong>email alert channel</strong></a> that you can use to receive\n" +
-    "    notifications about events that happen in your application.\n" +
-    "</p>\n" +
     "\n" +
-    "<p>\n" +
-    "    It can be the same email account you used to register withing AppEnlight -\n" +
-    "    although we often recommend using a separate <em>errors@...</em> account\n" +
-    "    designated for alert notifications.\n" +
-    "</p>\n" +
+    "            <div class=\"panel-body\">\n" +
     "\n" +
-    "<div class=\"clear\"></div>\n" +
-    "<hr/>\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" +
+    "                </div>\n" +
     "\n" +
-    "<p>\n" +
-    "    <span class=\"point\">3</span>\n" +
-    "    In order for your application to stream meaningful information, you will need to\n" +
-    "    integrate a compatible client for your language of choice.\n" +
-    "</p>\n" +
+    "            </div>\n" +
     "\n" +
-    "<p>Head over to the <a href=\"{{AeConfig.urls.docs}}\" target=\"_blank\">\n" +
-    "    <strong>developers section</strong></a> for information on currently available\n" +
-    "    clients that you can plug into your software</p>\n"
-  );
-
-
-  $templateCache.put('templates/register.html',
-    ""
+    "            <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" +
+    "                    </td>\n" +
+    "                </tr>\n" +
+    "            </table>\n" +
+    "        </form>\n" +
+    "\n" +
+    "    </div>\n" +
+    "\n" +
+    "</div>\n"
   );
 
 
-  $templateCache.put('templates/reports/list_slow.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"reports_list.is_loading\"></ng-include>\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=\"reports_list.is_loading === false\">\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" +
     "\n" +
-    "    <p class=\"search-params\">\n" +
-    "        <strong>Search params:</strong>\n" +
-    "        <span ng-repeat=\"tag in reports_list.searchParams.tags\" class=\"tag\">\n" +
-    "            <strong>{{tag.type}}</strong>\n" +
-    "            {{ tag.type == 'resource' ? reports_list.applications[tag.value].resource_name : tag.value }}\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" +
     "\n" +
-    "            <a ng-click=\"reports_list.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
-    "        </span>\n" +
-    "    </p>\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" +
     "\n" +
-    "    <p>\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" +
     "\n" +
-    "    <form class=\"form\">\n" +
-    "        <div class=\"typeahead-tags\">\n" +
-    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"reports_list.filterTypeAhead\" placeholder=\"Start typing to filter slowness reports - filter by tags, average response time, priority or other properties.\"\n" +
-    "                   ng-keydown=\"reports_list.typeAheadTag($event)\"\n" +
-    "                   uib-typeahead=\"tag as tag.text for tag in reports_list.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" +
+    "            </div>\n" +
     "        </div>\n" +
-    "    </form>\n" +
-    "\n" +
-    "\n" +
-    "    <div class=\"well position-absolute increse-zindex\" ng-show=\"reports_list.showDatePicker\" ng-model=\"reports_list.pickerDate\" ng-change=\"reports_list.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=\"reports_list.itemCount\" items-per-page=\"reports_list.itemsPerPage\" ng-model=\"reports_list.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"reports_list.paginationChange()\"\n" +
-    "                        ng-show=\"!reports_list.is_loading\"></uib-pagination>\n" +
     "    </div>\n" +
+    "    <div class=\"row\">\n" +
+    "        <div class=\"col-sm-12\">\n" +
     "\n" +
+    "            <div class=\"panel panel-default\">\n" +
+    "                <div class=\"panel-body\">\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <!-- Default panel contents -->\n" +
+    "                    <uib-tabset>\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Postgresql Tables\n" +
+    "                            </uib-tab-heading>\n" +
     "\n" +
-    "        <table class=\"table table-striped report-list\" ng-show=\"!reports_list.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=\"reports_list.notRelativeTime\"\n" +
-    "                                                ng-change=\"reports_list.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 reports_list.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=\"!reports_list.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=\"reports_list.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" +
+    "                            <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" +
-    "            </tbody>\n" +
-    "        </table>\n" +
+    "                        </uib-tab>\n" +
     "\n" +
-    "    </div>\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Elasticsearch Indices\n" +
+    "                            </uib-tab-heading>\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"reports_list.itemCount\" items-per-page=\"reports_list.itemsPerPage\" ng-model=\"reports_list.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"reports_list.paginationChange()\"\n" +
-    "                        ng-show=\"!reports_list.is_loading\"></uib-pagination>\n" +
-    "    </div>\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" +
+    "\n" +
+    "                        </uib-tab>\n" +
+    "\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Processes\n" +
+    "                            </uib-tab-heading>\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" +
+    "\n" +
+    "                        </uib-tab>\n" +
+    "\n" +
+    "                        <uib-tab>\n" +
+    "                            <uib-tab-heading>\n" +
+    "                                Python packages\n" +
+    "                            </uib-tab-heading>\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" +
+    "\n" +
+    "                        </uib-tab>\n" +
     "\n" +
+    "                    </uib-tabset>\n" +
+    "                </div>\n" +
+    "            </div>\n" +
+    "        </div>\n" +
+    "    </div>\n" +
     "</div>\n"
   );
 
 
-  $templateCache.put('templates/reports/list.html',
-    "<ng-include src=\"'templates/loader.html'\" ng-if=\"reports_list.is_loading\"></ng-include>\n" +
+  $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" +
     "\n" +
-    "<div ng-if=\"reports_list.is_loading === false\">\n" +
+    "<div ng-show=\"!user.loading.user\">\n" +
     "\n" +
-    "    <p class=\"search-params\">\n" +
-    "        <strong>Search params:</strong>\n" +
-    "        <span ng-repeat=\"tag in reports_list.searchParams.tags\" class=\"tag\">\n" +
-    "            <strong>{{tag.type}}</strong>\n" +
-    "            {{ tag.type == 'resource' ? reports_list.applications[tag.value].resource_name : tag.value }}\n" +
+    "    <div class=\"panel panel-default\">\n" +
+    "        <div class=\"panel-body\">\n" +
     "\n" +
-    "            <a ng-click=\"reports_list.removeSearchTag(tag)\"><span class=\"fa fa-times\"></span></a>\n" +
-    "        </span>\n" +
-    "    </p>\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 class=\"form\">\n" +
-    "        <div class=\"typeahead-tags\">\n" +
-    "            <input type=\"text\" id=\"typeAhead\" ng-model=\"reports_list.filterTypeAhead\" placeholder=\"Start typing to filter reports - filter by tags, exception, priority or other properties.\"\n" +
-    "                   ng-keydown=\"reports_list.typeAheadTag($event)\"\n" +
-    "                   uib-typeahead=\"tag as tag.text for tag in reports_list.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" +
+    "            <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" +
+    "                        <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" +
+    "                    </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" +
+    "                        <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" +
-    "    <div class=\"well position-absolute increse-zindex\" ng-show=\"reports_list.showDatePicker\" ng-model=\"reports_list.pickerDate\" ng-change=\"reports_list.pickerDateChanged()\"\n" +
-    "         class=\"animate-show\">\n" +
-    "        <uib-datepicker></uib-datepicker>\n" +
-    "    </div>\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" +
-    "    </p>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"reports_list.itemCount\" items-per-page=\"reports_list.itemsPerPage\" ng-model=\"reports_list.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"reports_list.paginationChange()\"\n" +
-    "                        ng-show=\"!reports_list.is_loading\"></uib-pagination>\n" +
-    "    </div>\n" +
+    "                <div class=\"form-group\" id=\"row-email\">\n" +
+    "                    <data-form-errors errors=\"user.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" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "    <div class=\"panel panel-default\">\n" +
-    "        <!-- Default panel contents -->\n" +
+    "                <div class=\"form-group\" id=\"row-first_name\">\n" +
+    "                    <data-form-errors errors=\"user.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" +
+    "                    </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" +
+    "                    <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" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "        <table class=\"table table-striped report-list\" ng-show=\"!reports_list.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=\"reports_list.notRelativeTime\"\n" +
-    "                                                ng-change=\"reports_list.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 reports_list.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=\"!reports_list.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=\"reports_list.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\" 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" +
+    "                    </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" +
+    "                    </div>\n" +
+    "                </div>\n" +
     "\n" +
-    "            </tbody>\n" +
-    "        </table>\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" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "            </form>\n" +
+    "        </div>\n" +
     "    </div>\n" +
     "\n" +
     "\n" +
-    "    <div class=\"text-center\">\n" +
-    "        <uib-pagination total-items=\"reports_list.itemCount\" items-per-page=\"reports_list.itemsPerPage\" ng-model=\"reports_list.page\" max-size=\"10\"\n" +
-    "                        class=\"pagination pagination-sm\" boundary-links=\"true\" direction-links=\"false\"\n" +
-    "                        ng-change=\"reports_list.paginationChange()\"\n" +
-    "                        ng-show=\"!reports_list.is_loading\"></uib-pagination>\n" +
-    "    </div>\n" +
-    "\n" +
-    "</div>\n"
-  );
-
-
-  $templateCache.put('templates/reports/parent_view.html',
-    "<div ui-view></div>"
-  );
-
-
-  $templateCache.put('templates/reports/small_report_group_list.html',
-    "<table class=\"errors-small-list\">\n" +
-    "    <tr ng-repeat=\"report_group in groups track by report_group.id\" class=\"animate-repeat\">\n" +
-    "        <td class=\"c1 occurences\"><span class=\"occurences\" data-uib-tooltip=\"occurences\">{{ report_group.occurences|numberToThousands }}</span></td>\n" +
-    "        <td class=\"ellipsis c2 report_group\">\n" +
-    "            <a  ui-sref=\"report.view_detail({groupId:report_group.id, reportId:report_group.last_report})\" title=\"{{report_group.error}}\" class=\"error-type\">\n" +
-    "                {{ report_group.error || \"Slow Report\"}}</a>\n" +
-    "            <br/>\n" +
-    "            <span ng-show=\"report_group.summed_duration\" class=\"duration\" data-uib-tooltip=\"Average duration\">{{report_group.summed_duration/report_group.occurences|round:2}}s</span>\n" +
-    "            <span class=\"url\">{{ report_group.view_name || report_group.url_path}}</span>\n" +
-    "        </td>\n" +
-    "        <td class=\"info\">\n" +
-    "            <strong ng-show=\"report_group.resource_id\">@{{applications[report_group.resource_id].resource_name}}</strong><br/>\n" +
-    "            <span class=\"date\">{{report_group.last_timestamp | isoToRelativeTime}}</span>\n" +
-    "        </td>\n" +
-    "    </tr>\n" +
-    "</table>\n"
-  );
-
-
-  $templateCache.put('templates/reports/small_report_list.html',
-    "<table class=\"errors-small-list\">\n" +
-    "    <tr ng-repeat=\"report in reports track by $index\" ng-show=\"reports.length > 0\" class=\"animate-repeat\">\n" +
-    "        <td class=\"c1 occurences\"><span class=\"occurences\" data-uib-tooltip=\"occurences\">{{ report.group.occurences|numberToThousands }}</span></td>\n" +
-    "        <td class=\"ellipsis c2 report\">\n" +
-    "            <a  ui-sref=\"report.view_detail({groupId:report.group_id, reportId:report.report_id})\"  title=\"{{report.error}}\" class=\"error-type\">\n" +
-    "                {{ report.error || \"Slow Report\"}}</a>\n" +
-    "            <br/>\n" +
-    "            <span ng-show=\"report.group.summed_duration\" class=\"duration\" data-uib-tooltip=\"Average duration\">{{report.group.summed_duration/report.group.occurences|round:2}}s</span>\n" +
-    "            <span class=\"url\">{{ report.view_name || report.url_path}}</span>\n" +
-    "        </td>\n" +
-    "        <td class=\"info\">\n" +
-    "            <strong ng-show=\"report.resource_id\">@{{applications[report.resource_id].resource_name}}</strong><br/>\n" +
-    "            <span class=\"date\">{{report.last_timestamp | isoToRelativeTime}}</span>\n" +
-    "        </td>\n" +
-    "    </tr>\n" +
-    "</table>\n"
-  );
-
-
-  $templateCache.put('templates/reports/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-if=\"call.children.length > 0\" class=\"subcalls p-l-8\">\n" +
-    "\n" +
-    "        <p><strong>\n" +
-    "            <small>Sub-calls</small>\n" +
-    "        </strong></p>\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 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>\n" +
-    "    </div>\n" +
+    "        <div class=\"panel-body\">\n" +
+    "            <h3>Direct application permissions</h3>\n" +
     "\n" +
-    "</script>\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" +
-    "<script type=\"text/ng-template\" id=\"AssignReportCtrl.html\">\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=\"modal-header\">\n" +
-    "        <h3>Assign users to report</h3>\n" +
-    "    </div>\n" +
-    "    <div class=\"modal-body\">\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" +
-    "        <ng-include src=\"'templates/loader.html'\" ng-if=\"ctrl.loading\"></ng-include>\n" +
+    "            <h3>Direct dashboard permissions</h3>\n" +
     "\n" +
-    "        <div class=\"row\" ng-if=\"!ctrl.loading\">\n" +
-    "            <div class=\"col-sm-6\">\n" +
-    "                <strong>Unassigned</strong>\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" +
     "\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" +
+    "                        <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" +
-    "                <strong>Assigned</strong>\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=\"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 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=\"report.is_loading.report\"></ng-include>\n" +
+    "    </div>\n" +
     "\n" +
-    "<div ng-if=\"!report.is_loading.report && report.report === null\">\n" +
-    "    <strong>OOPS something went wrong :(</strong>\n" +
-    "</div>\n" +
     "\n" +
-    "<div ng-if=\"report.report !== null && !report.is_loading.report\">\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-if=\"report.stateHolder.AeUser.id\" class=\"row\">\n" +
-    "      <div class=\"col-lg-12\">\n" +
-    "        <a onclick=\"window.history.back()\" class=\"btn btn-default\" ng-if=\"report.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=\"report.assignUsersModal()\" ng-if=\"report.reportType == 'report'\"><span\n" +
-    "                class=\"fa fa-flag\"></span> Assign report\n" +
-    "            to user</a>\n" +
+    "<div ng-show=\"!users.loading.users\">\n" +
     "\n" +
-    "        <a class=\"btn {{ report.report.group.fixed ? 'btn-success' : 'btn-default'}}\" ng-click=\"report.markFixed()\"\n" +
-    "           ng-if=\"report.reportType == 'report'\">\n" +
-    "            <span class=\"fa fa-check\"></span> Mark fixed</a>\n" +
+    "    <div class=\"panel panel-default\">\n" +
     "\n" +
-    "        <span class=\"dropdown\" ng-if=\"report.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 report.report.application.integrations\">\n" +
-    "                  <a ng-click=\"report.runIntegration(choice.name)\">{{choice.action}}</a>\n" +
-    "              </li>\n" +
-    "          </ul>\n" +
-    "        </span>\n" +
+    "        <div class=\"panel-heading\">\n" +
+    "            {{users.activeUsers}} active out of {{users.users.length}} users\n" +
+    "        </div>\n" +
     "\n" +
-    "        <a class=\"btn btn-default\" ng-click=\"report.markPublic()\">Make {{report.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=\"report.delete()\">Yes</a></li>\n" +
-    "  </ul>\n" +
-    "</span>\n" +
-    "      </div>\n" +
-    "    </div>\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" +
-    "    <div class=\"row\">\n" +
-    "        <div class=\"col-lg-4\">\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" +
     "\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" +
+    "    </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" +
-    "                    <table class=\"report-table with-ellipsis\">\n" +
-    "                        <tr>\n" +
-    "                            <td class=\"table-label\">Occurences</td>\n" +
-    "                            <td class=\"data\">{{report.report.group.occurences}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"report.report.http_status\">\n" +
-    "                            <td class=\"table-label\">HTTP status</td>\n" +
-    "                            <td class=\"data\">{{report.report.http_status}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"report.report.group.priority\">\n" +
-    "                            <td class=\"table-label\">Priority</td>\n" +
-    "                            <td class=\"data\">{{report.report.group.priority}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"report.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()\">{{report.$state.href(report.$state.current.name, report.$state.params, {absolute: true})}}</textarea>\n" +
-    "                                </form>\n" +
-    "                            </td>\n" +
-    "                        </tr>\n" +
-    "                        <tr data-uib-tooltip=\"{{report.report.url}}\">\n" +
-    "                            <td class=\"table-label\">URL</td>\n" +
-    "                            <td class=\"data ellipsis\"><a href=\"{{report.report.url}}\">{{report.report.url}}</a></td>\n" +
-    "                        </tr>\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" +
+    "        <h3 class=\"m-t-0\">Add issue to Bitbucket</h3>\n" +
+    "      </div>\n" +
+    "      <div class=\"modal-body\">\n" +
+    "        <div class=\"alert alert-danger\" ng-repeat=\"msg in ctrl.error_messages\">{{msg}}</div>\n" +
+    "        <div class=\"text-center\" ng-show=\"ctrl.loading\">\n" +
+    "            <span class=\"fa fa-cog fa-spin fa-5x loader m-a-4\"></span>\n" +
+    "        </div>\n" +
     "\n" +
-    "                        <tr ng-if=\"report.report.ip\">\n" +
-    "                            <td class=\"table-label\">Remote IP</td>\n" +
-    "                            <td class=\"data\">{{report.report.ip}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"report.report.user_agent\" data-uib-tooltip=\"{{report.report.user_agent}}\">\n" +
-    "                            <td class=\"table-label\">User Agent</td>\n" +
-    "                            <td class=\"data ellipsis\">{{report.report.user_agent}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"report.report.message\">\n" +
-    "                            <td class=\"table-label\">Message</td>\n" +
-    "                            <td class=\"data\">{{report.report.message}}</td>\n" +
-    "                        </tr>\n" +
-    "                        <tr ng-if=\"report.report.duration > 0\">\n" +
-    "                            <td class=\"table-label\">Duration</td>\n" +
-    "                            <td class=\"data\">\n" +
-    "                                <span>{{report.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=\"{{report.report.group.first_timestamp}}\"><iso-to-relative-time\n" +
-    "                        time=\"{{report.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=\"{{report.report.group.last_timestamp}}\"><iso-to-relative-time\n" +
-    "                        time=\"{{report.report.group.last_timestamp}}\"/></span>\n" +
-    "                            </td>\n" +
-    "                        </tr>\n" +
-    "                    </table>\n" +
+    "        <form role=\"form\" ng-show=\"!ctrl.loading\">\n" +
+    "          <div class=\"form-group\">\n" +
+    "            <label for=\"issue_title\">Issue Title</label>\n" +
+    "            <input type=\"text\" class=\"form-control\" id=\"issue_title\" placeholder=\"Issue title\" ng-model=\"ctrl.form.title\">\n" +
+    "          </div>\n" +
+    "          <div class=\"form-group row\">\n" +
+    "              <div class=\"col-sm-6\">\n" +
+    "            <label for=\"issue_priority\">Priority</label>\n" +
+    "            <select class=\"form-control\" id=\"issue_priority\" ng-options=\"s for s in ctrl.priorities\" ng-model=\"ctrl.form.priority\"></select>\n" +
+    "              </div>\n" +
     "\n" +
-    "                    <div ng-if=\"report.requestStats\">\n" +
-    "                        <h3>Performance stats</h3>\n" +
+    "              <div class=\"col-sm-6\">\n" +
+    "            <label for=\"issue_responsible\">Assignee</label>\n" +
+    "            <select class=\"form-control\" id=\"issue_responsible\" ng-options=\"a.user for a in ctrl.assignees\" ng-model=\"ctrl.form.responsible\"></select>\n" +
+    "              </div>\n" +
+    "          </div>\n" +
+    "          <div class=\"form-group\">\n" +
+    "            <label for=\"issue_content\">Description</label>\n" +
+    "            <textarea id=\"issue_content\" class=\"form-control\" ng-model=\"ctrl.form.content\" style=\"min-height: 100px\"></textarea>\n" +
+    "          </div>\n" +
+    "        </form>\n" +
     "\n" +
-    "                        <div class=\"perf_stats\">\n" +
-    "                                <span class=\"stat\" ng-repeat=\"stat in report.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" +
+    "      </div>\n" +
+    "      <div class=\"modal-footer\">\n" +
+    "                <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">Add issue</button>\n" +
+    "                <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
+    "      </div>\n"
+  );
+
+
+  $templateCache.put('templates/integrations/github.html',
+    "      <div class=\"modal-header\">\n" +
+    "        <h3 class=\"m-t-0\">Add issue to Github</h3>\n" +
+    "      </div>\n" +
+    "      <div class=\"modal-body\">\n" +
+    "        <div class=\"alert alert-danger\" ng-repeat=\"msg in ctrl.error_messages\">{{msg}}</div>\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 report.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>{{report.report.duration.toFixed(3)}}s</small>\n" +
-    "                                    </div>\n" +
-    "                                </div>\n" +
-    "                            </div>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
+    "        <div class=\"text-center\" ng-show=\"ctrl.loading\">\n" +
+    "            <span class=\"fa fa-cog fa-spin fa-5x loader m-a-4\"></span>\n" +
+    "        </div>\n" +
     "\n" +
-    "                    <h3>Tags</h3>\n" +
+    "        <form role=\"form\" ng-show=\"!ctrl.loading\">\n" +
+    "          <div class=\"form-group\">\n" +
+    "            <label for=\"issue_title\">Issue Title</label>\n" +
+    "            <input type=\"text\" class=\"form-control\" id=\"issue_title\" placeholder=\"Issue title\" ng-model=\"ctrl.form.title\">\n" +
+    "          </div>\n" +
+    "          <div class=\"form-group row\">\n" +
+    "              <div class=\"col-sm-6\">\n" +
+    "            <label for=\"issue_status\">Tag</label>\n" +
+    "            <select class=\"form-control\" id=\"issue_status\" ng-options=\"s for s in ctrl.statuses\" ng-model=\"ctrl.form.status\"></select>\n" +
+    "              </div>\n" +
     "\n" +
-    "                    <table class=\"report-table with-tags\">\n" +
-    "                        <tr ng-repeat=\"(tag, value) in report.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=\"report.searchTag(tag, value)\">{{ value }}</td>\n" +
-    "                        </tr>\n" +
-    "                    </table>\n" +
+    "              <div class=\"col-sm-6\">\n" +
+    "            <label for=\"issue_responsible\">Assignee</label>\n" +
+    "            <select class=\"form-control\" id=\"issue_responsible\" ng-options=\"a.user for a in ctrl.assignees\" ng-model=\"ctrl.form.responsible\"></select>\n" +
+    "              </div>\n" +
+    "          </div>\n" +
+    "          <div class=\"form-group\">\n" +
+    "            <label for=\"issue_description\">Description</label>\n" +
+    "            <textarea id=\"issue_description\" class=\"form-control\" ng-model=\"ctrl.form.content\" style=\"min-height: 100px\"></textarea>\n" +
+    "          </div>\n" +
+    "        </form>\n" +
     "\n" +
-    "                </div>\n" +
-    "            </div>\n" +
+    "      </div>\n" +
+    "      <div class=\"modal-footer\">\n" +
+    "                <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">Add issue</button>\n" +
+    "                <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
+    "      </div>\n"
+  );
+
+
+  $templateCache.put('templates/integrations/jira.html',
+    "      <div class=\"modal-header\">\n" +
+    "        <h3 class=\"m-t-0\">Add issue to Jira</h3>\n" +
+    "      </div>\n" +
+    "      <div class=\"modal-body\">\n" +
+    "        <div class=\"alert alert-danger\" ng-repeat=\"msg in ctrl.error_messages\">{{msg}}</div>\n" +
+    "        <div class=\"text-center\" ng-show=\"ctrl.loading\">\n" +
+    "            <span class=\"fa fa-cog fa-spin fa-5x loader m-a-4\"></span>\n" +
+    "        </div>\n" +
     "\n" +
+    "        <form role=\"form\" ng-show=\"!ctrl.loading\">\n" +
+    "          <div class=\"form-group\">\n" +
+    "            <label for=\"issue_title\">Issue Title</label>\n" +
+    "            <input type=\"text\" class=\"form-control\" id=\"issue_title\" placeholder=\"Issue title\" ng-model=\"ctrl.form.title\">\n" +
+    "          </div>\n" +
     "\n" +
+    "        <div class=\"form-group\">\n" +
+    "            <label for=\"issue_type\">Issue Type</label>\n" +
+    "            <select class=\"form-control\" id=\"issue_type\" ng-options=\"i.name for i in ctrl.issue_types\" ng-model=\"ctrl.form.issue_type\"></select>\n" +
     "        </div>\n" +
-    "        <div class=\"col-lg-8\">\n" +
-    "            <div class=\"frames\">\n" +
-    "                <p class=\"text-center\">Report history</p>\n" +
+    "          <div class=\"form-group row\">\n" +
+    "              <div class=\"col-sm-6\">\n" +
+    "            <label for=\"issue_priority\">Priority</label>\n" +
+    "            <select class=\"form-control\" id=\"issue_priority\" ng-options=\"s.name for s in ctrl.priorities\" ng-model=\"ctrl.form.priority\"></select>\n" +
+    "              </div>\n" +
     "\n" +
-    "                <div class=\"panel\" ng-if=\"!report.is_loading.history\">\n" +
-    "                    <div class=\"panel-body\">\n" +
-    "                        <c3chart data-domid=\"report_history_chart\" data-data=\"report.reportHistoryData\" data-config=\"report.reportHistoryConfig\">\n" +
-    "                        </c3chart>\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
+    "              <div class=\"col-sm-6\">\n" +
+    "            <label for=\"issue_responsible\">Assignee</label>\n" +
+    "            <select class=\"form-control\" id=\"issue_responsible\" ng-options=\"a.name for a in ctrl.assignees\" ng-model=\"ctrl.form.responsible\"></select>\n" +
+    "              </div>\n" +
+    "          </div>\n" +
+    "          <div class=\"form-group\">\n" +
+    "            <label for=\"issue_content\">Description</label>\n" +
+    "            <textarea id=\"issue_content\" class=\"form-control\" ng-model=\"ctrl.form.content\" style=\"min-height: 100px\"></textarea>\n" +
+    "          </div>\n" +
+    "        </form>\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 {{report.report.group.previous_report ? '' : 'disabled'}}\"\n" +
-    "                           ng-click=\"report.previousDetail()\">\n" +
-    "                            <span class=\"fa fa-arrow-left\"></span>\n" +
-    "                            Prev. detail</a>\n" +
+    "      </div>\n" +
+    "      <div class=\"modal-footer\">\n" +
+    "                <button class=\"btn btn-primary\" ng-click=\"ctrl.ok()\">Add issue</button>\n" +
+    "                <button class=\"btn btn-warning\" ng-click=\"ctrl.cancel()\">Cancel</button>\n" +
+    "      </div>\n"
+  );
+
+
+  $templateCache.put('templates/loader.html',
+    "<div class=\"text-center\">\n" +
+    "    <span class=\"fa fa-cog fa-spin fa-5x m-a-4\"></span>\n" +
+    "</div>\n"
+  );
+
+
+  $templateCache.put('templates/quickstart.html',
+    "<h2>AppEnlight quickstart</h2>\n" +
     "\n" +
-    "                    </div>\n" +
-    "                    <div class=\"col-sm-8 text-center\">\n" +
-    "                        <small>\n" +
-    "       <span uib-tooltip=\"{{report.report.start_time|isoToRelativeTime}}\" class=\"m-r-1\">\n" +
-    "           {{report.report.start_time.replace('T', ' ')}} UTC</span>\n" +
-    "                            <span class=\"text-muted\">ID: {{report.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 {{report.report.group.next_report ? '' : 'disabled'}}\"\n" +
-    "                           ng-click=\"report.nextDetail()\">\n" +
-    "                            Next detail <span class=\"fa fa-arrow-right\"></span></a>\n" +
-    "                    </div>\n" +
-    "                </div>\n" +
+    "<p>\n" +
+    "    <span class=\"point\">1</span>\n" +
+    "    For AppEnlight to operate, you need to\n" +
+    "    <a data-ui-sref=\"applications.update({resourceId:'new'})\" target=\"_blank\"><strong>create an app profile</strong></a> that allows\n" +
+    "    you to\n" +
+    "    obtain an <strong>API key</strong> that one of the clients can use.\n" +
+    "</p>\n" +
     "\n" +
-    "                <h3 class=\"word-wrap\">{{report.report.error}}</h3>\n" +
+    "<div class=\"clear\"></div>\n" +
+    "<hr/>\n" +
     "\n" +
-    "                <div ng-if=\"report.report.traceback\">\n" +
+    "<p>\n" +
+    "    <span class=\"point\">2</span>\n" +
+    "    It is a good idea to configure an\n" +
+    "    <a data-ui-sref=\"user.alert_channels.email\" target=\"_blank\">\n" +
+    "        <strong>email alert channel</strong></a> that you can use to receive\n" +
+    "    notifications about events that happen in your application.\n" +
+    "</p>\n" +
     "\n" +
-    "                    <h3><strong>Traceback</strong></h3>\n" +
+    "<p>\n" +
+    "    It can be the same email account you used to register withing AppEnlight -\n" +
+    "    although we often recommend using a separate <em>errors@...</em> account\n" +
+    "    designated for alert notifications.\n" +
+    "</p>\n" +
     "\n" +
-    "                    <div class=\"btn-group\">\n" +
-    "                        <a ng-if=\"report.traceback.length-10 > 0 \" ng-click=\"report.showLong = !report.showLong\"\n" +
-    "                           class=\"btn btn-default {{report.showLong ? 'active' : ''}}\">\n" +
-    "                            <span class=\"fa fa-align-left\"></span>\n" +
-    "                            <small>Show {{report.traceback.length-10}} remaining frames</small>\n" +
-    "                        </a>\n" +
+    "<div class=\"clear\"></div>\n" +
+    "<hr/>\n" +
     "\n" +
-    "                        <a class=\"btn btn-default {{report.showRaw ? 'active' : ''}}\" ng-click=\"report.showRaw = !report.showRaw\">\n" +
-    "                            <span class=\"fa fa-list\"></span>\n" +
-    "                            <small>Raw version</small>\n" +
-    "                        </a>\n" +
-    "                    </div>\n" +
-    "\n" +
-    "                    <div ng-if=\"report.showRaw\" class=\"m-t-1\">\n" +
-    "                        <pre>{{report.rawTraceback}}</pre>\n" +
-    "                    </div>\n" +
-    "                    <div ng-if=\"!report.showRaw\" class=\"m-t-1\">\n" +
-    "\n" +
-    "                        <div ng-repeat=\"frame in report.traceback\" class=\"frame {{$odd ? 'odd' : 'even'}}\"\n" +
-    "                             ng-if=\"$index >= report.traceback.length-10 || report.traceback.length <= 10 || report.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" +
-    "                                <span class=\"no-vars\" ng-if=\"frame.vars.length == 0\"></span>\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" +
-    "\n" +
-    "                <span ng-if=\"frame.fn\"><span class=\"mono\">in</span> <strong\n" +
-    "                        class=\"fn mono\">{{frame.fn || 'Unknown function'}}</strong></span>\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" +
-    "\n" +
-    "                            </div>\n" +
-    "                        </div>\n" +
-    "                    </div>\n" +
-    "\n" +
-    "\n" +
-    "                </div>\n" +
-    "\n" +
-    "\n" +
-    "                <uib-tabset>\n" +
-    "                    <uib-tab select=\"report.selectedTab('slow_calls')\" active=\"report.tabs.slow_calls\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Slow Calls\n" +
-    "                        </uib-tab-heading>\n" +
-    "\n" +
-    "                        <h3><strong>Slow Calls</strong></h3>\n" +
-    "\n" +
-    "                        <div ng-if=\"report.report.slow_calls.length > 0\">\n" +
-    "                            <div ng-repeat=\"call in report.report.slow_calls\" ng-include=\"'slow_call.html'\"></div>\n" +
-    "                        </div>\n" +
-    "\n" +
-    "                        <div ng-if=\"report.report.slow_calls.length == 0\">\n" +
-    "                            No slow calls reported\n" +
-    "                        </div>\n" +
-    "\n" +
-    "                    </uib-tab>\n" +
-    "\n" +
-    "\n" +
-    "                    <uib-tab select=\"report.selectedTab('request_details')\" active=\"report.tabs.request_details\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Request details\n" +
-    "                        </uib-tab-heading>\n" +
-    "\n" +
-    "                        <h3><strong>Extra</strong></h3>\n" +
-    "                        <div class=\"var-listing\" human-format vars=\"report.report.extra\"></div>\n" +
-    "                        <h3><strong>Request details</strong></h3>\n" +
-    "                        <div class=\"var-listing\" human-format vars=\"report.report.request\"></div>\n" +
-    "\n" +
-    "                    </uib-tab>\n" +
-    "\n" +
-    "                    <uib-tab select=\"report.selectedTab('logs')\" active=\"report.tabs.logs\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Logs\n" +
-    "                        </uib-tab-heading>\n" +
-    "\n" +
-    "                        <div ng-if=\"report.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=\"report.reportLogs.length == 0\"> No logs found</p>\n" +
-    "\n" +
-    "                        <table class=\"table table-striped log-list\" ng-if=\"report.reportLogs.length > 0\">\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 report.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" +
-    "                            </tbody>\n" +
-    "                        </table>\n" +
-    "\n" +
-    "                    </uib-tab>\n" +
-    "\n" +
-    "\n" +
-    "                    <uib-tab select=\"report.selectedTab('comments')\" active=\"report.tabs.comments\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Comments\n" +
-    "                            <span class=\"label label-info\">{{report.report.comments.length}}</span>\n" +
-    "\n" +
-    "                        </uib-tab-heading>\n" +
-    "\n" +
-    "                        <h3><strong>Comments</strong></h3>\n" +
-    "\n" +
-    "                        <p ng-if=\"report.report.comments.length == 0\">No comments yet - be first to add one!</p>\n" +
-    "\n" +
-    "                        <div class=\"comment\" ng-repeat=\"comment in report.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" +
-    "                        <form name=\"commentForm\" ng-submit=\"report.addComment()\">\n" +
-    "                            <div class=\"form-group\">\n" +
-    "                <textarea type=\"text\" class=\"form-control\" id=\"report.commentForm\" ng-model=\"report.comment\" required\n" +
-    "                          mentio mentio-search=\"report.searchMentionedPeople(term)\" mentio-items=\"report.mentionedPeople| filter:label:typedTerm\" class=\"form-control\"></textarea>\n" +
-    "\n" +
-    "                            </div>\n" +
-    "                            <div class=\"form-group\">\n" +
-    "                                <button class=\"btn btn-info\" ng-disabled=\"report.commentForm.$invalid\">Comment</button>\n" +
-    "                            </div>\n" +
-    "                        </form>\n" +
-    "\n" +
-    "                        <div ng-repeat=\"comment in report.report.comments\" class=\"{{$odd ? 'odd' : 'even'}}\" class=\"repeat-animate\">\n" +
-    "                        </div>\n" +
-    "\n" +
-    "                    </uib-tab>\n" +
-    "\n" +
-    "                    <uib-tab select=\"report.selectedTab('affected_users')\" active=\"report.tabs.affected_users\">\n" +
-    "                        <uib-tab-heading>\n" +
-    "                            Affected users\n" +
-    "                            <span class=\"label label-warning\">{{report.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 report.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" +
+    "<p>\n" +
+    "    <span class=\"point\">3</span>\n" +
+    "    In order for your application to stream meaningful information, you will need to\n" +
+    "    integrate a compatible client for your language of choice.\n" +
+    "</p>\n" +
     "\n" +
-    "        </div>\n" +
-    "    </div>\n" +
-    "</div>\n"
+    "<p>Head over to the <a href=\"{{AeConfig.urls.docs}}\" target=\"_blank\">\n" +
+    "    <strong>developers section</strong></a> for information on currently available\n" +
+    "    clients that you can plug into your software</p>\n"
+  );
+
+
+  $templateCache.put('templates/register.html',
+    ""
+  );
+
+
+  $templateCache.put('templates/reports/small_report_group_list.html',
+    "<table class=\"errors-small-list\">\n" +
+    "    <tr ng-repeat=\"report_group in groups track by report_group.id\" class=\"animate-repeat\">\n" +
+    "        <td class=\"c1 occurences\"><span class=\"occurences\" data-uib-tooltip=\"occurences\">{{ report_group.occurences|numberToThousands }}</span></td>\n" +
+    "        <td class=\"ellipsis c2 report_group\">\n" +
+    "            <a  ui-sref=\"report.view_detail({groupId:report_group.id, reportId:report_group.last_report})\" title=\"{{report_group.error}}\" class=\"error-type\">\n" +
+    "                {{ report_group.error || \"Slow Report\"}}</a>\n" +
+    "            <br/>\n" +
+    "            <span ng-show=\"report_group.summed_duration\" class=\"duration\" data-uib-tooltip=\"Average duration\">{{report_group.summed_duration/report_group.occurences|round:2}}s</span>\n" +
+    "            <span class=\"url\">{{ report_group.view_name || report_group.url_path}}</span>\n" +
+    "        </td>\n" +
+    "        <td class=\"info\">\n" +
+    "            <strong ng-show=\"report_group.resource_id\">@{{applications[report_group.resource_id].resource_name}}</strong><br/>\n" +
+    "            <span class=\"date\">{{report_group.last_timestamp | isoToRelativeTime}}</span>\n" +
+    "        </td>\n" +
+    "    </tr>\n" +
+    "</table>\n"
+  );
+
+
+  $templateCache.put('templates/reports/small_report_list.html',
+    "<table class=\"errors-small-list\">\n" +
+    "    <tr ng-repeat=\"report in reports track by $index\" ng-show=\"reports.length > 0\" class=\"animate-repeat\">\n" +
+    "        <td class=\"c1 occurences\"><span class=\"occurences\" data-uib-tooltip=\"occurences\">{{ report.group.occurences|numberToThousands }}</span></td>\n" +
+    "        <td class=\"ellipsis c2 report\">\n" +
+    "            <a  ui-sref=\"report.view_detail({groupId:report.group_id, reportId:report.report_id})\"  title=\"{{report.error}}\" class=\"error-type\">\n" +
+    "                {{ report.error || \"Slow Report\"}}</a>\n" +
+    "            <br/>\n" +
+    "            <span ng-show=\"report.group.summed_duration\" class=\"duration\" data-uib-tooltip=\"Average duration\">{{report.group.summed_duration/report.group.occurences|round:2}}s</span>\n" +
+    "            <span class=\"url\">{{ report.view_name || report.url_path}}</span>\n" +
+    "        </td>\n" +
+    "        <td class=\"info\">\n" +
+    "            <strong ng-show=\"report.resource_id\">@{{applications[report.resource_id].resource_name}}</strong><br/>\n" +
+    "            <span class=\"date\">{{report.last_timestamp | isoToRelativeTime}}</span>\n" +
+    "        </td>\n" +
+    "    </tr>\n" +
+    "</table>\n"
   );
 
 
@@ -8784,275 +8782,345 @@ function LogsBrowserController($location, stateHolder, typeAheadTagHelper, logsN
 // # 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/
-
-angular.module('appenlight.components.userAlertChannelsListView', [])
-    .component('userAlertChannelsListView', {
-        templateUrl: 'components/views/user-alert-channels-list-view/user-alert-channels-list-view.html',
-        controller: userAlertChannelsListViewController
-    });
-
-userAlertChannelsListViewController.$inject = ['$state','userSelfPropertyResource', 'applicationsNoIdResource'];
-
-function userAlertChannelsListViewController($state, userSelfPropertyResource, applicationsNoIdResource) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {channels: true, applications: true, actions:true};
-
-    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;
-        });
-
-    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'
+        },
+        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
     };
 
-    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.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 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'
+                var result = _.filter(users, function(u){
+                   return u.label.toLowerCase().indexOf(term) !== -1;
+                });
+                vm.mentionedPeople = result;
+            });
     };
 
-    vm.ruleDefinitions = {
-        fieldOps: fieldOps,
-        allOps: allOps,
-        possibleFields: possibleFields
+    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.addAction = function (channel) {
-        
-        userSelfPropertyResource.save({key: 'alert_channels_rules'}, {}, function (data) {
-            vm.alertActions.push(data);
-        }, function (response) {
-            if (response.status == 422) {
-                
-            }
-        });
+    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.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];
+    vm.fetchLogs = function () {
+        if (!vm.report.request_id){
+            return
         }
-        userSelfPropertyResource.update(params, toUpdate, function (data) {
-            _.extend(channel, data);
+        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.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.addComment = function () {
+        reportGroupPropertyResource.save({
+                groupId: vm.report.group_id,
+                key: 'comments'
+            }, {body: vm.comment},
+            function (data) {
+                vm.report.comments.push(data);
             });
-        });
-
-    }
+        vm.comment = '';
+    };
 
-}
+    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";
+            });
 
-;// # 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 (stateHolder.AeUser.id){
+                vm.fetchHistory();
+            }
 
-angular.module('appenlight.components.userAuthTokensView', [])
-    .component('userAuthTokensView', {
-        templateUrl: 'components/views/user-auth-tokens-view/user-auth-tokens-view.html',
-        controller: userAuthTokensViewController
-    });
+            vm.selectedTab($cookies.selectedReportTab);
 
-userAuthTokensViewController.$inject = ['$state', 'userSelfPropertyResource', 'AeConfig'];
+        }, 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;
+        });
+    };
 
-function userAuthTokensViewController($state, userSelfPropertyResource, AeConfig) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {tokens: true};
+    vm.selectedTab = function(tab_name){
+        $cookies.selectedReportTab = tab_name;
+        if (tab_name == 'logs' && vm.reportLogs === null) {
+            vm.fetchLogs();
+        }
+    };
 
-    vm.expireOptions = AeConfig.timeOptions;
+    vm.markFixed = function () {
+        reportGroupResource.update({
+                groupId: vm.report.group_id
+            }, {fixed: !vm.report.group.fixed},
+            function (data) {
+                vm.report.group.fixed = data.fixed;
+            });
+    };
 
-    vm.tokens = userSelfPropertyResource.query({key: 'auth_tokens'},
-        function (data) {
-            vm.loading.tokens = false;
-        });
+    vm.markPublic = function () {
+        reportGroupResource.update({
+                groupId: vm.report.group_id
+            }, {public: !vm.report.group.public},
+            function (data) {
+                vm.report.group.public = data.public;
+            });
+    };
 
-    vm.addToken = function () {
-        vm.loading.tokens = true;
-        userSelfPropertyResource.save({key: 'auth_tokens'},
-            vm.form,
+    vm.delete = function () {
+        reportGroupResource.delete({'groupId': vm.report.group_id},
             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);
+            $state.go('report.list');
+        })
+    };
+
+    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.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);
+    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.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;
                 }
-            })
-    }
+            }
+        };
+        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
@@ -9074,188 +9142,605 @@ 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);
+    }
+
+    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.paginationChange = function(){
+        $location.search('page', vm.page);
+        vm.refresh();
+    };
+
+    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(':');
+            }
+        }
+        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();
+        }
+
+        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;
+    };
+
+    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;
+        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.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
+// #
+// # 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/
+
+'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);
     }
-}
-
-;// # 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.userPasswordView', [])
-    .component('userPasswordView', {
-        templateUrl: 'components/views/user-password-view/user-password-view.html',
-        controller: UserPasswordViewController
-    });
-
-UserPasswordViewController.$inject = ['$state', 'userSelfPropertyResource'];
 
-function UserPasswordViewController($state, userSelfPropertyResource) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {password: false};
-    vm.form = {};
+    vm.changeRelativeTime = function () {
+        $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
+    };
 
-    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);
-                
-            }
-            vm.loading.password = false;
+    _.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'
+        });
+    });
 
-;// # 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.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(':');
+            }
+        }
 
-angular.module('appenlight.components.userProfileView', [])
-    .component('userProfileView', {
-        templateUrl: 'components/views/user-profile-view/user-profile-view.html',
-        controller: UserProfileViewController
-    });
+        // 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();
+        }
 
-UserProfileViewController.$inject = ['$state', 'userSelfResource'];
+        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;
+    };
 
-function UserProfileViewController($state, userSelfResource) {
-    
-    var vm = this;
-    vm.$state = $state;
-    vm.loading = {profile: true};
+    vm.paginationChange = function(){
+        $location.search('page', vm.page);
+        vm.refresh();
+    };
 
-    vm.user = userSelfResource.get(null, function (data) {
-        vm.loading.profile = false;
-        
-    });
+    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.updateProfile = function () {
-        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.$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 = 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;
         });
-    }
-}
+    };
 
-;// # 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.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);
+    };
 
-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;
-});
+    //initial load
+    vm.refresh();
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -9276,22 +9761,18 @@ aeconfig.factory('AeConfig', function () {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminApplicationsListController', AdminApplicationsListController);
-
-AdminApplicationsListController.$inject = ['applicationsResource'];
+angular.module('appenlight.components.settingsView', [])
+    .component('settingsView', {
+        templateUrl: 'components/views/settings-view/settings-view.html',
+        controller: SettingsViewController
+    });
 
-function AdminApplicationsListController(applicationsResource) {
-    
-    var vm = this;
-    vm.loading = {applications: true};
+SettingsViewController.$inject = ['$state'];
 
-    vm.applications = applicationsResource.query({
-        root_list: true,
-        resource_type: 'application'
-    }, function (data) {
-        vm.loading = {applications: false};
-    });
-};
+function SettingsViewController($state) {
+    this.$state = $state;
+    console.info('SettingsViewController');
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -9312,44 +9793,37 @@ function AdminApplicationsListController(applicationsResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('ConfigsListController', ConfigsListController);
+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
+    });
 
-ConfigsListController.$inject = ['configsResource', 'configsNoIdResource'];
+AlertChannelsEmailController.$inject = ['$state','userSelfPropertyResource'];
 
-function ConfigsListController(configsResource, configsNoIdResource) {
+function AlertChannelsEmailController($state, userSelfPropertyResource) {
+    
     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;
-            });
-        });
+    vm.$state = $state;
+    vm.loading = {email: false};
+    vm.form = {};
 
-    vm.save = function () {
-        vm.loading.config = true;
-        _.each(vm.configList, function (item) {
-            item.$save();
+    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.loading.email = false;
         });
-        vm.loading.config = false;
-    };
-
-};
+    }
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -9370,128 +9844,122 @@ 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.userAlertChannelsListView', [])
+    .component('userAlertChannelsListView', {
+        templateUrl: 'components/views/user-alert-channels-list-view/user-alert-channels-list-view.html',
+        controller: userAlertChannelsListViewController
+    });
 
-AdminGroupsCreateController.$inject = ['$state', 'groupsResource', 'groupsPropertyResource', 'sectionViewResource', 'AeConfig'];
+userAlertChannelsListViewController.$inject = ['$state','userSelfPropertyResource', 'applicationsNoIdResource'];
 
-function AdminGroupsCreateController($state, groupsResource, groupsPropertyResource, sectionViewResource, AeConfig) {
+function userAlertChannelsListViewController($state, userSelfPropertyResource, applicationsNoIdResource) {
     
     var vm = this;
-    vm.loading = {
-        group: false,
-        resource_permissions: false,
-        users: false
-    };
+    vm.$state = $state;
+    vm.loading = {channels: true, applications: true, actions:true};
 
-    vm.form = {
-        autocompleteUser: '',
-    }
+    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;
+        });
 
-    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.applications = applicationsNoIdResource.query({permission: 'view'},
+        function (data) {
+            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);
+    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.resourcePermissions = tmpObj;
-            });
+    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.users = groupsPropertyResource.query(
-            {groupId: groupId, key: 'users'}, function (data) {
-                vm.loading.users = false;
-            }, function () {
-                vm.loading.users = false;
-            });
+    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'
+    };
 
-    }
-    else {
-        var groupId = null;
-    }
+    vm.ruleDefinitions = {
+        fieldOps: fieldOps,
+        allOps: allOps,
+        possibleFields: possibleFields
+    };
 
-    var formResponse = function (response) {
-        if (response.status === 422) {
-            setServerValidation(vm.groupForm, response.data);
-        }
-        vm.loading.group = false;
+    vm.addAction = function (channel) {
+        
+        userSelfPropertyResource.save({key: 'alert_channels_rules'}, {}, function (data) {
+            vm.alertActions.push(data);
+        }, function (response) {
+            if (response.status == 422) {
+                
+            }
+        });
     };
 
-    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.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.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.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.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
 // #
@@ -9512,40 +9980,57 @@ 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.userAuthTokensView', [])
+    .component('userAuthTokensView', {
+        templateUrl: 'components/views/user-auth-tokens-view/user-auth-tokens-view.html',
+        controller: userAuthTokensViewController
+    });
 
-AdminGroupsController.$inject = ['groupsResource'];
+userAuthTokensViewController.$inject = ['$state', 'userSelfPropertyResource', 'AeConfig'];
 
-function AdminGroupsController(groupsResource) {
+function userAuthTokensViewController($state, userSelfPropertyResource, AeConfig) {
     
     var vm = this;
-    vm.loading = {groups: true};
+    vm.$state = $state;
+    vm.loading = {tokens: 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.expireOptions = AeConfig.timeOptions;
 
+    vm.tokens = userSelfPropertyResource.query({key: 'auth_tokens'},
+        function (data) {
+            vm.loading.tokens = false;
+        });
 
-    vm.removeGroup = function (group) {
-        groupsResource.remove({groupId: group.id}, function (data, responseHeaders) {
-            
-            if (data) {
-                var index = vm.groups.indexOf(group);
+    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.groups.splice(index, 1);
-                    vm.activeGroups -= 1;
+                    vm.tokens.splice(index, 1);
                 }
-            }
-        });
+            })
     }
-};
+}
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -9566,110 +10051,97 @@ 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.userIdentitiesView', [])
+    .component('userIdentitiesView', {
+        templateUrl: 'components/views/user-identities-view/user-identities-view.html',
+        controller: UserIdentitiesController
+    });
 
-AdminPartitionsController.$inject = ['sectionViewResource'];
+UserIdentitiesController.$inject = ['$state', 'userSelfPropertyResource', 'AeConfig'];
 
-function AdminPartitionsController(sectionViewResource) {
+function UserIdentitiesController($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';
-        }
+    vm.$state = $state;
+    vm.AeConfig = AeConfig;
+    vm.loading = {identities: true};
 
-        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.identities = userSelfPropertyResource.query(
+        {key: 'external_identities'},
+        function (data) {
+            vm.loading.identities = false;
+            
         });
-    }
-
 
-    vm.transformPartitionList = function (inputList) {
-        var outputList = [];
+    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
+                    });
+                }
 
-        _.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)
-                }
-            });
-        });
-        
+;// # 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.loading = {partitions: true};
-        sectionViewResource.save({section:'admin_section',
-            view: 'partitions_remove'}, {
-            es_indices: es_indices,
-            pg_indices: pg_indices,
-            confirm: 'CONFIRM'
-        }, vm.loadPartitions);
+angular.module('appenlight.components.userPasswordView', [])
+    .component('userPasswordView', {
+        templateUrl: 'components/views/user-password-view/user-password-view.html',
+        controller: UserPasswordViewController
+    });
 
-    }
+UserPasswordViewController.$inject = ['$state', 'userSelfPropertyResource'];
+
+function UserPasswordViewController($state, userSelfPropertyResource) {
+    
+    var vm = this;
+    vm.$state = $state;
+    vm.loading = {password: false};
+    vm.form = {};
 
+    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);
+                
+            }
+            vm.loading.password = false;
+        });
+    }
 }
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
@@ -9691,31 +10163,40 @@ 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.userProfileView', [])
+    .component('userProfileView', {
+        templateUrl: 'components/views/user-profile-view/user-profile-view.html',
+        controller: UserProfileViewController
+    });
 
-AdminSystemController.$inject = ['sectionViewResource'];
+UserProfileViewController.$inject = ['$state', 'userSelfResource'];
 
-function AdminSystemController(sectionViewResource) {
+function UserProfileViewController($state, userSelfResource) {
+    
     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.loading = {profile: true};
 
-        vm.loading.system = false;
+    vm.user = userSelfResource.get(null, function (data) {
+        vm.loading.profile = false;
+        
     });
-};
+
+    vm.updateProfile = function () {
+        vm.loading.profile = true;
+
+        
+        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
 // #
@@ -9736,106 +10217,57 @@ function AdminSystemController(sectionViewResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AdminUsersCreateController', AdminUsersCreateController);
-
-AdminUsersCreateController.$inject = ['$state', 'usersResource', 'usersPropertyResource', 'sectionViewResource', 'AeConfig'];
-
-function AdminUsersCreateController($state, usersResource, usersPropertyResource, sectionViewResource, AeConfig) {
-    
-    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 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;
+});
 
-    var formResponse = function (response) {
-        if (response.status == 422) {
-            setServerValidation(vm.profileForm, response.data);
-        }
-        vm.loading.user = 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/
 
-    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);
-        }
-    }
+angular.module('appenlight.controllers').controller('AdminApplicationsListController', AdminApplicationsListController);
 
-    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;
-        
-    }
+AdminApplicationsListController.$inject = ['applicationsResource'];
 
-    vm.reloginUser = function () {
-        sectionViewResource.get({
-            section: 'admin_section', view: 'relogin_user',
-            user_id: vm.user.id
-        }, function () {
-            window.location = AeConfig.urls.baseUrl;
-        });
+function AdminApplicationsListController(applicationsResource) {
+    
+    var vm = this;
+    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
@@ -9857,39 +10289,43 @@ 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.controllers').controller('ConfigsListController', ConfigsListController);
 
-AdminUsersController.$inject = ['usersResource'];
+ConfigsListController.$inject = ['configsResource', 'configsNoIdResource'];
 
-function AdminUsersController(usersResource) {
-    
+function ConfigsListController(configsResource, configsNoIdResource) {
     var vm = this;
-    vm.loading = {users: true};
+    vm.loading = {config: 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);
-        
-    });
+    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.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.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
@@ -9911,80 +10347,128 @@ function AdminUsersController(usersResource) {
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers')
-    .controller('BitbucketIntegrationCtrl', BitbucketIntegrationCtrl)
+angular.module('appenlight.controllers').controller('AdminGroupsCreateController', AdminGroupsCreateController);
 
-BitbucketIntegrationCtrl.$inject = ['$uibModalInstance', '$state', 'report', 'integrationName', 'integrationResource'];
+AdminGroupsCreateController.$inject = ['$state', 'groupsResource', 'groupsPropertyResource', 'sectionViewResource', 'AeConfig'];
 
-function BitbucketIntegrationCtrl($uibModalInstance, $state, report, integrationName, integrationResource) {
+function AdminGroupsCreateController($state, groupsResource, groupsPropertyResource, sectionViewResource, AeConfig) {
+    
     var vm = this;
-    vm.loading = true;
-    vm.assignees = [];
-    vm.report = report;
-    vm.integrationName = integrationName;
-    vm.statuses = [];
-    vm.priorities = [];
-    vm.error_messages = [];
+    vm.loading = {
+        group: false,
+        resource_permissions: false,
+        users: false
+    };
+
     vm.form = {
-        content: '\n' +
-        'Issue created for report: ' +
-        $state.href('report.view_detail', {groupId:report.group_id, reportId:report.id}, {absolute:true})
+        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.fetchInfo = function () {
-        integrationResource.get({
-                resourceId: vm.report.resource_id,
-                action: 'info',
-                integration: vm.integrationName
-            }, null,
+    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 = false;
-                if (data.error_messages) {
-                    vm.error_messages = data.error_messages;
-                }
-                vm.assignees = data.assignees;
-                vm.priorities = data.priorities;
-                vm.form.responsible = vm.assignees[0];
-                vm.form.priority = vm.priorities[0];
-            }, function (error_data) {
-                if (error_data.data.error_messages) {
-                    vm.error_messages = error_data.data.error_messages;
-                }
-                else {
-                    vm.error_messages = ['There was a problem processing your request'];
-                }
+                vm.loading.users = false;
+                vm.users = _.filter(vm.users, function (item) {
+                    return item != user;
+                });
+            }, function () {
+                vm.loading.users = false;
             });
     };
-    vm.ok = function () {
-        vm.loading = true;
-        vm.form.group_id = vm.report.group_id;
-        integrationResource.save({
-                resourceId: vm.report.resource_id,
-                action: 'create-issue',
-                integration: vm.integrationName
-            }, vm.form,
+
+    vm.addUser = function () {
+        groupsPropertyResource.save(
+            {groupId: groupId, key: 'users'},
+            {user_name: vm.form.autocompleteUser},
             function (data) {
-                vm.loading = false;
-                if (data.error_messages) {
-                    vm.error_messages = data.error_messages;
-                }
-                if (data !== false) {
-                    $uibModalInstance.dismiss('success');
-                }
-            }, function (error_data) {
-                if (error_data.data.error_messages) {
-                    vm.error_messages = error_data.data.error_messages;
-                }
-                else {
-                    vm.error_messages = ['There was a problem processing your request'];
-                }
+                vm.loading.users = false;
+                vm.users.push(data);
+                vm.form.autocompleteUser = '';
+            }, function () {
+                vm.loading.users = false;
             });
-    };
-    vm.cancel = function () {
-        $uibModalInstance.dismiss('cancel');
-    };
-    vm.fetchInfo();
-}
+    }
+
+    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
 // #
@@ -10005,82 +10489,40 @@ function BitbucketIntegrationCtrl($uibModalInstance, $state, report, integration
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers')
-    .controller('GithubIntegrationCtrl', GithubIntegrationCtrl);
+angular.module('appenlight.controllers').controller('AdminGroupsController', AdminGroupsController);
 
-GithubIntegrationCtrl.$inject = ['$uibModalInstance', '$state', 'report', 'integrationName', 'integrationResource'];
+AdminGroupsController.$inject = ['groupsResource'];
 
-function GithubIntegrationCtrl($uibModalInstance, $state, report, integrationName, integrationResource) {
+function AdminGroupsController(groupsResource) {
+    
     var vm = this;
-    vm.loading = true;
-    vm.assignees = [];
-    vm.report = report;
-    vm.integrationName = integrationName;
-    vm.statuses = [];
-    vm.assignees = [];
-    vm.error_messages = [];
-    vm.form = {
-        content: '\n' +
-        'Issue created for report: ' +
-        $state.href('report.view_detail', {groupId:report.group_id, reportId:report.id}, {absolute:true})
-    };
+    vm.loading = {groups: true};
 
-    vm.fetchInfo = function () {
-        integrationResource.get({
-                resourceId: vm.report.resource_id,
-                action: 'info',
-                integration: vm.integrationName
-            }, null,
-            function (data) {
-                vm.loading = false;
-                if (data.error_messages) {
-                    vm.error_messages = data.error_messages;
-                }
-                else {
-                    vm.assignees = data.assignees;
-                    vm.statuses = data.statuses;
-                    vm.form.responsible = vm.assignees[0];
-                    vm.form.status = vm.statuses[0];
-                }
-            }, function (error_data) {
-                if (error_data.data.error_messages) {
-                    vm.error_messages = error_data.data.error_messages;
-                }
-                else {
-                    vm.error_messages = ['There was a problem processing your request'];
-                }
-            });
-    };
-    vm.ok = function () {
-        vm.loading = true;
-        vm.form.group_id = vm.report.group_id;
-        integrationResource.save({
-                resourceId: vm.report.resource_id,
-                action: 'create-issue',
-                integration: vm.integrationName
-            }, vm.form,
-            function (data) {
-                vm.loading = false;
-                if (data.error_messages) {
-                    vm.error_messages = data.error_messages;
-                }
-                else {
-                    $uibModalInstance.dismiss('success');
-                }
-            }, function (error_data) {
-                if (error_data.data.error_messages) {
-                    vm.error_messages = error_data.data.error_messages;
-                }
-                else {
-                    vm.error_messages = ['There was a problem processing your request'];
+    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.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.cancel = function () {
-        $uibModalInstance.dismiss('cancel');
-    };
-    vm.fetchInfo();
-}
+            }
+        });
+    }
+};
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10101,83 +10543,110 @@ function GithubIntegrationCtrl($uibModalInstance, $state, report, integrationNam
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers')
-    .controller('JiraIntegrationCtrl', JiraIntegrationCtrl)
+angular.module('appenlight.controllers').controller('AdminPartitionsController', AdminPartitionsController);
 
-JiraIntegrationCtrl.$inject = ['$uibModalInstance', '$state', 'report', 'integrationName', 'integrationResource'];
+AdminPartitionsController.$inject = ['sectionViewResource'];
 
-function JiraIntegrationCtrl($uibModalInstance, $state, report, integrationName, integrationResource) {
+function AdminPartitionsController(sectionViewResource) {
     var vm = this;
-    vm.loading = true;
-    vm.assignees = [];
-    vm.report = report;
-    vm.integrationName = integrationName;
-    vm.statuses = [];
-    vm.priorities = [];
-    vm.issue_types = [];
-    vm.error_messages = [];
-    vm.form = {
-        content: '\n' +
-        'Issue created for report: ' +
-        $state.href('report.view_detail', {groupId:report.group_id, reportId:report.id}, {absolute:true})
+    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.fetchInfo = function () {
-        integrationResource.get({
-                resourceId: vm.report.resource_id,
-                action: 'info',
-                integration: vm.integrationName
-            }, null,
-            function (data) {
-                vm.loading = false;
-                if (data.error_messages) {
-                    vm.error_messages = data.error_messages;
-                }
-                vm.assignees = data.assignees;
-                vm.priorities = data.priorities;
-                vm.issue_types = data.issue_types;
-                vm.form.issue_type = vm.issue_types[0];
-                vm.form.responsible = vm.assignees[0];
-                vm.form.priority = vm.priorities[0];
-            }, function (error_data) {
-                
-                if (error_data.data.error_messages) {
-                    vm.error_messages = error_data.data.error_messages;
-                }
-                else {
-                    vm.error_messages = ['There was a problem processing your request'];
-                }
+    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.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;
     };
-    vm.ok = function () {
-        vm.loading = true;
-        vm.form.group_id = vm.report.group_id;
-        integrationResource.save({
-                resourceId: vm.report.resource_id,
-                action: 'create-issue',
-                integration: vm.integrationName
-            }, vm.form,
-            function (data) {
-                vm.loading = false;
-                if (data.error_messages) {
-                    vm.error_messages = data.error_messages;
-                }
-                if (data !== false) {
-                    $uibModalInstance.dismiss('success');
-                }
-            }, function (error_data) {
-                if (error_data.data.error_messages) {
-                    vm.error_messages = error_data.data.error_messages;
+
+    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)
                 }
-                else {
-                    vm.error_messages = ['There was a problem processing your request'];
+            });
+            _.each(item[1].elasticsearch, function (index) {
+                if (index.checked) {
+                    es_indices.push(index.name)
                 }
             });
-    };
-    vm.cancel = function () {
-        $uibModalInstance.dismiss('cancel');
-    };
-    vm.fetchInfo();
+        });
+        
+
+        vm.loading = {partitions: true};
+        sectionViewResource.save({section:'admin_section',
+            view: 'partitions_remove'}, {
+            es_indices: es_indices,
+            pg_indices: pg_indices,
+            confirm: 'CONFIRM'
+        }, vm.loadPartitions);
+
+    }
+
 }
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
@@ -10199,72 +10668,31 @@ function JiraIntegrationCtrl($uibModalInstance, $state, report, integrationName,
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('AssignReportCtrl', AssignReportCtrl);
-AssignReportCtrl.$inject = ['$uibModalInstance', 'reportGroupPropertyResource', 'report'];
-
-function AssignReportCtrl($uibModalInstance, reportGroupPropertyResource, report) {
-    var vm = this;
-    vm.loading = true;
-    vm.assignedUsers = [];
-    vm.unAssignedUsers = [];
-    vm.report = report;
-    vm.fetchAssignments = function () {
-        reportGroupPropertyResource.get({
-                groupId: vm.report.group_id,
-                key: 'assigned_users'
-            }, null,
-            function (data) {
-                vm.assignedUsers = data.assigned;
-                vm.unAssignedUsers = data.unassigned;
-                vm.loading = false;
-            });
-    }
-
-    vm.reassignUser = function (user) {
-        var is_assigned = vm.assignedUsers.indexOf(user);
-        if (is_assigned != -1) {
-            vm.assignedUsers.splice(is_assigned, 1);
-            vm.unAssignedUsers.push(user);
-            return
-        }
-        var is_unassigned = vm.unAssignedUsers.indexOf(user);
-        if (is_unassigned != -1) {
-            vm.unAssignedUsers.splice(is_unassigned, 1);
-            vm.assignedUsers.push(user);
-            return
-        }
-    }
-    vm.updateAssignments = function () {
-        var post = {'unassigned': [], 'assigned': []};
-        _.each(vm.assignedUsers, function (u) {
-            post['assigned'].push(u.user_name)
-        });
-        _.each(vm.unAssignedUsers, function (u) {
-            post['unassigned'].push(u.user_name)
-        });
-        vm.loading = true;
-        reportGroupPropertyResource.update({
-                groupId: vm.report.group_id,
-                key: 'assigned_users'
-            }, post,
-            function (data) {
-                vm.loading = false;
-                $uibModalInstance.close(vm.report);
-            });
-    };
-
-
-    vm.ok = function () {
-        vm.updateAssignments();
-    };
+angular.module('appenlight.controllers').controller('AdminSystemController', AdminSystemController);
 
-    vm.cancel = function () {
-        $uibModalInstance.dismiss('cancel');
-    };
+AdminSystemController.$inject = ['sectionViewResource'];
 
-    vm.fetchAssignments();
+function AdminSystemController(sectionViewResource) {
+    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.loading.system = false;
+    });
+};
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
@@ -10285,281 +10713,107 @@ function AssignReportCtrl($uibModalInstance, reportGroupPropertyResource, report
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-'use strict';
-
-/* Controllers */
-
-angular.module('appenlight.controllers')
-    .controller('ReportsListSlowController', ReportsListSlowController);
+angular.module('appenlight.controllers').controller('AdminUsersCreateController', AdminUsersCreateController);
 
-ReportsListSlowController.$inject = ['$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'slowReportsResource']
+AdminUsersCreateController.$inject = ['$state', 'usersResource', 'usersPropertyResource', 'sectionViewResource', 'AeConfig'];
 
-function ReportsListSlowController($location, $cookies, stateHolder, typeAheadTagHelper, slowReportsResource) {
+function AdminUsersCreateController($state, usersResource, usersPropertyResource, sectionViewResource, AeConfig) {
+    
     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);
-    }
-
-
-    vm.changeRelativeTime = function () {
-        $cookies.notRelativeTime = JSON.stringify(vm.notRelativeTime);
-    };
+    vm.loading = {user: false};
 
-    _.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(':');
+    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;
             }
-        }
-
-        // 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();
-    };
+        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.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.resourcePermissions = tmpObj;
+            });
 
-    var reportPresentation = function (report) {
-        report.presentation = {};
-        if (report.group.public) {
-            report.presentation.className = 'public';
-            report.presentation.tooltip = 'Public';
+    }
+    else {
+        var userId = null;
+        vm.user = {
+            status: true
         }
-        else if (report.group.fixed) {
-            report.presentation.className = 'fixed';
-            report.presentation.tooltip = 'Fixed';
+    }
+
+    var formResponse = function (response) {
+        if (response.status == 422) {
+            setServerValidation(vm.profileForm, response.data);
         }
-        else if (report.group.read) {
-            report.presentation.className = 'reviewed';
-            report.presentation.tooltip = 'Reviewed';
+        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 {
-            report.presentation.className = 'new';
-            report.presentation.tooltip = 'New';
+            usersResource.save(vm.user, function (data) {
+                $state.go('admin.user.update', {userId: data.id});
+            }, formResponse);
         }
-        return report;
-    };
+    }
 
-    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.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.filterId = function (log) {
-        vm.searchParams.tags.push({
-            type: "request_id",
-            value: log.request_id
+    vm.reloginUser = function () {
+        sectionViewResource.get({
+            section: 'admin_section', view: 'relogin_user',
+            user_id: vm.user.id
+        }, function () {
+            window.location = AeConfig.urls.baseUrl;
         });
-        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
 // #
@@ -10580,303 +10834,229 @@ function ReportsListSlowController($location, $cookies, stateHolder, typeAheadTa
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers')
-    .controller('ReportsListController', ReportsListController);
+angular.module('appenlight.controllers').controller('AdminUsersController', AdminUsersController);
 
-ReportsListController.$inject = ['$location', '$cookies',
-    'stateHolder', 'typeAheadTagHelper', 'reportsResource'];
+AdminUsersController.$inject = ['usersResource'];
 
-function ReportsListController($location, $cookies, stateHolder,
-                               typeAheadTagHelper, reportsResource) {
+function AdminUsersController(usersResource) {
+    
     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.loading = {users: true};
 
-    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);
-    }
+    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.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.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.paginationChange = function(){
-        $location.search('page', vm.page);
-        vm.refresh();
-    };
+    }
+};
 
-    vm.typeAheadTag = function (event) {
-        var text = vm.filterTypeAhead;
-        if (_.isObject(vm.filterTypeAhead)) {
-            text = vm.filterTypeAhead.text;
-        }
-        if (!vm.filterTypeAhead) {
-            return
-        }
+;// # 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 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(':');
-            }
-        }
-        else {
-            tag.type = 'error';
-            tag.value = parsed.join(':');
-        }
+angular.module('appenlight.controllers')
+    .controller('BitbucketIntegrationCtrl', BitbucketIntegrationCtrl)
 
-        // 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();
-        }
+BitbucketIntegrationCtrl.$inject = ['$uibModalInstance', '$state', 'report', 'integrationName', 'integrationResource'];
 
-        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;
+function BitbucketIntegrationCtrl($uibModalInstance, $state, report, integrationName, integrationResource) {
+    var vm = this;
+    vm.loading = true;
+    vm.assignees = [];
+    vm.report = report;
+    vm.integrationName = integrationName;
+    vm.statuses = [];
+    vm.priorities = [];
+    vm.error_messages = [];
+    vm.form = {
+        content: '\n' +
+        'Issue created for report: ' +
+        $state.href('report.view_detail', {groupId:report.group_id, reportId:report.id}, {absolute:true})
     };
 
-    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.fetchInfo = function () {
+        integrationResource.get({
+                resourceId: vm.report.resource_id,
+                action: 'info',
+                integration: vm.integrationName
+            }, null,
+            function (data) {
+                vm.loading = false;
+                if (data.error_messages) {
+                    vm.error_messages = data.error_messages;
+                }
+                vm.assignees = data.assignees;
+                vm.priorities = data.priorities;
+                vm.form.responsible = vm.assignees[0];
+                vm.form.priority = vm.priorities[0];
+            }, function (error_data) {
+                if (error_data.data.error_messages) {
+                    vm.error_messages = error_data.data.error_messages;
+                }
+                else {
+                    vm.error_messages = ['There was a problem processing your request'];
+                }
+            });
+    };
+    vm.ok = function () {
+        vm.loading = true;
+        vm.form.group_id = vm.report.group_id;
+        integrationResource.save({
+                resourceId: vm.report.resource_id,
+                action: 'create-issue',
+                integration: vm.integrationName
+            }, vm.form,
+            function (data) {
+                vm.loading = false;
+                if (data.error_messages) {
+                    vm.error_messages = data.error_messages;
+                }
+                if (data !== false) {
+                    $uibModalInstance.dismiss('success');
+                }
+            }, function (error_data) {
+                if (error_data.data.error_messages) {
+                    vm.error_messages = error_data.data.error_messages;
+                }
+                else {
+                    vm.error_messages = ['There was a problem processing your request'];
+                }
+            });
     };
+    vm.cancel = function () {
+        $uibModalInstance.dismiss('cancel');
+    };
+    vm.fetchInfo();
+}
 
-    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;
+;// # 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('GithubIntegrationCtrl', GithubIntegrationCtrl);
+
+GithubIntegrationCtrl.$inject = ['$uibModalInstance', '$state', 'report', 'integrationName', 'integrationResource'];
+
+function GithubIntegrationCtrl($uibModalInstance, $state, report, integrationName, integrationResource) {
+    var vm = this;
+    vm.loading = true;
+    vm.assignees = [];
+    vm.report = report;
+    vm.integrationName = integrationName;
+    vm.statuses = [];
+    vm.assignees = [];
+    vm.error_messages = [];
+    vm.form = {
+        content: '\n' +
+        'Issue created for report: ' +
+        $state.href('report.view_detail', {groupId:report.group_id, reportId:report.id}, {absolute:true})
     };
 
-    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.fetchInfo = function () {
+        integrationResource.get({
+                resourceId: vm.report.resource_id,
+                action: 'info',
+                integration: vm.integrationName
+            }, null,
+            function (data) {
+                vm.loading = false;
+                if (data.error_messages) {
+                    vm.error_messages = data.error_messages;
+                }
+                else {
+                    vm.assignees = data.assignees;
+                    vm.statuses = data.statuses;
+                    vm.form.responsible = vm.assignees[0];
+                    vm.form.status = vm.statuses[0];
+                }
+            }, function (error_data) {
+                if (error_data.data.error_messages) {
+                    vm.error_messages = error_data.data.error_messages;
+                }
+                else {
+                    vm.error_messages = ['There was a problem processing your request'];
+                }
             });
-            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.ok = function () {
+        vm.loading = true;
+        vm.form.group_id = vm.report.group_id;
+        integrationResource.save({
+                resourceId: vm.report.resource_id,
+                action: 'create-issue',
+                integration: vm.integrationName
+            }, vm.form,
+            function (data) {
+                vm.loading = false;
+                if (data.error_messages) {
+                    vm.error_messages = data.error_messages;
+                }
+                else {
+                    $uibModalInstance.dismiss('success');
+                }
+            }, function (error_data) {
+                if (error_data.data.error_messages) {
+                    vm.error_messages = error_data.data.error_messages;
+                }
+                else {
+                    vm.error_messages = ['There was a problem processing your request'];
+                }
+            });
     };
-
-    vm.refresh = function(){
-        vm.searchParams = parseSearchToTags($location.search());
-        vm.page = Number(vm.searchParams.page) || 1;
-        var params = parseTagsToSearch(vm.searchParams);
-        
-        vm.fetchReports(params);
+    vm.cancel = function () {
+        $uibModalInstance.dismiss('cancel');
     };
-    // initial load
-    vm.refresh();
+    vm.fetchInfo();
 }
 
 ;// # Copyright (C) 2010-2016  RhodeCode GmbH
@@ -10898,339 +11078,168 @@ function ReportsListController($location, $cookies, stateHolder,
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('ReportsViewController', ReportsViewController);
-ReportsViewController.$inject = ['$window', '$location', '$state', '$uibModal',
-    '$cookies', 'reportGroupPropertyResource', 'reportGroupResource',
-    'logsNoIdResource', 'stateHolder'];
-
-function ReportsViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, stateHolder) {
-    var vm = this;
-    vm.window = $window;
-    vm.stateHolder = stateHolder;
-    vm.$state = $state;
-    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')
-                }
-            }
-        },
-        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
-    };
-
-    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.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.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.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.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);
+angular.module('appenlight.controllers')
+    .controller('JiraIntegrationCtrl', JiraIntegrationCtrl)
 
-        }, 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;
-        });
-    };
+JiraIntegrationCtrl.$inject = ['$uibModalInstance', '$state', 'report', 'integrationName', 'integrationResource'];
 
-    vm.selectedTab = function(tab_name){
-        $cookies.selectedReportTab = tab_name;
-        if (tab_name == 'logs' && vm.reportLogs === null) {
-            vm.fetchLogs();
-        }
+function JiraIntegrationCtrl($uibModalInstance, $state, report, integrationName, integrationResource) {
+    var vm = this;
+    vm.loading = true;
+    vm.assignees = [];
+    vm.report = report;
+    vm.integrationName = integrationName;
+    vm.statuses = [];
+    vm.priorities = [];
+    vm.issue_types = [];
+    vm.error_messages = [];
+    vm.form = {
+        content: '\n' +
+        'Issue created for report: ' +
+        $state.href('report.view_detail', {groupId:report.group_id, reportId:report.id}, {absolute:true})
     };
 
-    vm.markFixed = function () {
-        reportGroupResource.update({
-                groupId: vm.report.group_id
-            }, {fixed: !vm.report.group.fixed},
+    vm.fetchInfo = function () {
+        integrationResource.get({
+                resourceId: vm.report.resource_id,
+                action: 'info',
+                integration: vm.integrationName
+            }, null,
             function (data) {
-                vm.report.group.fixed = data.fixed;
+                vm.loading = false;
+                if (data.error_messages) {
+                    vm.error_messages = data.error_messages;
+                }
+                vm.assignees = data.assignees;
+                vm.priorities = data.priorities;
+                vm.issue_types = data.issue_types;
+                vm.form.issue_type = vm.issue_types[0];
+                vm.form.responsible = vm.assignees[0];
+                vm.form.priority = vm.priorities[0];
+            }, function (error_data) {
+                
+                if (error_data.data.error_messages) {
+                    vm.error_messages = error_data.data.error_messages;
+                }
+                else {
+                    vm.error_messages = ['There was a problem processing your request'];
+                }
             });
     };
-
-    vm.markPublic = function () {
-        reportGroupResource.update({
-                groupId: vm.report.group_id
-            }, {public: !vm.report.group.public},
+    vm.ok = function () {
+        vm.loading = true;
+        vm.form.group_id = vm.report.group_id;
+        integrationResource.save({
+                resourceId: vm.report.resource_id,
+                action: 'create-issue',
+                integration: vm.integrationName
+            }, vm.form,
             function (data) {
-                vm.report.group.public = data.public;
+                vm.loading = false;
+                if (data.error_messages) {
+                    vm.error_messages = data.error_messages;
+                }
+                if (data !== false) {
+                    $uibModalInstance.dismiss('success');
+                }
+            }, function (error_data) {
+                if (error_data.data.error_messages) {
+                    vm.error_messages = error_data.data.error_messages;
+                }
+                else {
+                    vm.error_messages = ['There was a problem processing your request'];
+                }
             });
     };
-
-    vm.delete = function () {
-        reportGroupResource.delete({'groupId': vm.report.group_id},
-            function (data) {
-            $state.go('report.list');
-        })
+    vm.cancel = function () {
+        $uibModalInstance.dismiss('cancel');
     };
+    vm.fetchInfo();
+}
 
-    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());
-        });
+;// # 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('AssignReportCtrl', AssignReportCtrl);
+AssignReportCtrl.$inject = ['$uibModalInstance', 'reportGroupPropertyResource', 'report'];
 
-    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;
-        });
-    };
+function AssignReportCtrl($uibModalInstance, reportGroupPropertyResource, report) {
+    var vm = this;
+    vm.loading = true;
+    vm.assignedUsers = [];
+    vm.unAssignedUsers = [];
+    vm.report = report;
+    vm.fetchAssignments = function () {
+        reportGroupPropertyResource.get({
+                groupId: vm.report.group_id,
+                key: 'assigned_users'
+            }, null,
+            function (data) {
+                vm.assignedUsers = data.assigned;
+                vm.unAssignedUsers = data.unassigned;
+                vm.loading = false;
+            });
+    }
 
-    vm.nextDetail = function () {
-        $state.go('report.view_detail', {
-            groupId: vm.report.group_id,
-            reportId: vm.report.group.next_report
+    vm.reassignUser = function (user) {
+        var is_assigned = vm.assignedUsers.indexOf(user);
+        if (is_assigned != -1) {
+            vm.assignedUsers.splice(is_assigned, 1);
+            vm.unAssignedUsers.push(user);
+            return
+        }
+        var is_unassigned = vm.unAssignedUsers.indexOf(user);
+        if (is_unassigned != -1) {
+            vm.unAssignedUsers.splice(is_unassigned, 1);
+            vm.assignedUsers.push(user);
+            return
+        }
+    }
+    vm.updateAssignments = function () {
+        var post = {'unassigned': [], 'assigned': []};
+        _.each(vm.assignedUsers, function (u) {
+            post['assigned'].push(u.user_name)
         });
-    };
-    vm.previousDetail = function () {
-        $state.go('report.view_detail', {
-            groupId: vm.report.group_id,
-            reportId: vm.report.group.previous_report
+        _.each(vm.unAssignedUsers, function (u) {
+            post['unassigned'].push(u.user_name)
         });
+        vm.loading = true;
+        reportGroupPropertyResource.update({
+                groupId: vm.report.group_id,
+                key: 'assigned_users'
+            }, post,
+            function (data) {
+                vm.loading = false;
+                $uibModalInstance.close(vm.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;
-                }
-            }
-        };
-        var modalInstance = $uibModal.open(vm.opts);
-        modalInstance.result.then(function (report) {
-
-        }, function () {
-            console.info('Modal dismissed at: ' + new Date());
-        });
 
+    vm.ok = function () {
+        vm.updateAssignments();
     };
 
-    // load report
-    vm.fetchReport();
+    vm.cancel = function () {
+        $uibModalInstance.dismiss('cancel');
+    };
 
+    vm.fetchAssignments();
 
 }
 
@@ -12402,30 +12411,26 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun
     $stateProvider.state('report', {
         abstract: true,
         url: '/ui/report',
-        templateUrl: 'templates/reports/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
 
     $stateProvider.state('report.list', {
-        url: '?start_date&min_duration&max_duration&{view_name:any}&{server_name:any}&resource',
-        templateUrl: 'templates/reports/list.html',
-        controller: 'ReportsListController as reports_list'
+        url: '/list?start_date&min_duration&max_duration&{view_name:any}&{server_name:any}&resource',
+        component: 'reportsBrowserView'
     });
 
     $stateProvider.state('report.list_slow', {
         url: '/list_slow?start_date&min_duration&max_duration&{view_name:any}&{server_name:any}&resource',
-        templateUrl: 'templates/reports/list_slow.html',
-        controller: 'ReportsListSlowController as reports_list'
+        component: 'reportsSlowBrowserView'
     });
 
     $stateProvider.state('report.view_detail', {
         url: '/:groupId/:reportId',
-        templateUrl: 'templates/reports/view.html',
-        controller: 'ReportsViewController as report'
+        component: 'reportView'
     });
     $stateProvider.state('report.view_group', {
         url: '/:groupId',
-        templateUrl: 'templates/reports/view.html',
-        controller: 'ReportsViewController as report'
+        component: 'reportView'
     });
     $stateProvider.state('events', {
         url: '/ui/events',
diff --git a/frontend/src/app.js b/frontend/src/app.js
index 12a0669..bb2839e 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -45,6 +45,9 @@ angular.module('appenlight.components', [
     'appenlight.components.appenlightHeader',
     'appenlight.components.indexDashboardView',
     'appenlight.components.logsBrowserView',
+    'appenlight.components.reportView',
+    'appenlight.components.reportsBrowserView',
+    'appenlight.components.reportsSlowBrowserView',
     'appenlight.components.eventBrowserView',
     'appenlight.components.userProfileView',
     'appenlight.components.userIdentitiesView',
diff --git a/frontend/src/templates/reports/view.html b/frontend/src/components/views/report-view/report-view.html
similarity index 76%
rename from frontend/src/templates/reports/view.html
rename to frontend/src/components/views/report-view/report-view.html
index b56e52a..4c649e0 100644
--- a/frontend/src/templates/reports/view.html
+++ b/frontend/src/components/views/report-view/report-view.html
@@ -86,44 +86,44 @@
     </div>
 </script>
 
-<ng-include src="'templates/loader.html'" ng-if="report.is_loading.report"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.is_loading.report"></ng-include>
 
-<div ng-if="!report.is_loading.report && report.report === null">
+<div ng-if="!$ctrl.is_loading.report && $ctrl.report === null">
     <strong>OOPS something went wrong :(</strong>
 </div>
 
-<div ng-if="report.report !== null && !report.is_loading.report">
+<div ng-if="$ctrl.report !== null && !$ctrl.is_loading.report">
 
-    <div ng-if="report.stateHolder.AeUser.id" class="row">
+    <div ng-if="$ctrl.stateHolder.AeUser.id" class="row">
       <div class="col-lg-12">
-        <a onclick="window.history.back()" class="btn btn-default" ng-if="report.window.history.length > 2"><span class="fa fa-arrow-circle-o-left"></span>
+        <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>
             Go back</a>
-        <a class="btn btn-default" ng-click="report.assignUsersModal()" ng-if="report.reportType == 'report'"><span
+        <a class="btn btn-default" ng-click="$ctrl.assignUsersModal()" ng-if="$ctrl.reportType == 'report'"><span
                 class="fa fa-flag"></span> Assign report
             to user</a>
 
-        <a class="btn {{ report.report.group.fixed ? 'btn-success' : 'btn-default'}}" ng-click="report.markFixed()"
-           ng-if="report.reportType == 'report'">
+        <a class="btn {{ $ctrl.report.group.fixed ? 'btn-success' : 'btn-default'}}" ng-click="$ctrl.markFixed()"
+           ng-if="$ctrl.reportType == 'report'">
             <span class="fa fa-check"></span> Mark fixed</a>
 
-        <span class="dropdown" ng-if="report.report.application.integrations.length" data-uib-dropdown on-toggle="toggled(open)">
+        <span class="dropdown" ng-if="$ctrl.report.application.integrations.length" data-uib-dropdown on-toggle="toggled(open)">
           <a class="dropdown-toggle btn btn-default" data-uib-dropdown-toggle>
               <span class="fa fa-send"></span> Integrations
           </a>
           <ul class="dropdown-menu">
-              <li ng-repeat="choice in report.report.application.integrations">
-                  <a ng-click="report.runIntegration(choice.name)">{{choice.action}}</a>
+              <li ng-repeat="choice in $ctrl.report.application.integrations">
+                  <a ng-click="$ctrl.runIntegration(choice.name)">{{choice.action}}</a>
               </li>
           </ul>
         </span>
 
-        <a class="btn btn-default" ng-click="report.markPublic()">Make {{report.group.public ? 'private' : 'public'}}</a>
+        <a class="btn btn-default" ng-click="$ctrl.markPublic()">Make {{$ctrl.group.public ? 'private' : 'public'}}</a>
 
 <span class="dropdown" data-uib-dropdown on-toggle="toggled(open)">
     <a class="btn btn-danger" data-uib-dropdown-toggle><span class="fa fa-trash-o"></span> Delete</a>
   <ul class="dropdown-menu">
       <li><a>No</a></li>
-      <li><a ng-click="report.delete()">Yes</a></li>
+      <li><a ng-click="$ctrl.delete()">Yes</a></li>
   </ul>
 </span>
       </div>
@@ -140,68 +140,68 @@
                     <table class="report-table with-ellipsis">
                         <tr>
                             <td class="table-label">Occurences</td>
-                            <td class="data">{{report.report.group.occurences}}</td>
+                            <td class="data">{{$ctrl.report.group.occurences}}</td>
                         </tr>
-                        <tr ng-if="report.report.http_status">
+                        <tr ng-if="$ctrl.report.http_status">
                             <td class="table-label">HTTP status</td>
-                            <td class="data">{{report.report.http_status}}</td>
+                            <td class="data">{{$ctrl.report.http_status}}</td>
                         </tr>
-                        <tr ng-if="report.report.group.priority">
+                        <tr ng-if="$ctrl.report.group.priority">
                             <td class="table-label">Priority</td>
-                            <td class="data">{{report.report.group.priority}}</td>
+                            <td class="data">{{$ctrl.report.group.priority}}</td>
                         </tr>
-                        <tr ng-if="report.report.group.public">
+                        <tr ng-if="$ctrl.report.group.public">
                             <td class="table-label">Public URL</td>
                             <td class="data">
                                 <form>
-                                    <textarea class="TextAreaField form-control" id="public-url" onclick="this.select()">{{report.$state.href(report.$state.current.name, report.$state.params, {absolute: true})}}</textarea>
+                                    <textarea class="TextAreaField form-control" id="public-url" onclick="this.select()">{{$ctrl.$state.href($ctrl.$state.current.name, $ctrl.$state.params, {absolute: true})}}</textarea>
                                 </form>
                             </td>
                         </tr>
-                        <tr data-uib-tooltip="{{report.report.url}}">
+                        <tr data-uib-tooltip="{{$ctrl.report.url}}">
                             <td class="table-label">URL</td>
-                            <td class="data ellipsis"><a href="{{report.report.url}}">{{report.report.url}}</a></td>
+                            <td class="data ellipsis"><a href="{{$ctrl.report.url}}">{{$ctrl.report.url}}</a></td>
                         </tr>
 
-                        <tr ng-if="report.report.ip">
+                        <tr ng-if="$ctrl.report.ip">
                             <td class="table-label">Remote IP</td>
-                            <td class="data">{{report.report.ip}}</td>
+                            <td class="data">{{$ctrl.report.ip}}</td>
                         </tr>
-                        <tr ng-if="report.report.user_agent" data-uib-tooltip="{{report.report.user_agent}}">
+                        <tr ng-if="$ctrl.report.user_agent" data-uib-tooltip="{{$ctrl.report.user_agent}}">
                             <td class="table-label">User Agent</td>
-                            <td class="data ellipsis">{{report.report.user_agent}}</td>
+                            <td class="data ellipsis">{{$ctrl.report.user_agent}}</td>
                         </tr>
-                        <tr ng-if="report.report.message">
+                        <tr ng-if="$ctrl.report.message">
                             <td class="table-label">Message</td>
-                            <td class="data">{{report.report.message}}</td>
+                            <td class="data">{{$ctrl.report.message}}</td>
                         </tr>
-                        <tr ng-if="report.report.duration > 0">
+                        <tr ng-if="$ctrl.report.duration > 0">
                             <td class="table-label">Duration</td>
                             <td class="data">
-                                <span>{{report.report.duration}}s</span>
+                                <span>{{$ctrl.report.duration}}s</span>
                             </td>
                         </tr>
                         <tr>
                             <td class="table-label">First occured</td>
                             <td class="data">
-                <span uib-tooltip="{{report.report.group.first_timestamp}}"><iso-to-relative-time
-                        time="{{report.report.group.first_timestamp}}"/></span>
+                <span uib-tooltip="{{$ctrl.report.group.first_timestamp}}"><iso-to-relative-time
+                        time="{{$ctrl.report.group.first_timestamp}}"/></span>
                             </td>
                         </tr>
                         <tr>
                             <td class="table-label">Last occured</td>
                             <td class="data">
-                <span uib-tooltip="{{report.report.group.last_timestamp}}"><iso-to-relative-time
-                        time="{{report.report.group.last_timestamp}}"/></span>
+                <span uib-tooltip="{{$ctrl.report.group.last_timestamp}}"><iso-to-relative-time
+                        time="{{$ctrl.report.group.last_timestamp}}"/></span>
                             </td>
                         </tr>
                     </table>
 
-                    <div ng-if="report.requestStats">
+                    <div ng-if="$ctrl.requestStats">
                         <h3>Performance stats</h3>
 
                         <div class="perf_stats">
-                                <span class="stat" ng-repeat="stat in report.requestStats"
+                                <span class="stat" ng-repeat="stat in $ctrl.requestStats"
                                       ng-if="stat.calls > 0 || stat.value > 0"><strong>
                                     <span class="{{stat.name}} bar" style="width:10px"></span> {{stat.calls}}
                                     <span ng-if="stat.name!='main'"><small>{{stat.name}} calls</small></span>
@@ -213,14 +213,14 @@
 
                             <div style="width: 100%; overflow:hidden">
                                 <div class="{{stat.name}} bar" style="width:{{stat.percent}}%; height: 25px"
-                                     ng-repeat="stat in report.requestStats"
+                                     ng-repeat="stat in $ctrl.requestStats"
                                      data-uib-tooltip="{{stat.value}}s - Cumulative time spent in this request on all {{ stat.name }} calls"></div>
                                 <div class="row">
                                     <div class="col-xs-6 text-left">
                                         <small>0s</small>
                                     </div>
                                     <div class="col-xs-6 text-right">
-                                        <small>{{report.report.duration.toFixed(3)}}s</small>
+                                        <small>{{$ctrl.report.duration.toFixed(3)}}s</small>
                                     </div>
                                 </div>
                             </div>
@@ -230,14 +230,14 @@
                     <h3>Tags</h3>
 
                     <table class="report-table with-tags">
-                        <tr ng-repeat="(tag, value) in report.report.tags">
+                        <tr ng-repeat="(tag, value) in $ctrl.report.tags">
                             <td class="table-label" ng-switch="tag"><!--
                         --><span ng-switch-when="user_name">Username/UID</span><!--
                         --><span ng-switch-when="view_name">View Name</span><!--
                         --><span ng-switch-when="server_name">Server Name</span><!--
                         --><span ng-switch-default>{{ tag }}</span>
                             </td>
-                            <td class="data"><a ng-click="report.searchTag(tag, value)">{{ value }}</td>
+                            <td class="data"><a ng-click="$ctrl.searchTag(tag, value)">{{ value }}</td>
                         </tr>
                     </table>
 
@@ -250,61 +250,61 @@
             <div class="frames">
                 <p class="text-center">Report history</p>
 
-                <div class="panel" ng-if="!report.is_loading.history">
+                <div class="panel" ng-if="!$ctrl.is_loading.history">
                     <div class="panel-body">
-                        <c3chart data-domid="report_history_chart" data-data="report.reportHistoryData" data-config="report.reportHistoryConfig">
+                        <c3chart data-domid="report_history_chart" data-data="$ctrl.reportHistoryData" data-config="$ctrl.reportHistoryConfig">
                         </c3chart>
                     </div>
                 </div>
 
                 <div class="row m-b-1">
                     <div class="col-sm-2 text-left">
-                        <a class="switch_detail btn btn-sm btn-default {{report.report.group.previous_report ? '' : 'disabled'}}"
-                           ng-click="report.previousDetail()">
+                        <a class="switch_detail btn btn-sm btn-default {{$ctrl.report.group.previous_report ? '' : 'disabled'}}"
+                           ng-click="$ctrl.previousDetail()">
                             <span class="fa fa-arrow-left"></span>
                             Prev. detail</a>
 
                     </div>
                     <div class="col-sm-8 text-center">
                         <small>
-       <span uib-tooltip="{{report.report.start_time|isoToRelativeTime}}" class="m-r-1">
-           {{report.report.start_time.replace('T', ' ')}} UTC</span>
-                            <span class="text-muted">ID: {{report.report.request_id}}</span>
+       <span uib-tooltip="{{$ctrl.report.start_time|isoToRelativeTime}}" class="m-r-1">
+           {{$ctrl.report.start_time.replace('T', ' ')}} UTC</span>
+                            <span class="text-muted">ID: {{$ctrl.report.request_id}}</span>
                         </small>
                     </div>
                     <div class="col-sm-2 text-right">
-                        <a class="switch_detail btn btn-sm btn-default {{report.report.group.next_report ? '' : 'disabled'}}"
-                           ng-click="report.nextDetail()">
+                        <a class="switch_detail btn btn-sm btn-default {{$ctrl.report.group.next_report ? '' : 'disabled'}}"
+                           ng-click="$ctrl.nextDetail()">
                             Next detail <span class="fa fa-arrow-right"></span></a>
                     </div>
                 </div>
 
-                <h3 class="word-wrap">{{report.report.error}}</h3>
+                <h3 class="word-wrap">{{$ctrl.report.error}}</h3>
 
-                <div ng-if="report.report.traceback">
+                <div ng-if="$ctrl.report.traceback">
 
                     <h3><strong>Traceback</strong></h3>
 
                     <div class="btn-group">
-                        <a ng-if="report.traceback.length-10 > 0 " ng-click="report.showLong = !report.showLong"
-                           class="btn btn-default {{report.showLong ? 'active' : ''}}">
+                        <a ng-if="$ctrl.traceback.length-10 > 0 " ng-click="$ctrl.showLong = !$ctrl.showLong"
+                           class="btn btn-default {{$ctrl.showLong ? 'active' : ''}}">
                             <span class="fa fa-align-left"></span>
-                            <small>Show {{report.traceback.length-10}} remaining frames</small>
+                            <small>Show {{$ctrl.traceback.length-10}} remaining frames</small>
                         </a>
 
-                        <a class="btn btn-default {{report.showRaw ? 'active' : ''}}" ng-click="report.showRaw = !report.showRaw">
+                        <a class="btn btn-default {{$ctrl.showRaw ? 'active' : ''}}" ng-click="$ctrl.showRaw = !$ctrl.showRaw">
                             <span class="fa fa-list"></span>
                             <small>Raw version</small>
                         </a>
                     </div>
 
-                    <div ng-if="report.showRaw" class="m-t-1">
-                        <pre>{{report.rawTraceback}}</pre>
+                    <div ng-if="$ctrl.showRaw" class="m-t-1">
+                        <pre>{{$ctrl.rawTraceback}}</pre>
                     </div>
-                    <div ng-if="!report.showRaw" class="m-t-1">
+                    <div ng-if="!$ctrl.showRaw" class="m-t-1">
 
-                        <div ng-repeat="frame in report.traceback" class="frame {{$odd ? 'odd' : 'even'}}"
-                             ng-if="$index >= report.traceback.length-10 || report.traceback.length <= 10 || report.showLong">
+                        <div ng-repeat="frame in $ctrl.traceback" class="frame {{$odd ? 'odd' : 'even'}}"
+                             ng-if="$index >= $ctrl.traceback.length-10 || $ctrl.traceback.length <= 10 || $ctrl.showLong">
                             <div class="frameline" ng-if="frame.line">
                                 <a class="inspect_vars" ng-click="frame.showVars = !frame.showVars" ng-if="frame.vars">
                             <span class="fa fa-search dim btn btn-default"
@@ -346,47 +346,47 @@
 
 
                 <uib-tabset>
-                    <uib-tab select="report.selectedTab('slow_calls')" active="report.tabs.slow_calls">
+                    <uib-tab select="$ctrl.selectedTab('slow_calls')" active="$ctrl.tabs.slow_calls">
                         <uib-tab-heading>
                             Slow Calls
                         </uib-tab-heading>
 
                         <h3><strong>Slow Calls</strong></h3>
 
-                        <div ng-if="report.report.slow_calls.length > 0">
-                            <div ng-repeat="call in report.report.slow_calls" ng-include="'slow_call.html'"></div>
+                        <div ng-if="$ctrl.report.slow_calls.length > 0">
+                            <div ng-repeat="call in $ctrl.report.slow_calls" ng-include="'slow_call.html'"></div>
                         </div>
 
-                        <div ng-if="report.report.slow_calls.length == 0">
+                        <div ng-if="$ctrl.report.slow_calls.length == 0">
                             No slow calls reported
                         </div>
 
                     </uib-tab>
 
 
-                    <uib-tab select="report.selectedTab('request_details')" active="report.tabs.request_details">
+                    <uib-tab select="$ctrl.selectedTab('request_details')" active="$ctrl.tabs.request_details">
                         <uib-tab-heading>
                             Request details
                         </uib-tab-heading>
 
                         <h3><strong>Extra</strong></h3>
-                        <div class="var-listing" human-format vars="report.report.extra"></div>
+                        <div class="var-listing" human-format vars="$ctrl.report.extra"></div>
                         <h3><strong>Request details</strong></h3>
-                        <div class="var-listing" human-format vars="report.report.request"></div>
+                        <div class="var-listing" human-format vars="$ctrl.report.request"></div>
 
                     </uib-tab>
 
-                    <uib-tab select="report.selectedTab('logs')" active="report.tabs.logs">
+                    <uib-tab select="$ctrl.selectedTab('logs')" active="$ctrl.tabs.logs">
                         <uib-tab-heading>
                             Logs
                         </uib-tab-heading>
 
-                        <div ng-if="report.is_loading.logs!=false" class="text-center">
+                        <div ng-if="$ctrl.is_loading.logs!=false" class="text-center">
                             <span class="fa fa-cog fa-spin fa-3x loader"></span>
                         </div>
-                        <p ng-if="report.reportLogs.length == 0"> No logs found</p>
+                        <p ng-if="$ctrl.reportLogs.length == 0"> No logs found</p>
 
-                        <table class="table table-striped log-list" ng-if="report.reportLogs.length > 0">
+                        <table class="table table-striped log-list" ng-if="$ctrl.reportLogs.length > 0">
 
                             <caption>Logs</caption>
                             <thead>
@@ -396,7 +396,7 @@
                             </tr>
                             </thead>
                             <tbody>
-                            <tr ng-repeat="log in report.reportLogs track by log.log_id">
+                            <tr ng-repeat="log in $ctrl.reportLogs track by log.log_id">
                                 <td>
                                     <a class="tag {{log.log_level|lowercase}}">
                                         <span class="name">level:</span> {{log.log_level}}</a>
@@ -421,18 +421,18 @@
                     </uib-tab>
 
 
-                    <uib-tab select="report.selectedTab('comments')" active="report.tabs.comments">
+                    <uib-tab select="$ctrl.selectedTab('comments')" active="$ctrl.tabs.comments">
                         <uib-tab-heading>
                             Comments
-                            <span class="label label-info">{{report.report.comments.length}}</span>
+                            <span class="label label-info">{{$ctrl.report.comments.length}}</span>
 
                         </uib-tab-heading>
 
                         <h3><strong>Comments</strong></h3>
 
-                        <p ng-if="report.report.comments.length == 0">No comments yet - be first to add one!</p>
+                        <p ng-if="$ctrl.report.comments.length == 0">No comments yet - be first to add one!</p>
 
-                        <div class="comment" ng-repeat="comment in report.report.comments">
+                        <div class="comment" ng-repeat="comment in $ctrl.report.comments">
                             <p name="comment-{{comment.comment_id}}"><span class="fa fa-comment"></span>
                                 <strong>{{comment.user_name}}</strong>
                                 <iso-to-relative-time time="{{comment.created_timestamp}}"/>
@@ -440,32 +440,32 @@
                             <p class="well">{{comment.body}}</p>
                         </div>
 
-                        <form name="commentForm" ng-submit="report.addComment()">
+                        <form name="commentForm" ng-submit="$ctrl.addComment()">
                             <div class="form-group">
-                <textarea type="text" class="form-control" id="report.commentForm" ng-model="report.comment" required
-                          mentio mentio-search="report.searchMentionedPeople(term)" mentio-items="report.mentionedPeople| filter:label:typedTerm" class="form-control"></textarea>
+                <textarea type="text" class="form-control" id="$ctrl.commentForm" ng-model="$ctrl.comment" required
+                          mentio mentio-search="$ctrl.searchMentionedPeople(term)" mentio-items="$ctrl.mentionedPeople| filter:label:typedTerm" class="form-control"></textarea>
 
                             </div>
                             <div class="form-group">
-                                <button class="btn btn-info" ng-disabled="report.commentForm.$invalid">Comment</button>
+                                <button class="btn btn-info" ng-disabled="$ctrl.commentForm.$invalid">Comment</button>
                             </div>
                         </form>
 
-                        <div ng-repeat="comment in report.report.comments" class="{{$odd ? 'odd' : 'even'}}" class="repeat-animate">
+                        <div ng-repeat="comment in $ctrl.report.comments" class="{{$odd ? 'odd' : 'even'}}" class="repeat-animate">
                         </div>
 
                     </uib-tab>
 
-                    <uib-tab select="report.selectedTab('affected_users')" active="report.tabs.affected_users">
+                    <uib-tab select="$ctrl.selectedTab('affected_users')" active="$ctrl.tabs.affected_users">
                         <uib-tab-heading>
                             Affected users
-                            <span class="label label-warning">{{report.report.affected_users_count}}</span>
+                            <span class="label label-warning">{{$ctrl.report.affected_users_count}}</span>
 
                         </uib-tab-heading>
 
                         <h3><strong>50 most affected users ID's by this issue:</strong></h3>
                         <ul class="affected-user-list">
-                            <li ng-repeat="user in report.report.top_affected_users">
+                            <li ng-repeat="user in $ctrl.report.top_affected_users">
                                 <strong>{{user.username}}</strong> <span class="badge" uib-tooltip="occurences">{{user.count}}</span>
                             </li>
                         </ul>
diff --git a/frontend/src/controllers/reports/view.js b/frontend/src/components/views/report-view/report-view.js
similarity index 89%
rename from frontend/src/controllers/reports/view.js
rename to frontend/src/components/views/report-view/report-view.js
index eeb1a2a..655d054 100644
--- a/frontend/src/controllers/reports/view.js
+++ b/frontend/src/components/views/report-view/report-view.js
@@ -17,12 +17,17 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers').controller('ReportsViewController', ReportsViewController);
-ReportsViewController.$inject = ['$window', '$location', '$state', '$uibModal',
+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'];
 
-function ReportsViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, stateHolder) {
+function ReportViewController($window, $location, $state, $uibModal, $cookies, reportGroupPropertyResource, reportGroupResource, logsNoIdResource, stateHolder) {
     var vm = this;
     vm.window = $window;
     vm.stateHolder = stateHolder;
diff --git a/frontend/src/templates/reports/list.html b/frontend/src/components/views/reports-browser-view/reports-browser-view.html
similarity index 63%
rename from frontend/src/templates/reports/list.html
rename to frontend/src/components/views/reports-browser-view/reports-browser-view.html
index e58cfaa..69d59cc 100644
--- a/frontend/src/templates/reports/list.html
+++ b/frontend/src/components/views/reports-browser-view/reports-browser-view.html
@@ -1,29 +1,29 @@
-<ng-include src="'templates/loader.html'" ng-if="reports_list.is_loading"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.is_loading"></ng-include>
 
-<div ng-if="reports_list.is_loading === false">
+<div ng-if="$ctrl.is_loading === false">
 
     <p class="search-params">
         <strong>Search params:</strong>
-        <span ng-repeat="tag in reports_list.searchParams.tags" class="tag">
+        <span ng-repeat="tag in $ctrl.searchParams.tags" class="tag">
             <strong>{{tag.type}}</strong>
-            {{ tag.type == 'resource' ? reports_list.applications[tag.value].resource_name : tag.value }}
+            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}
 
-            <a ng-click="reports_list.removeSearchTag(tag)"><span class="fa fa-times"></span></a>
+            <a ng-click="$ctrl.removeSearchTag(tag)"><span class="fa fa-times"></span></a>
         </span>
     </p>
 
     <form class="form">
         <div class="typeahead-tags">
-            <input type="text" id="typeAhead" ng-model="reports_list.filterTypeAhead" placeholder="Start typing to filter reports - filter by tags, exception, priority or other properties."
-                   ng-keydown="reports_list.typeAheadTag($event)"
-                   uib-typeahead="tag as tag.text for tag in reports_list.filterTypeAheadOptions | filter:$viewValue:aheadFilter"
+            <input type="text" id="typeAhead" ng-model="$ctrl.filterTypeAhead" placeholder="Start typing to filter reports - filter by tags, exception, priority or other properties."
+                   ng-keydown="$ctrl.typeAheadTag($event)"
+                   uib-typeahead="tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:aheadFilter"
                    typeahead-min-length="1" class="form-control"
                    typeahead-template-url="templates/directives/search_type_ahead.html">
         </div>
     </form>
 
 
-    <div class="well position-absolute increse-zindex" ng-show="reports_list.showDatePicker" ng-model="reports_list.pickerDate" ng-change="reports_list.pickerDateChanged()"
+    <div class="well position-absolute increse-zindex" ng-show="$ctrl.showDatePicker" ng-model="$ctrl.pickerDate" ng-change="$ctrl.pickerDateChanged()"
          class="animate-show">
         <uib-datepicker></uib-datepicker>
     </div>
@@ -32,29 +32,29 @@
 
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
+        <uib-pagination total-items="$ctrl.itemCount" items-per-page="$ctrl.itemsPerPage" ng-model="$ctrl.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
-                        ng-change="reports_list.paginationChange()"
-                        ng-show="!reports_list.is_loading"></uib-pagination>
+                        ng-change="$ctrl.paginationChange()"
+                        ng-show="!$ctrl.is_loading"></uib-pagination>
     </div>
 
     <div class="panel panel-default">
         <!-- Default panel contents -->
 
-        <table class="table table-striped report-list" ng-show="!reports_list.is_loading">
+        <table class="table table-striped report-list" ng-show="!$ctrl.is_loading">
             <caption>Reports</caption>
             <thead>
             <tr>
                 <th class="c1 ordering occurences">#</th>
                 <th class="c2 application">Application</th>
-                <th class="c4 when">When <input type="checkbox" ng-model="reports_list.notRelativeTime"
-                                                ng-change="reports_list.changeRelativeTime()"
+                <th class="c4 when">When <input type="checkbox" ng-model="$ctrl.notRelativeTime"
+                                                ng-change="$ctrl.changeRelativeTime()"
                                                 title="Tick to see UTC time instead relative"></th>
                 <th class="c5 error_type">Error</th>
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="report in reports_list.reportsPage track by report.id">
+            <tr ng-repeat="report in $ctrl.reportsPage track by report.id">
                 <td class="c1 occurences">
                     <span class="priority-{{report.group.priority}}" data-uib-tooltip="Report priority">{{report.group.priority}}</span>
               <span class="count {{report.presentation.className}}" data-uib-tooltip="{{report.presentation.tooltip}}">
@@ -65,10 +65,10 @@
                     <div class="app_name">{{report.resource_name}}</div>
                     <span class="server">@{{report.tags.server_name}}</span></td>
                 <td class="c3 when">
-                <span ng-show="!reports_list.notRelativeTime"><span data-uib-tooltip="{{report.group.last_timestamp}}"><iso-to-relative-time
+                <span ng-show="!$ctrl.notRelativeTime"><span data-uib-tooltip="{{report.group.last_timestamp}}"><iso-to-relative-time
                         time="{{report.group.last_timestamp}}"/></span>
                 </span>
-                    <span ng-show="reports_list.notRelativeTime">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>
+                    <span ng-show="$ctrl.notRelativeTime">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>
                 </td>
                 <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/>
                     <span class="url">{{ report.tags.view_name || report.url_path}}</td>
@@ -80,10 +80,10 @@
 
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
+        <uib-pagination total-items="$ctrl.itemCount" items-per-page="$ctrl.itemsPerPage" ng-model="$ctrl.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
-                        ng-change="reports_list.paginationChange()"
-                        ng-show="!reports_list.is_loading"></uib-pagination>
+                        ng-change="$ctrl.paginationChange()"
+                        ng-show="!$ctrl.is_loading"></uib-pagination>
     </div>
 
 </div>
diff --git a/frontend/src/controllers/reports/list.js b/frontend/src/components/views/reports-browser-view/reports-browser-view.js
similarity index 88%
rename from frontend/src/controllers/reports/list.js
rename to frontend/src/components/views/reports-browser-view/reports-browser-view.js
index 4b3761e..416615e 100644
--- a/frontend/src/controllers/reports/list.js
+++ b/frontend/src/components/views/reports-browser-view/reports-browser-view.js
@@ -17,13 +17,16 @@
 // # services, and proprietary license terms, please see
 // # https://rhodecode.com/licenses/
 
-angular.module('appenlight.controllers')
-    .controller('ReportsListController', ReportsListController);
+angular.module('appenlight.components.reportsBrowserView', [])
+    .component('reportsBrowserView', {
+        templateUrl: 'components/views/reports-browser-view/reports-browser-view.html',
+        controller: reportsBrowserViewController
+    });
 
-ReportsListController.$inject = ['$location', '$cookies',
+reportsBrowserViewController.$inject = ['$location', '$cookies',
     'stateHolder', 'typeAheadTagHelper', 'reportsResource'];
 
-function ReportsListController($location, $cookies, stateHolder,
+function reportsBrowserViewController($location, $cookies, stateHolder,
                                typeAheadTagHelper, reportsResource) {
     var vm = this;
     vm.applications = stateHolder.AeUser.applications_map;
diff --git a/frontend/src/templates/reports/list_slow.html b/frontend/src/components/views/reports-slow-browser-view/reports-slow-browser-view.html
similarity index 64%
rename from frontend/src/templates/reports/list_slow.html
rename to frontend/src/components/views/reports-slow-browser-view/reports-slow-browser-view.html
index 1acdc22..f25a62f 100644
--- a/frontend/src/templates/reports/list_slow.html
+++ b/frontend/src/components/views/reports-slow-browser-view/reports-slow-browser-view.html
@@ -1,14 +1,14 @@
-<ng-include src="'templates/loader.html'" ng-if="reports_list.is_loading"></ng-include>
+<ng-include src="'templates/loader.html'" ng-if="$ctrl.is_loading"></ng-include>
 
-<div ng-if="reports_list.is_loading === false">
+<div ng-if="$ctrl.is_loading === false">
 
     <p class="search-params">
         <strong>Search params:</strong>
-        <span ng-repeat="tag in reports_list.searchParams.tags" class="tag">
+        <span ng-repeat="tag in $ctrl.searchParams.tags" class="tag">
             <strong>{{tag.type}}</strong>
-            {{ tag.type == 'resource' ? reports_list.applications[tag.value].resource_name : tag.value }}
+            {{ tag.type == 'resource' ? $ctrl.applications[tag.value].resource_name : tag.value }}
 
-            <a ng-click="reports_list.removeSearchTag(tag)"><span class="fa fa-times"></span></a>
+            <a ng-click="$ctrl.removeSearchTag(tag)"><span class="fa fa-times"></span></a>
         </span>
     </p>
 
@@ -16,16 +16,16 @@
 
     <form class="form">
         <div class="typeahead-tags">
-            <input type="text" id="typeAhead" ng-model="reports_list.filterTypeAhead" placeholder="Start typing to filter slowness reports - filter by tags, average response time, priority or other properties."
-                   ng-keydown="reports_list.typeAheadTag($event)"
-                   uib-typeahead="tag as tag.text for tag in reports_list.filterTypeAheadOptions | filter:$viewValue:aheadFilter"
+            <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."
+                   ng-keydown="$ctrl.typeAheadTag($event)"
+                   uib-typeahead="tag as tag.text for tag in $ctrl.filterTypeAheadOptions | filter:$viewValue:aheadFilter"
                    typeahead-min-length="1" class="form-control"
                    typeahead-template-url="templates/directives/search_type_ahead.html">
         </div>
     </form>
 
 
-    <div class="well position-absolute increse-zindex" ng-show="reports_list.showDatePicker" ng-model="reports_list.pickerDate" ng-change="reports_list.pickerDateChanged()"
+    <div class="well position-absolute increse-zindex" ng-show="$ctrl.showDatePicker" ng-model="$ctrl.pickerDate" ng-change="$ctrl.pickerDateChanged()"
          class="animate-show">
         <uib-datepicker></uib-datepicker>
     </div>
@@ -34,31 +34,31 @@
 
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
+        <uib-pagination total-items="$ctrl.itemCount" items-per-page="$ctrl.itemsPerPage" ng-model="$ctrl.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
-                        ng-change="reports_list.paginationChange()"
-                        ng-show="!reports_list.is_loading"></uib-pagination>
+                        ng-change="$ctrl.paginationChange()"
+                        ng-show="!$ctrl.is_loading"></uib-pagination>
     </div>
 
 
     <div class="panel panel-default">
         <!-- Default panel contents -->
 
-        <table class="table table-striped report-list" ng-show="!reports_list.is_loading">
+        <table class="table table-striped report-list" ng-show="!$ctrl.is_loading">
             <caption>Slow Request Reports</caption>
             <thead>
             <tr>
                 <td class="c1 ordering occurences">#</td>
                 <td class="c2 average_duration">Avg. duration</td>
                 <td class="c3 application">Application</td>
-                <td class="c5 when">When <input type="checkbox" ng-model="reports_list.notRelativeTime"
-                                                ng-change="reports_list.changeRelativeTime()"
+                <td class="c5 when">When <input type="checkbox" ng-model="$ctrl.notRelativeTime"
+                                                ng-change="$ctrl.changeRelativeTime()"
                                                 title="Tick to see UTC time instead relative"></td>
                 <td class="c6 error_type">Location</td>
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="report in reports_list.reportsPage track by report.id">
+            <tr ng-repeat="report in $ctrl.reportsPage track by report.id">
                 <td class="c1 occurences">
                     <span class="priority-{{report.group.priority}}" data-uib-tooltip="Report priority">{{report.group.priority}}</span>
               <span class="count {{report.presentation.className}}" data-uib-tooltip="{{report.presentation.tooltip}}">
@@ -70,10 +70,10 @@
                     <div class="app_name">{{report.resource_name}}</div>
                     <span class="server">@{{report.tags.server_name}}</span></td>
                 <td class="c4 when">
-                <span ng-show="!reports_list.notRelativeTime"><span data-uib-tooltip="{{report.group.last_timestamp}}"><iso-to-relative-time
+                <span ng-show="!$ctrl.notRelativeTime"><span data-uib-tooltip="{{report.group.last_timestamp}}"><iso-to-relative-time
                         time="{{report.group.last_timestamp}}"/></span>
                 </span>
-                    <span ng-show="reports_list.notRelativeTime">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>
+                    <span ng-show="$ctrl.notRelativeTime">{{report.group.last_timestamp.replace('T', ' ').slice(0,16)}}</span>
                 </td>
                 <td class="c5 report ellipsis">
                     <a  ui-sref="report.view_detail({groupId:report.group.id, reportId:report.id})">{{ report.tags.view_name || report.url_path}} </span></a></td>
@@ -86,10 +86,10 @@
     </div>
 
     <div class="text-center">
-        <uib-pagination total-items="reports_list.itemCount" items-per-page="reports_list.itemsPerPage" ng-model="reports_list.page" max-size="10"
+        <uib-pagination total-items="$ctrl.itemCount" items-per-page="$ctrl.itemsPerPage" ng-model="$ctrl.page" max-size="10"
                         class="pagination pagination-sm" boundary-links="true" direction-links="false"
-                        ng-change="reports_list.paginationChange()"
-                        ng-show="!reports_list.is_loading"></uib-pagination>
+                        ng-change="$ctrl.paginationChange()"
+                        ng-show="!$ctrl.is_loading"></uib-pagination>
     </div>
 
 </div>
diff --git a/frontend/src/controllers/reports/list_slow.js b/frontend/src/components/views/reports-slow-browser-view/reports-slow-browser-view.js
similarity index 94%
rename from frontend/src/controllers/reports/list_slow.js
rename to frontend/src/components/views/reports-slow-browser-view/reports-slow-browser-view.js
index 96fe68e..3850209 100644
--- a/frontend/src/controllers/reports/list_slow.js
+++ b/frontend/src/components/views/reports-slow-browser-view/reports-slow-browser-view.js
@@ -21,13 +21,16 @@
 
 /* Controllers */
 
-angular.module('appenlight.controllers')
-    .controller('ReportsListSlowController', ReportsListSlowController);
+angular.module('appenlight.components.reportsSlowBrowserView', [])
+    .component('reportsSlowBrowserView', {
+        templateUrl: 'components/views/reports-slow-browser-view/reports-slow-browser-view.html',
+        controller: ReportsSlowBrowserViewController
+    });
 
-ReportsListSlowController.$inject = ['$location', '$cookies',
+ReportsSlowBrowserViewController.$inject = ['$location', '$cookies',
     'stateHolder', 'typeAheadTagHelper', 'slowReportsResource']
 
-function ReportsListSlowController($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';
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index 00a20e8..f10c5f4 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -34,30 +34,26 @@ angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun
     $stateProvider.state('report', {
         abstract: true,
         url: '/ui/report',
-        templateUrl: 'templates/reports/parent_view.html'
+        template: '<ui-view></ui-view>'
     });
 
     $stateProvider.state('report.list', {
-        url: '?start_date&min_duration&max_duration&{view_name:any}&{server_name:any}&resource',
-        templateUrl: 'templates/reports/list.html',
-        controller: 'ReportsListController as reports_list'
+        url: '/list?start_date&min_duration&max_duration&{view_name:any}&{server_name:any}&resource',
+        component: 'reportsBrowserView'
     });
 
     $stateProvider.state('report.list_slow', {
         url: '/list_slow?start_date&min_duration&max_duration&{view_name:any}&{server_name:any}&resource',
-        templateUrl: 'templates/reports/list_slow.html',
-        controller: 'ReportsListSlowController as reports_list'
+        component: 'reportsSlowBrowserView'
     });
 
     $stateProvider.state('report.view_detail', {
         url: '/:groupId/:reportId',
-        templateUrl: 'templates/reports/view.html',
-        controller: 'ReportsViewController as report'
+        component: 'reportView'
     });
     $stateProvider.state('report.view_group', {
         url: '/:groupId',
-        templateUrl: 'templates/reports/view.html',
-        controller: 'ReportsViewController as report'
+        component: 'reportView'
     });
     $stateProvider.state('events', {
         url: '/ui/events',
diff --git a/frontend/src/templates/reports/parent_view.html b/frontend/src/templates/reports/parent_view.html
deleted file mode 100644
index f182cdd..0000000
--- a/frontend/src/templates/reports/parent_view.html
+++ /dev/null
@@ -1 +0,0 @@
-<div ui-view></div>
\ No newline at end of file