diff --git a/src/controllers/api/v1/tickets.js b/src/controllers/api/v1/tickets.js
index 7d21c298d..390e4cd99 100644
--- a/src/controllers/api/v1/tickets.js
+++ b/src/controllers/api/v1/tickets.js
@@ -841,11 +841,17 @@ api_tickets.createType = function(req, res) {
     if (_.isUndefined(typeName) || typeName.length < 3) return res.status(400).json({success: false, error: 'Invalid Type Name!'});
 
     var ticketTypeSchema = require('../../../models/tickettype');
-    ticketTypeSchema.create({name: typeName}, function(err, ticketType) {
+    var ticketPrioritiesSchema = require('../../../models/ticketpriority');
+    ticketPrioritiesSchema.find({default: true}, function(err, priorities) {
         if (err) return res.status(400).json({success: false, error: err.message});
+        priorities = _.sortBy(priorities, 'migrationNum');
+        
+        ticketTypeSchema.create({name: typeName, priorities: priorities}, function(err, ticketType) {
+            if (err) return res.status(400).json({success: false, error: err.message});
 
-        return res.json({success: true, tickettype: ticketType});
-    })
+            return res.json({success: true, tickettype: ticketType});
+        })
+    });
 };
 
 /**
@@ -883,6 +889,58 @@ api_tickets.updateType = function(req, res) {
     });
 };
 
+api_tickets.typeAddPriority = function(req, res) {
+    var id = req.params.id;
+    var data = req.body;
+    if (!id || !data || !data.priority)
+        return res.status(400).json({success: false, error: 'Invalid request data'});
+
+    var ticketTypeSchema = require('../../../models/tickettype');
+    ticketTypeSchema.getType(id, function(err, type) {
+        if (err) return res.status(400).json({success: false, error: err.message});
+
+        type.addPriority(data.priority, function(err, type) {
+            if (err) return res.status(400).json({success: false, error: err.message});
+
+            type.save(function(err, t) {
+                if (err) return res.status(400).json({success: false, error: err.message});
+
+                t.populate('priorities', function(err, tt) {
+                    if (err) return res.status(400).json({success: false, error: err.message});
+
+                    return res.json({success: true, type: tt});
+                });
+            });
+        });
+    });
+};
+
+api_tickets.typeRemovePriority = function(req, res) {
+    var id = req.params.id;
+    var data = req.body;
+    if (!id || !data || !data.priority)
+        return res.status(400).json({success: false, error: 'Invalid request data'});
+
+    var ticketTypeSchema = require('../../../models/tickettype');
+    ticketTypeSchema.getType(id, function(err, type) {
+        if (err) return res.status(400).json({success: false, error: err.message});
+
+        type.removePriority(data.priority, function(err, type) {
+            if (err) return res.status(400).json({success: false, error: err.message});
+
+            type.save(function(err, t) {
+                if (err) return res.status(400).json({success: false, error: err.message});
+
+                t.populate('priorities', function(err, tt) {
+                    if (err) return res.status(400).json({success: false, error: err.message});
+
+                    return res.json({success: true, type: tt});
+                });
+            });
+        });
+    });
+};
+
 /**
  * @api {delete} /api/v1/tickets/types/:id Delete Ticket Type
  * @apiName deleteType
@@ -940,6 +998,95 @@ api_tickets.deleteType = function(req, res) {
     });
 };
 
+api_tickets.createPriority = function(req, res) {
+    var data = req.body;
+    var pName = data.name;
+    var pOverdueIn = data.overdueIn;
+    var pHtmlColor = data.htmlColor;
+
+    if (!pName)
+        return res.status(400).json({success: false, error: 'Invalid Request Data.'});
+
+    var ticketPrioritySchema = require('../../../models/ticketpriority');
+    var P = new ticketPrioritySchema({
+        name: pName,
+        overdueIn: pOverdueIn,
+        htmlColor: pHtmlColor
+    });
+
+    P.save(function(err, savedPriority) {
+        if (err)
+            return res.status(400).json({success: false, error: err.message});
+
+        return res.json({success: true, priority: savedPriority});
+    });
+};
+
+api_tickets.getPriorities = function(req, res) {
+    var ticketPrioritySchema = require('../../../models/ticketpriority');
+    ticketPrioritySchema.find({}, function(err, priorities) {
+        if (err) return res.status(400).json({success: false, error: err.message});
+
+        priorities = _.sortBy(priorities, ['migrationNum', 'name']);
+
+        return res.json({success: true, priorities: priorities});
+    });
+};
+
+api_tickets.updatePriority = function(req, res) {
+    var id = req.params.id;
+    var data = req.body;
+    if (_.isUndefined(id) || _.isNull(id) || _.isNull(data) || _.isUndefined(data))
+        return res.status(400).json({success: false, error: 'Invalid Request Data'});
+
+    var ticketPrioritySchema = require('../../../models/ticketpriority');
+    ticketPrioritySchema.findOne({_id: id}, function(err, priority) {
+        if (err) return res.status(400).json({success: false, error: err.message});
+
+        if (data.name)
+            priority.name = data.name;
+        if (data.htmlColor)
+            priority.htmlColor = data.htmlColor;
+        if (data.overdueIn)
+            priority.overdueIn = data.overdueIn;
+
+        priority.save(function(err, p) {
+            if (err) return res.status(400).json({success: false, error: err.message});
+
+            return res.json({success: true, priority: p});
+        });
+    });
+};
+
+api_tickets.deletePriority = function(req, res) {
+    var id = req.params.id;
+    var newPriority = req.body.newPriority;
+    if (!id || !newPriority)
+        return res.status(400).json({success: false, error: 'Invalid Request Data'});
+
+    async.series([
+        function(next) {
+            var ticketSchema = require('../../../models/ticket');
+            ticketSchema.updateMany({priority: id}, {priority: newPriority}, next);
+        },
+        function(next) {
+            var ticketPrioritySchema = require('../../../models/ticketpriority');
+            ticketPrioritySchema.findOne({_id: id}, function(err, priority) {
+                if (err) return next(err);
+
+                if (priority.default)
+                    return next('Unable to delete default priority: ' + priority.name);
+
+                priority.remove(next);
+            });
+        }
+    ], function(err) {
+        if (err) return res.status(400).json({success: false, error: err.message});
+
+        return res.json({success: true});
+    });
+};
+
 /**
  * @api {get} /api/v1/tickets/stats Get Ticket Stats
  * @apiName getTicketStats
diff --git a/src/controllers/settings.js b/src/controllers/settings.js
index a04e26a77..bf4b85dff 100644
--- a/src/controllers/settings.js
+++ b/src/controllers/settings.js
@@ -40,7 +40,7 @@ settingsController.general = function(req, res) {
     getSettings(content, function(err) {
         if (err) return handleError(res, err);
 
-        return res.render('subviews/settings/settings-tickets', content);
+        return res.render('settings', content);
     });
 };
 
@@ -59,7 +59,7 @@ settingsController.ticketSettings = function(req, res) {
     getSettings(content, function(err) {
         if (err) return handleError(res, err);
 
-        return res.render('subviews/settings/settings-tickets', content);
+        return res.render('settings', content);
     });
 };
 
@@ -78,7 +78,7 @@ settingsController.mailerSettings = function(req, res) {
     getSettings(content, function(err) {
         if (err) return handleError(res, err);
 
-        return res.render('subviews/settings/settings-tickets', content);
+        return res.render('settings', content);
     });
 };
 
@@ -97,7 +97,7 @@ settingsController.notificationsSettings = function(req, res) {
     getSettings(content, function(err) {
         if (err) return handleError(res, err);
 
-        return res.render('subviews/settings/settings-tickets', content);
+        return res.render('settings', content);
     });
 };
 
@@ -116,7 +116,7 @@ settingsController.tpsSettings = function(req, res) {
     getSettings(content, function(err) {
         if (err) return handleError(res, err);
 
-        return res.render('subviews/settings/settings-tickets', content);
+        return res.render('settings', content);
     });
 };
 
@@ -135,7 +135,7 @@ settingsController.legal = function(req, res) {
     getSettings(content, function(err) {
         if (err) return handleError(res, err);
 
-        return res.render('subviews/settings/settings-tickets', content);
+        return res.render('settings', content);
     });
 };
 
@@ -208,36 +208,22 @@ function getSettings(content, callback) {
             if (err) return callback(err);
 
             content.data.ticketTypes = _.sortBy(types, function(o){ return o.name; });
+            _.each(content.data.ticketTypes, function(type) {
+                type.priorities = _.sortBy(type.priorities, ['migrationNum', 'name']);
+            });
+
+            var ticketPrioritySchema = require('../models/ticketpriority');
+            ticketPrioritySchema.getPriorities(function(err, priorities) {
+                if (err) return callback(err);
+
+                content.data.priorities = _.sortBy(priorities, ['migrationNum', 'name']);
 
-            return callback();
+                return callback();
+            });
         });
     });
 }
 
-// settingsController.legal = function(req, res) {
-//     var content = {};
-//     content.title = "Legal Settings";
-//     content.nav = 'settings';
-//     content.subnav = 'settings-legal';
-//
-//     content.data = {};
-//     content.data.user = req.user;
-//     content.data.common = req.viewdata;
-//
-//     settingSchema.getSettings(function(err, settings) {
-//         if (err) return handleError(res, 'Invalid Settings');
-//
-//         var s = {};
-//         s.privacyPolicy = _.find(settings, function(x){return x.name === 'legal:privacypolicy'});
-//         s.privacyPolicy = (s.privacyPolicy === undefined) ? {value: ''} : s.privacyPolicy;
-//         s.privacyPolicy.value = jsStringEscape(s.privacyPolicy.value);
-//
-//         content.data.settings = s;
-//
-//         return res.render('subviews/settings/legal', content);
-//     });
-// };
-
 settingsController.logs = function(req, res) {
     if (!checkPerms(req, 'settings:logs')) return res.redirect('/settings');
 
diff --git a/src/helpers/viewdata/index.js b/src/helpers/viewdata/index.js
index 591861a2e..1e3add413 100644
--- a/src/helpers/viewdata/index.js
+++ b/src/helpers/viewdata/index.js
@@ -106,6 +106,15 @@ viewController.getData = function(request, cb) {
                 return callback();
             });
           },
+          function(callback) {
+            viewController.getPriorities(request, function(err, data) {
+                if (err) return callback();
+
+                viewdata.priorities = data;
+
+                return callback();
+            });
+          },
           function(callback) {
               viewController.getTags(request, function(err, data) {
                   if (err) return callback();
@@ -329,6 +338,20 @@ viewController.getDefaultTicketType = function(request, callback) {
     });
 };
 
+viewController.getPriorities = function(request, callback) {
+    var ticketPrioritySchema = require('../../models/ticketpriority');
+    ticketPrioritySchema.getPriorities(function(err, priorities) {
+        if (err) {
+            winston.debug('Error viewController:getPriorities: ' + err);
+            return callback(err);
+        }
+
+        priorities = _.sortBy(priorities, ['migrationNum', 'name']);
+
+        return callback(null, priorities);
+    });
+};
+
 viewController.getTags = function(request, callback) {
     var tagSchema = require('../../models/tag');
 
diff --git a/src/models/ticket.js b/src/models/ticket.js
index 091c7ad7b..69d9a2594 100644
--- a/src/models/ticket.js
+++ b/src/models/ticket.js
@@ -75,7 +75,7 @@ var ticketSchema = mongoose.Schema({
     deleted:    { type: Boolean, default: false, required: true, index: true },
     type:       { type: mongoose.Schema.Types.ObjectId, required: true, ref: 'tickettypes' },
     status:     { type: Number, default: 0, required: true, index: true },
-    // priority:   { type: Number, required: true },
+
     priority:   { type: mongoose.Schema.Types.ObjectId, ref: 'priorities', required: true },
     tags:       [{ type: mongoose.Schema.Types.ObjectId, ref: 'tags' }],
     subject:    { type: String, required: true },
diff --git a/src/models/ticketpriority.js b/src/models/ticketpriority.js
index 252a1fc46..aa1a299d0 100644
--- a/src/models/ticketpriority.js
+++ b/src/models/ticketpriority.js
@@ -12,18 +12,29 @@
 
  **/
 
-var mongoose = require('mongoose');
-var _        = require('lodash');
+var _               = require('lodash');
+var mongoose        = require('mongoose');
+var moment          = require('moment');
+var durationFormat  = require('moment-duration-format');
 
 var COLLECTION = 'priorities';
 
 var prioritySchema = mongoose.Schema({
     name:         { type: String, required: true, unique: true },
-    overdueIn:    { type: Number, required: true, default: 2880}, // Minutes until overdue (48 Hours)
-    htmlColor:    { type: String, default:  '#29b955'},
+    overdueIn:    { type: Number, required: true, default: 2880 }, // Minutes until overdue (48 Hours)
+    htmlColor:    { type: String, default:  '#29b955' },
 
     migrationNum: { type: Number, index: true }, //Needed to convert <1.0 priorities to new format.
     default:      { type: Boolean }
+}, {
+    toJSON: {
+        virtuals: true
+    }
+});
+
+prioritySchema.virtual('durationFormatted').get(function() {
+    var priority = this;
+    return moment.duration(priority.overdueIn, 'minutes').format('Y [year], M [month], d [day], h [hour], m [min]', {trim: 'both'});
 });
 
 prioritySchema.statics.getPriority = function(_id, callback) {
diff --git a/src/models/tickettype.js b/src/models/tickettype.js
index 684a60f35..9006e2be6 100644
--- a/src/models/tickettype.js
+++ b/src/models/tickettype.js
@@ -12,6 +12,7 @@
 
  **/
 
+var _        = require('lodash');
 var mongoose = require('mongoose');
 
 var COLLECTION = 'tickettypes';
@@ -88,4 +89,29 @@ ticketTypeSchema.statics.getTypeByName = function(name, callback) {
     return q.exec(callback);
 };
 
+ticketTypeSchema.methods.addPriority = function(priorityId, callback) {
+    if (!priorityId) return callback({message: 'Invalid Priority Id'});
+
+    var self = this;
+
+    if (!_.isArray(self.priorities))
+        self.priorities = [];
+
+    self.priorities.push(priorityId);
+
+    return callback(null, self);
+};
+
+ticketTypeSchema.methods.removePriority = function(priorityId, callback) {
+    if (!priorityId) return callback({message: 'Invalid Priority Id'});
+
+    var self = this;
+
+    self.priorities = _.reject(self.priorities, function(p) {
+         return p._id.toString() === priorityId.toString();
+    });
+
+    return callback(null, self);
+};
+
 module.exports = mongoose.model(COLLECTION, ticketTypeSchema);
\ No newline at end of file
diff --git a/src/public/js/angularjs/controllers/settings.js b/src/public/js/angularjs/controllers/settings.js
index 5877ac769..82384f6b7 100644
--- a/src/public/js/angularjs/controllers/settings.js
+++ b/src/public/js/angularjs/controllers/settings.js
@@ -95,6 +95,8 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
                 }
             ];
 
+            var privacyPolicyMDE = null;
+
             $scope.init = function() {
                 //Fix Inputs if input is preloaded with a value
                 $timeout(function() {
@@ -110,7 +112,7 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
 
                     var $privacyPolicy = $('#privacyPolicy');
                     if ($privacyPolicy.length > 0) {
-                        var privacyPolicyMDE = new EasyMDE({
+                        privacyPolicyMDE = new EasyMDE({
                             element: $privacyPolicy[0],
                             forceSync: true,
                             minHeight: "220px", //Slighty smaller to adjust the scroll
@@ -176,6 +178,8 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
                             $(vm).removeClass('active');
                         });
 
+                        $('.page-wrapper').scrollTop(0);
+
                         //Show Selected
                         $target.addClass('active');
                         if (currentTarget.length > 0) {
@@ -185,6 +189,12 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
                         if (settings === 'settings-tickets') {
                             $target.find('ul>li[data-key]').first().addClass('active');
                         }
+
+                        if (settings === 'settings-legal') {
+                            if (privacyPolicyMDE) {
+                                privacyPolicyMDE.codemirror.refresh();
+                            }
+                        }
                     }
                 }
             };
@@ -322,7 +332,24 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
                         'Content-Type': 'application/json'
                     }
                 }).then(function successCallback() {
-
+                    if (!$scope.mailerCheckEnabled) {
+                        UIkit.modal.confirm(
+                            'Settings will take affect after server restart. <br /> <br /> Would you like to restart the server now?'
+                            , function() {
+                                $http.get(
+                                    '/api/v1/admin/restart'
+                                )
+                                    .success(function() {
+                                    })
+                                    .error(function(err) {
+                                        helpers.hideLoader();
+                                        $log.log('[trudesk:settings:mailerCheckSubmit] - Error: ' + err.error);
+                                        $log.error(err);
+                                    });
+                            }, {
+                                labels: {'Ok': 'Yes', 'Cancel': 'No'}, confirmButtonClass: 'md-btn-primary'
+                            });
+                    }
                 }, function errorCallback(err) {
                     helpers.UI.showSnackbar(err, true);
                 });
@@ -615,11 +642,12 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
             };
 
             $scope.showDeleteTicketType = function(typeId, hasTickets) {
-                event.preventDefault();
                 if (hasTickets) {
-                    var delTicketTypeModal = $('#deleteTicketTypeModal');
+                    var delTicketTypeModal = $('#deleteTicketTypeModal-' + typeId);
                     if (delTicketTypeModal.length > 0) {
                         UIkit.modal(delTicketTypeModal, {bgclose: false}).show();
+                    } else {
+                        $log.log('Unable to locate modal window: #deleteTicketTypeModal' + typeId);
                     }
                 } else {
                     $scope.submitDeleteTicketType(typeId, undefined);
@@ -630,12 +658,12 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
                 if (event) event.preventDefault();
 
                 if (_.isUndefined(typeId) || typeId.length < 1) {
-                    helpers.UI.showSnackbar('Unable to get tag ID', true);
+                    helpers.UI.showSnackbar('Unable to get type ID', true);
                     return true;
                 }
 
-                var typeName = $('input#del_type_name').val();
-                var newTypeId = $('form#deleteTicketTypeForm select[name="type"]').val();
+                var typeName = $('input#del_type_name-' + typeId).val();
+                var newTypeId = $('form#deleteTicketTypeForm-' + typeId + ' select[name="ticketType"]').val();
 
                 if (!newTypeId || newTypeId.length < 1) {
                     helpers.UI.showSnackbar('Unable to get new ticket type. Aborting...', true);
@@ -655,7 +683,7 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
                     if (response.data.success) {
                         helpers.UI.showSnackbar('Successfully removed ticket type: ' + typeName, false);
 
-                        return History.pushState(null, null, '/settings/tickettypes/');
+                        return History.pushState(null, null, '/settings/tickets/');
                     }
                 }, function errorCallback(response) {
                     if (!_.isUndefined(response.data.error.custom)) {
@@ -668,6 +696,521 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'modules/ui', 'uik
                 });
             };
 
+            $scope.editPriority = function(pId, $event) {
+                $event.preventDefault();
+                var $viewBox = $('#view-p-' + pId);
+                var $editBox = $('#edit-p-' + pId);
+                if ($editBox.length > 0 && $viewBox.length > 0) {
+                    $editBox.find('.uk-color-button').css({background: $editBox.find('input[name="p-' + pId + '-htmlColor"]').val()});
+                    $viewBox.addClass('hide');
+                    $editBox.removeClass('hide');
+                }
+            };
+
+            $scope.cancelEditPriority = function(pId, $event) {
+                if ($event)
+                    $event.preventDefault();
+                var $viewBox = $('#view-p-' + pId);
+                var $editBox = $('#edit-p-' + pId);
+                if ($editBox.length > 0 && $viewBox.length > 0) {
+                    if ($event)
+                        $($event.currentTarget).parents('form').trigger('reset');
+                    $viewBox.removeClass('hide');
+                    $editBox.addClass('hide');
+                }
+            };
+
+            $scope.editTicketTypePriority = function(typeId, id, $event) {
+                $event.preventDefault();
+                var $viewBox = $('#t-' + typeId + '-view-p-' + id);
+                var $editBox = $('#t-' + typeId + '-edit-p-' + id);
+                if ($editBox.length > 0 && $viewBox.length > 0) {
+                    $editBox.find('.uk-color-button').css({background: $editBox.find('input[name="p-' + id + '-htmlColor"]').val()});
+                    $viewBox.addClass('hide');
+                    $editBox.removeClass('hide');
+                }
+            };
+
+            $scope.cancelEditTicketTypePriority = function(typeId, id, $event) {
+                if ($event)
+                    $event.preventDefault();
+                var $viewBox = $('#t-' + typeId + '-view-p-' + id);
+                var $editBox = $('#t-' + typeId + '-edit-p-' + id);
+                if ($editBox.length > 0 && $viewBox.length > 0) {
+                    if ($event)
+                        $($event.currentTarget).parents('form').trigger('reset');
+                    $viewBox.removeClass('hide');
+                    $editBox.addClass('hide');
+                }
+            };
+
+            $scope.showAddPriorityToType = function(typeId, $event) {
+                if ($event)
+                    $event.preventDefault();
+
+                //Dynamically load priorities....
+                $http.get('/api/v1/tickets/type/' + typeId)
+                    .success(function(response) {
+                        if (response.success) {
+                            var updatedType = response.type;
+                            $http.get('/api/v1/tickets/priorities')
+                                .success(function(response) {
+                                    var priorities = response.priorities;
+                                    var $addPriorityToTypeModal = $('#addPriorityTicketType-' + typeId);
+                                    var $pLoop = $addPriorityToTypeModal.find('.priority-loop');
+                                    $pLoop.empty();
+
+                                    var html = '';
+                                    _.each(priorities, function(priority) {
+                                        if (_.some(updatedType.priorities, priority)) {
+                                            html = '';
+                                            html += '<div class="z-box uk-clearfix">\n' +
+                                                '       <div class="uk-float-left">\n' +
+                                                '           <h5 class="p-' + priority._id + '-name" style="color: ' + priority.htmlColor + '; font-weight: bold;">' + priority.name + '</h5>\n' +
+                                                '           <p class="uk-text-muted">SLA Overdue: <strong class="p-' + priority._id + '-overdueIn">' + priority.durationFormatted + '</strong></p>\n' +
+                                                '       </div>\n' +
+                                                '       <div class="uk-float-right">\n' +
+                                                '           <i class="material-icons uk-text-success mt-10 mr-15" style="font-size: 28px;">check</i>\n' +
+                                                '       </div>\n' +
+                                                '   </div>';
+
+                                            $pLoop.append(html);
+                                        } else {
+                                            html = '';
+                                            html += '<div class="z-box uk-clearfix">\n' +
+                                                '       <div class="uk-float-left">\n' +
+                                                '           <h5 class="p-' + priority._id + '-name" style="color: ' + priority.htmlColor + '; font-weight: bold;">' + priority.name + '</h5>\n' +
+                                                '           <p class="uk-text-muted">SLA Overdue: <strong class="p-' + priority._id + '-overdueIn">' + priority.durationFormatted + '</strong></p>\n' +
+                                                '       </div>\n' +
+                                                '       <div class="uk-float-right">\n' +
+                                                '           <a class="uk-button uk-button-success mt-10 mr-10" ng-click="priorityAddBtnClicked(\'' + updatedType._id + '\', \'' + priority._id + '\', $event);">Add</a>\n' +
+                                                '           <i class="material-icons uk-text-success mt-10 mr-15" style="display: none; opacity: 0; font-size: 28px;">check</i>\n' +
+                                                '       </div>\n' +
+                                                '   </div>';
+
+                                            $pLoop.append(html);
+                                        }
+                                    });
+
+                                    var $injector = angular.injector(["ng", "trudesk"]);
+                                    $injector.invoke(["$compile", "$rootScope", function ($compile, $rootScope) {
+                                        var $scope = $pLoop.scope();
+                                        $compile($pLoop)($scope || $rootScope);
+                                        $rootScope.$digest();
+                                    }]);
+
+                                    if ($addPriorityToTypeModal.length > 0) {
+                                        UIkit.modal($addPriorityToTypeModal, {bgclose: false}).show();
+                                    } else {
+                                        $log.error('Unable to locate add priority modal.');
+                                    }
+                                })
+                                .error(function(error) {
+                                    $log.error(error);
+                                    helpers.UI.showSnackbar('Unable to load ticket type. Check Console.');
+                                });
+                        } else {
+                            helpers.UI.showSnackbar('Unable to load ticket type. Check Console.');
+                        }
+                    })
+                    .error(function(error) {
+                        $log.error(error);
+                        helpers.UI.showSnackbar('Unable to load ticket type. Check Console.');
+                    });
+            };
+
+            $scope.priorityAddBtnClicked = function(typeId, pId, $event) {
+                $event.preventDefault();
+                var $addButton = $($event.currentTarget);
+                if ($addButton.length < 1)
+                    return false;
+
+                $http.post('/api/v1/tickets/type/' + typeId + '/addpriority', {
+                    priority: pId
+                }, {
+                    'Content-Type': 'application/json'
+                }).then(function success(response) {
+                    var Type = response.data.type;
+                    if (Type) {
+                        //Update UI
+                        var $typeContainer = $('div[data-ticket-type-id="' + typeId + '"]');
+                        if ($typeContainer.length > 0) {
+                            var $prioritiesBox = $typeContainer.find('.priority-loop');
+                            var html = '';
+                            $prioritiesBox.empty();
+                            var sortedTypePriorities = _.sortBy(( _.sortBy(Type.priorities, 'name')), 'migrationNum');
+
+                            _.each(sortedTypePriorities, function(priority) {
+                                html = '';
+                                html += '<div id="t-' + Type._id + '-view-p-' + priority._id + '" data-pId="' + priority._id + '" class="z-box uk-clearfix">\n' +
+                                    '       <div class="uk-float-left">\n' +
+                                    '           <h5 class="p-' + priority._id + '-name" style="color: ' + priority.htmlColor + '; font-weight: bold;">' + priority.name + '</h5>\n' +
+                                    '           <p class="uk-text-muted">SLA Overdue: <strong class="p-' + priority._id + '-overdueIn">' + priority.durationFormatted + '</strong></p>\n' +
+                                    '       </div>\n' +
+                                    '       <div class="uk-float-right">\n' +
+                                    '           <div class="md-btn-group mt-5">\n' +
+                                    '               <a class="md-btn md-btn-small" ng-click="editTicketTypePriority(\'' + Type._id + '\', \'' + priority._id + '\', $event);">Edit</a>\n' +
+                                    '               <a class="md-btn md-btn-small md-btn-danger" ng-click="submitRemoveTicketTypePriority(\'' + Type._id + '\', \'' + priority._id + '\', $event);">Remove</a>\n' +
+                                    '           </div>\n' +
+                                    '       </div>\n' +
+                                    '    </div>\n' +
+                                    '    <div id="t-' + Type._id + '-edit-p-' + priority._id + '" data-pId="' + priority._id + '" class="z-box uk-clearfix hide" style="padding-top: 19px;">\n' +
+                                    '       <form data-priority-id="' + priority._id + '" ng-submit="submitUpdatePriority($event);">\n' +
+                                    '           <div class="uk-grid uk-grid-collapse uk-clearfix">\n' +
+                                    '               <div class="uk-width-1-4">\n' +
+                                    '                   <label for="">Priority Name</label>\n' +
+                                    '                   <input type="text" class="md-input" name="p-' + priority._id + '-name" value="' + priority.name + '" />\n' +
+                                    '               </div>\n' +
+                                    '               <div class="uk-width-1-4 uk-padding-small-sides">\n' +
+                                    '                   <label for="">SLA Overdue (minutes)</label>\n' +
+                                    '                   <input type="text" class="md-input" name="p-' + priority._id + '-overdueIn" value="' + priority.overdueIn + '" />\n' +
+                                    '               </div>\n' +
+                                    '               <div class="uk-width-1-4 uk-padding-small-sides">\n' +
+                                    '                   <button type="button" class="uk-button uk-button-small uk-color-button mr-5 mt-10" style="background: ' + priority.htmlColor + '" ng-click="generateRandomColor(\'' + priority._id + '\', $event);"><i class="material-icons">refresh</i></button>\n' +
+                                    '                   <div class="md-input-wrapper uk-float-left" style="width: 70%;">\n' +
+                                    '                       <label for="">Color</label>\n' +
+                                    '                       <input type="text" class="md-input" name="p-' + priority._id + '-htmlColor" value="' + priority.htmlColor + '" />\n' +
+                                    '                       <span class="md-input-bar"></span>\n' +
+                                    '                   </div>\n' +
+                                    '               </div>\n' +
+                                    '               <div class="uk-width-1-4">\n' +
+                                    '                   <div class="md-btn-group uk-float-right uk-text-right mt-5">\n' +
+                                    '                       <a class="md-btn md-btn-small" ng-click="cancelEditTicketTypePriority(\'' + Type._id + '\',\'' + priority._id + '\', $event);">Cancel</a>\n' +
+                                    '                       <button type="submit" class="md-btn md-btn-small md-btn-success">Save</button>\n' +
+                                    '                   </div>\n' +
+                                    '               </div>\n' +
+                                    '           </div>\n' +
+                                    '       </form>\n' +
+                                    '   </div>';
+
+                                $prioritiesBox.append(html);
+                            });
+
+                            //Bootstrap Angular dynamically...
+                            var $injector = angular.injector(["ng", "trudesk"]);
+                            $injector.invoke(["$compile", "$rootScope", function ($compile, $rootScope) {
+                                var $scope = $prioritiesBox.scope();
+                                $compile($prioritiesBox)($scope || $rootScope);
+                                $rootScope.$digest();
+                            }]);
+
+                            //Fix filled inputs
+                            helpers.UI.inputs();
+                            helpers.UI.reRenderInputs();
+                        }
+                    }
+
+
+                    //Animation
+                    $addButton.velocity({
+                        opacity: 0
+                    }, {
+                        duration: 350,
+                        complete: function() {
+                            $addButton.addClass('hide');
+                        }
+                    });
+
+                    var $check = $addButton.siblings('i.material-icons');
+                    if ($check.length > 0) {
+                        $check.velocity({
+                            opacity: 1
+                        }, {
+                            delay: 360,
+                            duration: 200,
+                            begin: function() {
+                                $check.show();
+                            }
+                        });
+                    }
+                }, function errorCallback(err) {
+                    $log.error(err);
+                    helpers.UI.showSnackbar('Error: ' + err, true);
+                });
+            };
+
+            $scope.removePriorityClicked = function(pId, $event) {
+                if ($event)
+                    $event.preventDefault();
+
+                var deletePriorityModal = $('#deletePriorityModal-' + pId);
+                if (deletePriorityModal.length > 0) {
+                    deletePriorityModal.find('form').trigger('reset');
+                    UIkit.modal(deletePriorityModal, {bgclose: false}).show();
+                } else {
+                    $log.error('Unable to locate delete priority modal.');
+                }
+            };
+
+            $scope.submitRemovePriority = function(pId, $event) {
+                if ($event)
+                    $event.preventDefault();
+
+                if (pId) {
+                    var $form = $($event.currentTarget).parents('form');
+                    var selectedPriority = $form.find('select[name="priority"]').val();
+
+                    $http.post('/api/v1/tickets/priority/' + pId + '/delete', {
+                        newPriority: selectedPriority
+                    }, {
+                        headers: {
+                            'Content-Type': 'application/json'
+                        }
+                    })
+                        .then(function() {
+                            var $body = $('body');
+                            // $body.find('div#view-p-' + pId).remove();
+                            // $body.find('div#edit-p-' + pId).remove();
+                            $body.find('div[data-pId="' + pId + '"]').remove();
+                            var deletePriorityModal = $('#deletePriorityModal-' + pId);
+                            if (deletePriorityModal) {
+                                UIkit.modal(deletePriorityModal).hide();
+                            }
+                        }, function(err) {
+                            $log.error(err);
+                            helpers.UI.showSnackbar(err.data.error, true);
+                        })
+                }
+            };
+
+            $scope.submitRemoveTicketTypePriority = function(typeId, priorityId, $event) {
+                if ($event)
+                    $event.preventDefault();
+
+                if (typeId && priorityId) {
+                    $http.post('/api/v1/tickets/type/' + typeId + '/removepriority', {
+                        priority: priorityId
+                    }, {
+                        headers: {
+                            'Content-Type': 'application/json'
+                        }
+                    }).then(function() {
+                        helpers.UI.showSnackbar('Removed priority from type', false);
+                        var $body = $('body');
+                        $body.find('div#t-' + typeId + '-view-p-' + priorityId).remove();
+                        $body.find('div#t-' + typeId + '-edit-p-' + priorityId).remove();
+                    }, function(err) {
+                        $log.error(err);
+                        helpers.UI.showSnackbar(err.data.error, true);
+                    });
+                }
+            };
+
+            $scope.showCreatePriorityWindow = function($event) {
+                if ($event)
+                    $event.preventDefault();
+
+                var createPriorityModal = $('#createPriorityModal');
+                if (createPriorityModal.length > 0) {
+                    createPriorityModal.find('form').trigger('reset');
+                    helpers.UI.inputs();
+                    helpers.UI.reRenderInputs();
+                    createPriorityModal.find('form').trigger('reset');
+                    createPriorityModal.find('#generateHtmlColor').css({background: '#29B955'});
+                    UIkit.modal(createPriorityModal, {bgclose: false}).show();
+                    createPriorityModal.find('input[name="p-name"]').focus();
+                } else {
+                    $log.error('Unable to locate create priority modal.');
+                }
+            };
+
+            $scope.createPrioritySubmit = function($event) {
+                $event.preventDefault();
+                var $form = $($event.currentTarget);
+                if ($form) {
+                    if (!$form.isValid(null, null, false)) {
+                        return true;
+                    } else {
+                        var $priorityName = $form.find('input[name="p-name"]');
+                        var $priorityOverdueIn = $form.find('input[name="p-overdueIn"]');
+                        var $priorityHtmlColor = $form.find('input[name="p-htmlColor"]');
+                        if ($priorityName.length < 1 || $priorityOverdueIn.length < 1 || $priorityHtmlColor.length < 1)
+                            return false;
+
+                        var name = $priorityName.val();
+                        var overdueIn = $priorityOverdueIn.val();
+                        var htmlColor = $priorityHtmlColor.val();
+
+                        $http.post('/api/v1/tickets/priority/create', {
+                            name: name,
+                            overdueIn: overdueIn,
+                            htmlColor: htmlColor
+                        }, {
+                            headers: {
+                                'Content-Type': 'application/json'
+                            }
+                        }).then(function successCallback(response) {
+                            var savedPriority = response.data.priority;
+                            if (savedPriority) {
+                                var priorityLoop = $('body').find('.all-priorities-loop');
+                                if (priorityLoop) {
+                                    $http.get('/api/v1/tickets/priorities')
+                                        .success(function(pResponse) {
+                                            var priorities = pResponse.priorities;
+                                            var html = '';
+                                            html += '<div id="view-p-' + savedPriority._id + '" data-pId="' + savedPriority._id + '" class="z-box uk-clearfix">\n' +
+                                                '       <div class="uk-float-left">\n' +
+                                                '           <h5 class="p-' + savedPriority._id + '-name" style="color: ' + savedPriority.htmlColor + '; font-weight: bold;">' + savedPriority.name + '</h5>\n' +
+                                                '           <p class="uk-text-muted">SLA Overdue: <strong class="p-' + savedPriority._id + '-overdueIn">' + savedPriority.durationFormatted + '</strong></p>\n' +
+                                                '       </div>\n' +
+                                                '       <div class="uk-float-right">\n' +
+                                                '           <div class="md-btn-group mt-5">\n' +
+                                                '               <a class="md-btn md-btn-small" ng-click="editPriority(\'' + savedPriority._id + '\', $event);">Edit</a>\n' +
+                                                '               <a class="md-btn md-btn-small md-btn-danger" ng-click="removePriorityClicked(\'' + savedPriority._id + '\', $event);">Remove</a>\n' +
+                                                '           </div>\n' +
+                                                '       </div>\n' +
+                                                '    </div>\n' +
+                                                '    <div id="edit-p-' + savedPriority._id + '" data-pId="' + savedPriority._id + '" class="z-box uk-clearfix hide" style="padding-top: 19px;">\n' +
+                                                '       <form data-priority-id="' + savedPriority._id + '" ng-submit="submitUpdatePriority($event);">\n' +
+                                                '           <div class="uk-grid uk-grid-collapse uk-clearfix">\n' +
+                                                '               <div class="uk-width-1-4">\n' +
+                                                '                   <label for="">Priority Name</label>\n' +
+                                                '                   <input type="text" class="md-input" name="p-' + savedPriority._id + '-name" value="' + savedPriority.name + '" />\n' +
+                                                '               </div>\n' +
+                                                '               <div class="uk-width-1-4 uk-padding-small-sides">\n' +
+                                                '                   <label for="">SLA Overdue (minutes)</label>\n' +
+                                                '                   <input type="text" class="md-input" name="p-' + savedPriority._id + '-overdueIn" value="' + savedPriority.overdueIn + '" />\n' +
+                                                '               </div>\n' +
+                                                '               <div class="uk-width-1-4 uk-padding-small-sides">\n' +
+                                                '                   <button class="uk-button uk-button-small uk-color-button mr-5 mt-10" style="background: ' + savedPriority.htmlColor + '" ng-click="generateRandomColor(\'' + savedPriority._id + '\', $event);"><i class="material-icons">refresh</i></button>\n' +
+                                                '                   <div class="md-input-wrapper uk-float-left" style="width: 70%;">\n' +
+                                                '                       <label for="">Color</label>\n' +
+                                                '                       <input type="text" class="md-input" name="p-' + savedPriority._id + '-htmlColor" value="' + savedPriority.htmlColor + '" />\n' +
+                                                '                       <span class="md-input-bar"></span>\n' +
+                                                '                   </div>\n' +
+                                                '               </div>\n' +
+                                                '               <div class="uk-width-1-4">\n' +
+                                                '                   <div class="md-btn-group uk-float-right uk-text-right mt-5">\n' +
+                                                '                       <a class="md-btn md-btn-small" ng-click="cancelEditPriority(\'' + savedPriority._id + '\', $event);">Cancel</a>\n' +
+                                                '                       <button type="submit" class="md-btn md-btn-small md-btn-success">Save</button>\n' +
+                                                '                   </div>\n' +
+                                                '               </div>\n' +
+                                                '           </div>\n' +
+                                                '       </form>\n' +
+                                                '    </div>\n' +
+                                                '<div class="uk-modal" id="deletePriorityModal-'+ savedPriority._id + '" data-pId="' + savedPriority._id + '" ng-controller="settingsCtrl">\n' +
+                                                '    <div class="uk-modal-dialog">\n' +
+                                                '        <form class="uk-form-stacked" id="deletePriorityForm-' + savedPriority._id + '" action="#" method="POST">\n' +
+                                                '            <input type="hidden" id="del_priority_name-' + savedPriority._id + '" name="del_priority_name" value="' + savedPriority.name + '">\n' +
+                                                '            <div class="uk-margin-medium-bottom uk-clearfix">\n' +
+                                                '                <h2 class="">Remove Priority</h2>\n' +
+                                                '                <span>Please select the priority you wish to reassign tickets to in order to delete the this priority.</span>\n' +
+                                                '                <hr style="margin: 10px 0" />\n' +
+                                                '            </div>\n' +
+                                                '            <div class="uk-margin-medium-bottom uk-clearfix">\n' +
+                                                '                <div class="uk-float-left" style="width: 100%;">\n' +
+                                                '                    <label for="priority" class="uk-form-label">Priority</label>\n' +
+                                                '                    <select class="selectize-white" name="priority" data-md-selectize-inline>\n';
+
+                                            priorities.forEach(function(p) {
+                                                if (p._id.toString() !== savedPriority._id) {
+                                                    html += '<option value="' + p._id + '">' + p.name + '</option>';
+                                                }
+                                            });
+
+                                                html +=
+                                                '                    </select>\n' +
+                                                '                </div>\n' +
+                                                '            </div>\n' +
+                                                '            <div class="uk-margin-medium-bottom uk-clearfix">\n' +
+                                                '                <span class="uk-text-danger">WARNING: This will change all tickets with a priority of: <strong>' + savedPriority.name + '</strong> to the selected priority above. <br /><strong>This is permanent!</strong></span>\n' +
+                                                '            </div>\n' +
+                                                '            <div class="uk-modal-footer uk-text-right">\n' +
+                                                '                <button type="button" class="md-btn md-btn-flat uk-modal-close">Cancel</button>\n' +
+                                                '                <button type="button" class="md-btn md-btn-flat md-btn-flat-danger" data-id="submitDeleteTicketType" ng-click="submitRemovePriority(\'' + savedPriority._id + '\', $event)">Delete</button>\n' +
+                                                '            </div>\n' +
+                                                '        </form>\n' +
+                                                '    </div>\n' +
+                                                '</div>\n';
+
+                                            priorityLoop.append(html);
+
+                                            helpers.UI.selectize();
+
+                                            //Bootstrap Angular dynamically...
+                                            var $injector = angular.injector(["ng", "trudesk"]);
+                                            $injector.invoke(["$compile", "$rootScope", function ($compile, $rootScope) {
+                                                var $scope = priorityLoop.scope();
+                                                $compile(priorityLoop)($scope || $rootScope);
+                                                $rootScope.$digest();
+                                            }]);
+
+                                            helpers.UI.showSnackbar('Priority Created.', false);
+                                            var createPriorityModal = $('#createPriorityModal');
+                                            if (createPriorityModal.length > 0) {
+                                                UIkit.modal(createPriorityModal).hide();
+                                            }
+                                        })
+                                        .error(function(errorResponse) {
+                                            $log.error(errorResponse);
+                                            helpers.UI.showSnackbar('Error: ' + errorResponse.data.error, true);
+                                        });
+                                }
+                            }
+                        }, function errorCallback(errorResponse) {
+                            $log.error(errorResponse);
+                            helpers.UI.showSnackbar('Error: ' + errorResponse.data.error, true);
+                        });
+                    }
+                }
+            };
+
+            $scope.submitUpdatePriority = function($event) {
+                $event.preventDefault();
+                var $form = $($event.currentTarget);
+                var priorityId = $form.attr('data-priority-id');
+                var typeId = $form.parents('div[data-ticket-type-id]').attr('data-ticket-type-id');
+                if ($form && priorityId) {
+                    var $priorityNameInput = $form.find('input[name="p-' + priorityId + '-name"]');
+                    var $priorityHtmlColor = $form.find('input[name="p-' + priorityId + '-htmlColor"]');
+                    var $priorityOverdueIn = $form.find('input[name="p-' + priorityId + '-overdueIn"]');
+                    var priorityName = $priorityNameInput.val();
+                    var htmlColor = $priorityHtmlColor.val();
+                    var overdueIn = $priorityOverdueIn.val();
+
+                    $http.put('/api/v1/tickets/priority/' + priorityId, {
+                        name: priorityName,
+                        htmlColor: htmlColor,
+                        overdueIn: overdueIn
+                    }, {
+                        headers: {
+                            'Content-Type': 'application/json'
+                        }
+                    }).then(function successCallback(response) {
+                        helpers.UI.showSnackbar('Priority updated successfully', false);
+                        var $body = $('body');
+                        $body.find('.p-' + priorityId + '-name').css({color: htmlColor}).text(priorityName);
+                        $body.find('.p-' + priorityId + '-overdueIn').text(response.data.priority.durationFormatted);
+                        $body.find('input[name="p-' + priorityId + '-htmlColor"]').val(htmlColor);
+                        if (typeId)
+                            $scope.cancelEditTicketTypePriority(typeId, priorityId);
+                        else
+                            $scope.cancelEditPriority(priorityId);
+                    }, function errorCallback(err) {
+                        helpers.UI.showSnackbar(err, true);
+                    });
+                }
+            };
+
+            $scope.generateRandomColor = function(id, $event) {
+                $event.preventDefault();
+                var $currentTarget = $($event.currentTarget);
+                if ($currentTarget.length > 0) {
+                    var color = getRandomColor();
+                    $currentTarget.css({background: color});
+                    $currentTarget.next().find('input').val(color);
+                }
+            };
+
+            function getRandomColor() {
+                var letters = '0123456789ABCDEF';
+                var color = '#';
+                for (var i = 0; i < 6; i++) {
+                    color += letters[Math.floor(Math.random() * 16)];
+                }
+                return color;
+            }
+
             $scope.editTag = function($event) {
                 if (_.isNull($event.target) || _.isUndefined($event.target) ||
                     $event.target.tagName.toLowerCase() === 'label' ||
diff --git a/src/public/js/angularjs/controllers/singleTicket.js b/src/public/js/angularjs/controllers/singleTicket.js
index 952aca7da..e15519092 100644
--- a/src/public/js/angularjs/controllers/singleTicket.js
+++ b/src/public/js/angularjs/controllers/singleTicket.js
@@ -173,7 +173,7 @@ define(['angular', 'underscore', 'jquery', 'uikit', 'modules/socket', 'modules/n
                 $scope.priorities = _.sortBy($scope.priorities, 'name');
                 $scope.selected_priority = _.findWhere($scope.priorities, {_id: $scope.ticketPriority});
                 if (!$scope.selected_priority) {
-                    alert('Selected Priority does not exit for this ticket type. Please select a new priority');
+                    UIkit.modal.alert('Selected Priority does not exit for this ticket type.<br><br><strong>Please select a new priority</strong>');
                 }
             });
 
@@ -199,7 +199,7 @@ define(['angular', 'underscore', 'jquery', 'uikit', 'modules/socket', 'modules/n
                     $scope.priorities = _.sortBy($scope.priorities, 'name');
                     $scope.selected_priority = _.findWhere($scope.priorities, {_id: $scope.ticketPriority});
                     if (_.isUndefined($scope.selected_priority)) {
-                        alert('Selected Priority does not exit for this ticket type. Please select a new priority');
+                        UIkit.modal.alert('Selected Priority does not exit for this ticket type.<br><br><strong>Please select a new priority</strong>');
                     }
                 }
             };
diff --git a/src/public/js/modules/helpers.js b/src/public/js/modules/helpers.js
index 2cc0ed99c..5869b7dde 100644
--- a/src/public/js/modules/helpers.js
+++ b/src/public/js/modules/helpers.js
@@ -397,6 +397,12 @@ function($, _, moment, UIkit, CountUp, Waves, Selectize, Snackbar, ROLES, Cookie
         });
     };
 
+    helpers.UI.reRenderInputs = function() {
+        $('.md-input').each(function() {
+            updateInput($(this));
+        });
+    };
+
     function updateInput(object) {
         // clear wrapper classes
         object.closest('.uk-input-group').removeClass('uk-input-group-danger uk-input-group-success uk-input-group-nocolor');
diff --git a/src/routes/index.js b/src/routes/index.js
index f7981dd86..8a6ea1112 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -135,10 +135,17 @@ function mainRoutes(router, middleware, controllers) {
     router.get('/api/v1/tickets/search', middleware.api, controllers.api.tickets.search);
     router.post('/api/v1/tickets/create', middleware.api, controllers.api.tickets.create);
     router.get('/api/v1/tickets/type/:id', middleware.api, controllers.api.tickets.getType);
+    router.post('/api/v1/tickets/type/:id/removepriority', middleware.api, controllers.api.tickets.typeRemovePriority);
+    router.post('/api/v1/tickets/type/:id/addpriority', middleware.api, controllers.api.tickets.typeAddPriority);
     router.get('/api/v1/tickets/types', middleware.api, controllers.api.tickets.getTypes);
     router.post('/api/v1/tickets/types/create', middleware.api, controllers.api.tickets.createType);
     router.put('/api/v1/tickets/types/:id', middleware.api, controllers.api.tickets.updateType);
     router.delete('/api/v1/tickets/types/:id', middleware.api, controllers.api.tickets.deleteType);
+    router.post('/api/v1/tickets/priority/create', middleware.api, controllers.api.tickets.createPriority);
+    router.post('/api/v1/tickets/priority/:id/delete', middleware.api, controllers.api.tickets.deletePriority);
+    router.get('/api/v1/tickets/priorities', middleware.api, controllers.api.tickets.getPriorities);
+    router.put('/api/v1/tickets/priority/:id', middleware.api, controllers.api.tickets.updatePriority);
+
     router.post('/api/v1/tickets/addtag', middleware.api, controllers.api.tickets.addTag);
     router.get('/api/v1/tickets/overdue', middleware.api, controllers.api.tickets.getOverdue);
     router.post('/api/v1/tickets/addcomment', middleware.api, controllers.api.tickets.postComment);
diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass
index e41137fb1..7bc2d60dd 100644
--- a/src/sass/partials/common.sass
+++ b/src/sass/partials/common.sass
@@ -37,18 +37,31 @@
 .nomargin-top,
 .nm-t
   margin-top: 0 !important
-.marginright20
+.marginright20,
+.mr-20
   margin-right: 20px !important
-.marginright30
+.marginright30,
+.mr-30
   margin-right: 30px !important
-.marginleft5
+.marginleft5,
+.ml-5
   margin-left: 5px !important
-.marginright5
+.marginright5,
+.mr-5
   margin-right: 5px !important
+.mt-5
+  margin-top: 5px !important
+.mt-10
+  margin-top: 10px !important
 .mb-10
   margin-bottom: 10px !important
 .mb-5
   margin-bottom: 5px !important
+.mr-10
+  margin-right: 10px !important
+.mr-15
+  margin-right: 15px !important
+
 .padding-left-right-15
   padding-left: 15px !important
   padding-right: 15px !important
diff --git a/src/sass/partials/ui.sass b/src/sass/partials/ui.sass
index 2c31d7db2..8ee2bf4d8 100644
--- a/src/sass/partials/ui.sass
+++ b/src/sass/partials/ui.sass
@@ -380,6 +380,16 @@ label.md-label
     color: white
     background: lighten($accent_color, 5%)
 
+.uk-color-button
+  padding: 0
+  float: left
+  display: inline-block
+  i.material-icons
+    font-size: 22px
+    vertical-align: middle
+    padding: 3px 4px
+    margin: 0
+
 .uk-tooltip-left:after
   display: block !important
   left: 100%
diff --git a/src/settings/defaults.js b/src/settings/defaults.js
index 437832530..afe1d879b 100644
--- a/src/settings/defaults.js
+++ b/src/settings/defaults.js
@@ -258,6 +258,7 @@ function addedDefaultPrioritesToTicketTypes(callback) {
                 .catch(next);
         },
         function(priorities, next) {
+            priorities = _.sortBy(priorities, 'migrationNum');
             var ticketTypeSchema = require('../models/tickettype');
             ticketTypeSchema.getTypes(function(err, types) {
                 if (err) return next(err);
@@ -267,14 +268,18 @@ function addedDefaultPrioritesToTicketTypes(callback) {
                     if (!type.priorities) {
                         type.priorities = [];
                         prioritiesToAdd = _.map(priorities, '_id');
-                    } else {
-                      _.each(priorities, function(priority) {
-                          if (!_.find(type.priorities, {'_id': priority._id})) {
-                              winston.debug('Adding default priority %s to ticket type %s', priority.name, type.name);
-                              prioritiesToAdd.push(priority._id);
-                          }
-                      });
+                    } else if (type.priorities.length < 1) {
+                        type.priorities = [];
+                        prioritiesToAdd = _.map(priorities, '_id');
                     }
+                    // } else {
+                    //   _.each(priorities, function(priority) {
+                    //       if (!_.find(type.priorities, {'_id': priority._id})) {
+                    //           winston.debug('Adding default priority %s to ticket type %s', priority.name, type.name);
+                    //           prioritiesToAdd.push(priority._id);
+                    //       }
+                    //   });
+                    // }
 
                     if (prioritiesToAdd.length < 1)
                         return done();
diff --git a/src/views/partials/addPriorityToTypeWindow.hbs b/src/views/partials/addPriorityToTypeWindow.hbs
new file mode 100644
index 000000000..6047b9d70
--- /dev/null
+++ b/src/views/partials/addPriorityToTypeWindow.hbs
@@ -0,0 +1,18 @@
+<div class="uk-modal" id="addPriorityTicketType-{{_id}}" ng-controller="settingsCtrl">
+    <div class="uk-modal-dialog">
+        <form class="uk-form-stacked" id="deletePriorityForm-{{_id}}" action="#" method="POST">
+            <input type="hidden" id="del_priority_name-{{_id}}" name="del_priority_name" value="{{name}}">
+            <div class="uk-margin-medium-bottom uk-clearfix">
+                <h2 class="">Add Priorities</h2>
+                <span>Please select the priorities you wish to add to type: <strong>{{name}}</strong></span>
+            </div>
+            <div class="priority-loop zone">
+
+            </div>
+
+            <div class="uk-modal-footer uk-text-right">
+                <button type="button" class="md-btn md-btn-flat uk-modal-close">Close</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/views/partials/createPriorityWindow.hbs b/src/views/partials/createPriorityWindow.hbs
new file mode 100644
index 000000000..72c5743fe
--- /dev/null
+++ b/src/views/partials/createPriorityWindow.hbs
@@ -0,0 +1,50 @@
+<div class="uk-modal" id="createPriorityModal" ng-controller="settingsCtrl">
+    <div class="uk-modal-dialog">
+        <form class="uk-form-stacked" id="createPriorityForm" action="#" method="POST" ng-submit="createPrioritySubmit($event);">
+            <div class="uk-margin-medium-bottom uk-clearfix">
+                <h2 class="">Create Priority</h2>
+                <span></span>
+            </div>
+
+            <div class="">
+                <div class="uk-clearfix">
+                    <form>
+                        <div class="z-box uk-grid uk-grid-collapse uk-clearfix">
+                            <div class="uk-width-1-3">
+                                <label for="">Priority Name</label>
+                                <input type="text" class="md-input" name="p-name"
+                                       data-validation="length"
+                                       data-validation-length="min3"
+                                       data-validation-error-msg="Invalid name (at least 3 characters)"
+                                />
+                            </div>
+                            <div class="uk-width-1-3 uk-padding-small-sides">
+                                <label for="">SLA Overdue (minutes)</label>
+                                <input type="text" class="md-input" name="p-overdueIn" value="2880"
+                                       data-validation="number"
+                                       data-validation-allowing="range[1;525600]"
+                                       data-validation-error-msg="Invalid SLA Time (1-525600)"
+                                />
+                            </div>
+                            <div class="uk-width-1-3">
+                                <button id="generateHtmlColor" class="uk-button uk-button-small uk-color-button mr-5 mt-10" style="background: #29B955; " ng-click="generateRandomColor(null, $event);"><i class="material-icons">refresh</i></button>
+                                <div class="md-input-wrapper uk-float-left" style="width: 70%;">
+                                    <label for="">Color</label>
+                                    <input type="text" class="md-input" name="p-htmlColor" value="#29B955"
+                                           data-validation="custom" data-validation-regexp="^\#([0-9a-fA-F]){3,6}$"
+                                           data-validation-error-msg="Invalid HEX Color"
+                                    />
+                                    <span class="md-input-bar"></span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="uk-modal-footer uk-text-right">
+                            <button type="button" class="md-btn md-btn-flat uk-modal-close">Close</button>
+                            <button type="submit" class="md-btn md-btn-flat md-btn-flat-success">Create</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/views/partials/deletePriorityWindow.hbs b/src/views/partials/deletePriorityWindow.hbs
new file mode 100644
index 000000000..a01a335c0
--- /dev/null
+++ b/src/views/partials/deletePriorityWindow.hbs
@@ -0,0 +1,31 @@
+<div class="uk-modal" id="deletePriorityModal-{{_id}}" ng-controller="settingsCtrl">
+    <div class="uk-modal-dialog">
+        <form class="uk-form-stacked" id="deletePriorityForm-{{_id}}" action="#" method="POST">
+            <input type="hidden" id="del_priority_name-{{_id}}" name="del_priority_name" value="{{name}}">
+            <div class="uk-margin-medium-bottom uk-clearfix">
+                <h2 class="">Remove Priority</h2>
+                <span>Please select the priority you wish to reassign tickets to in order to delete the this priority.</span>
+                <hr style="margin: 10px 0" />
+            </div>
+            <div class="uk-margin-medium-bottom uk-clearfix">
+                <div class="uk-float-left" style="width: 100%;">
+                    <label for="priority" class="uk-form-label">Priority</label>
+                    <select class="selectize-white" name="priority" data-md-selectize-inline>
+                        {{#each @root.data.common.priorities}}
+                            {{#isnot name ../name}}
+                                <option value="{{{_id}}}">{{name}}</option>
+                            {{/isnot}}
+                        {{/each}}
+                    </select>
+                </div>
+            </div>
+            <div class="uk-margin-medium-bottom uk-clearfix">
+                <span class="uk-text-danger">WARNING: This will change all tickets with a priority of: <strong>{{name}}</strong> to the selected priority above. <br /><strong>This is permanent!</strong></span>
+            </div>
+            <div class="uk-modal-footer uk-text-right">
+                <button type="button" class="md-btn md-btn-flat uk-modal-close">Cancel</button>
+                <button type="button" class="md-btn md-btn-flat md-btn-flat-danger" data-id="submitDeleteTicketType" ng-click="submitRemovePriority('{{_id}}', $event)">Delete</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/views/partials/deleteTicketTypeWindow.hbs b/src/views/partials/deleteTicketTypeWindow.hbs
index 8c715b35a..8933f9c49 100644
--- a/src/views/partials/deleteTicketTypeWindow.hbs
+++ b/src/views/partials/deleteTicketTypeWindow.hbs
@@ -1,16 +1,18 @@
-<div class="uk-modal" id="deleteTicketTypeModal" ng-controller="settingsCtrl">
+<div class="uk-modal" id="deleteTicketTypeModal-{{_id}}" ng-controller="settingsCtrl">
     <div class="uk-modal-dialog">
-        <form class="uk-form-stacked" id="deleteTicketTypeForm" action="#" method="POST">
-            <input type="hidden" id="del_type_name" name="del_type_name" value="{{data.tickettype.name}}">
+        <form class="uk-form-stacked" id="deleteTicketTypeForm-{{_id}}" action="#" method="POST">
+            <input type="hidden" id="del_type_name-{{_id}}" name="del_type_name" value="{{name}}">
             <div class="uk-margin-medium-bottom uk-clearfix">
-                <span>There're currently tickets assigned to this Ticket Type. Please select the ticket type you wish to reassign those tickets to in order to delete the ticket type.</span>
+                <h2 class="">Remove Ticket Type</h2>
+                <span>Please select the ticket type you wish to reassign tickets to in order to delete the ticket type.</span>
+                <hr style="margin: 10px 0" />
             </div>
             <div class="uk-margin-medium-bottom uk-clearfix">
                 <div class="uk-float-left" style="width: 100%;">
-                    <label for="type" class="uk-form-label">Type</label>
-                    <select class="selectize-white" name="type" id="type" data-md-selectize-inline>
-                        {{#each data.common.ticketTypes}}
-                            {{#isnot name ../data.tickettype.name}}
+                    <label for="ticketType" class="uk-form-label">Type</label>
+                    <select class="selectize-white" name="ticketType" data-md-selectize-inline>
+                        {{#each @root.data.common.ticketTypes}}
+                            {{#isnot name ../name}}
                                 <option value="{{{_id}}}">{{name}}</option>
                             {{/isnot}}
                         {{/each}}
@@ -18,11 +20,11 @@
                 </div>
             </div>
             <div class="uk-margin-medium-bottom uk-clearfix">
-                <span class="uk-text-danger">WARNING: This will change all tickets with type: <strong>{{data.tickettype.name}}</strong> to the selected ticket type above. <br /><strong>This is permanent!</strong></span>
+                <span class="uk-text-danger">WARNING: This will change all tickets with type: <strong>{{name}}</strong> to the selected ticket type above. <br /><strong>This is permanent!</strong></span>
             </div>
             <div class="uk-modal-footer uk-text-right">
                 <button type="button" class="md-btn md-btn-flat uk-modal-close">Cancel</button>
-                <button type="button" class="md-btn md-btn-flat md-btn-flat-danger" id="submitDeleteTicketType" ng-click="submitDeleteTicketType('{{data.tickettype._id}}', $event)">Delete</button>
+                <button type="button" class="md-btn md-btn-flat md-btn-flat-danger" data-id="submitDeleteTicketType" ng-click="submitDeleteTicketType('{{_id}}', $event)">Delete</button>
             </div>
         </form>
     </div>
diff --git a/src/views/partials/nav.hbs b/src/views/partials/nav.hbs
index 1845c7148..d21079813 100644
--- a/src/views/partials/nav.hbs
+++ b/src/views/partials/nav.hbs
@@ -113,13 +113,10 @@
                         <li {{#is subnav 'settings-legal'}} class="active" {{/is}}><a href="/settings/legal"><i class="material-icons fa-sub-icon">style</i><span>Legal</span></a></li>
 
 
-                        <li {{#is subnav 'settings-tags'}} class='active' {{/is}}><a href="/settings/tags"><i class="material-icons fa-sub-icon">style</i><span>Tags</span></a></li>
-                        <li {{#is subnav 'settings-tickettypes'}} class='active' {{/is}}><a href="/settings/tickettypes"><i class="material-icons fa-sub-icon">text_fields</i><span>Ticket Types</span></a></li>
                         {{#canUser data.user "settings:logs"}}
                             <hr>
                             <li {{#is subnav 'settings-logs'}} class='active' {{/is}}><a href="/settings/logs"><i class="material-icons fa-sub-icon">remove_from_queue</i><span>Logs</span></a></li>
                         {{/canUser}}
-                        <li {{#is subnav 'settings-legal'}} class='active' {{/is}}><a href="/settings/legal"><i class="material-icons fa-sub-icon">gavel</i><span>Legal</span></a></li>
                     </ul>
                 </li>
             {{/canUser}}
diff --git a/src/views/settings.hbs b/src/views/settings.hbs
index 5aec60832..d4ffaddb8 100644
--- a/src/views/settings.hbs
+++ b/src/views/settings.hbs
@@ -1,4 +1,4 @@
-<div ng-controller="settingsCtrl" ng-init="
+<div class="uk-grid uk-grid-collapse" ng-controller="settingsCtrl" ng-init="
     defaultTicketType='{{data.settings.defaultTicketType.value}}';
     mailerEnabled={{data.settings.mailerEnabled.value}};
     mailerHost='{{data.settings.mailerHost.value}}';
@@ -22,270 +22,616 @@
     tpsEnabled={{data.settings.tpsEnabled.value}};
     tpsUsername='{{data.settings.tpsUsername.value}}';
     tpsApiKey='{{data.settings.tpsApiKey.value}}';
+
+    privacyPolicy='{{data.settings.privacyPolicy.value}}';
+
     init();
 ">
-    <div class="nopadding settings">
-        <div class="uk-width-1-1 page-title noshadow" style="padding-left: 25px !important; border-bottom: 1px solid #dadada;">
-            <p class="left">{{title}}</p>
+    <div class="uk-width-1-6 message-list full-height" data-offset="68">
+        <div class="page-title noshadow nopadding-right" style="border-top: none !important; height: 68px !important; padding-left: 20px !important;">
+            <div class="page-title-border-right1" style="position:relative;">
+                <p style="font-size: 24px;">Settings</p>
+            </div>
+
         </div>
-        <!--Content Here-->
-        <div class="page-wrapper full-height scrollable no-overflow-x">
-            <div id="page-content-inner">
 
-                <div class="setting-item-wrap uk-margin-medium-bottom">
-                    <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                        <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Default Ticket Type</h6>
-                            <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Default ticket type for newly created tickets.
-                            </h5>
-                        </div>
-                        <div class="right" style="position:relative; padding-top: 5px;">
-                            <div class="uk-float-left" style="padding-right: 11px; min-width: 130px; width: 100%;">
-                                <select class="selectize-white" name="type" id="type"  ng-model="defaultTicketType" data-md-selectize-inline2 selectize>
-                                    {{#each data.common.ticketTypes}}
-                                        <option value="{{{_id}}}">{{name}}</option>
-                                    {{/each}}
-                                </select>
+        <div id="" class="page-content-left noborder full-height">
+            <ul class="settings-categories scrollable">
+                <li {{#ifeq subnav compare='settings-general'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-general');">
+                    <div class="setting-category">
+                        <h3>General</h3>
+                    </div>
+                </li>
+                <li {{#ifeq subnav compare='settings-tickets'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-tickets');">
+                    <div class="setting-category">
+                        <h3>Tickets</h3>
+                    </div>
+                </li>
+                <li {{#ifeq subnav compare='settings-mailer'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-mailer');">
+                    <div class="setting-category">
+                        <h3>Mailer</h3>
+                    </div>
+                </li>
+                <li {{#ifeq subnav compare='settings-notifications'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-notifications');">
+                    <div class="setting-category">
+                        <h3>Notifications</h3>
+                    </div>
+                </li>
+                <li {{#ifeq subnav compare='settings-tps'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-tps');">
+                    <div class="setting-category">
+                        <h3>Push Service</h3>
+                    </div>
+                </li>
+                <li {{#ifeq subnav compare='settings-legal'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-legal');">
+                    <div class="setting-category">
+                        <h3>Legal</h3>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="uk-width-5-6">
+        <div class="page-title-right noshadow page-title-border-bottom" style="border-top: none !important; height: 69px !important;"></div>
+        <div class="page-wrapper full-height scrollable no-overflow-x">
+            <div class="settings-wrap">
+                <div data-settings-id="settings-general" {{#ifeq subnav compare='settings-general'}} class="active" {{/ifeq}}>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Show Tour - <i style="font-size: 13px; color: #a1a1a1;">Beta</i></h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Tour the user interface on initial login.
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+                                <!-- Switch -->
+                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
+                                    <label>
+                                        Enable
+                                        <input type="checkbox" id="showTour" name="showTour" ng-change="showTourChanged()" ng-model="showTour">
+                                        <span class="lever"></span>
+                                    </label>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="setting-item-wrap uk-margin-medium-bottom">
-                    <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                        <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Show Tour - <i style="font-size: 13px; color: #a1a1a1;">Beta</i></h6>
-                            <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Tour the user interface on initial login.
-                            </h5>
-                        </div>
-                        <div class="right" style="position:relative;">
-                            <!-- Switch -->
-                            <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                <label>
-                                    Enable
-                                    <input type="checkbox" id="showTour" name="showTour" ng-change="showTourChanged()" ng-model="showTour">
-                                    <span class="lever"></span>
-                                </label>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Allow User Registration</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Allow users to create accounts on the login screen.
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+                                <!-- Switch -->
+                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
+                                    <label>
+                                        Enable
+                                        <input type="checkbox" id="allowUserRegistration" name="allowUserRegistration" ng-change="allowUserRegistrationChanged()" ng-model="allowUserRegistration">
+                                        <span class="lever"></span>
+                                    </label>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
 
-                <div class="setting-item-wrap uk-margin-medium-bottom">
-                    <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                        <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Show Overdue Tickets</h6>
-                            <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Flash tickets that have been idle for a length of time. (<a href="#">Configure Priorities</a>)
-                            </h5>
-                        </div>
-                        <div class="right" style="position:relative;">
-                            <!-- Switch -->
-                            <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                <label>
-                                    Enable
-                                    <input type="checkbox" id="showOverdueTickets" name="showOverdueTickets" ng-change="showOverdueTicketsChanged()" ng-model="showOverdueTickets">
-                                    <span class="lever"></span>
-                                </label>
+                <div data-settings-id="settings-tickets" {{#ifeq subnav compare='settings-tickets'}} class="active" {{/ifeq}}>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">
+                                    Default Ticket Type
+                                </h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Default ticket type for newly created tickets.
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative; padding-top: 5px;">
+                                <div class="uk-float-left" style="padding-right: 11px; min-width: 130px; width: 100%;">
+                                    <select class="selectize-white" name="type" id="type" ng-model="defaultTicketType"
+                                            data-md-selectize-inline2 selectize>
+                                        {{#each data.common.ticketTypes}}
+                                            <option value="{{{_id}}}">{{name}}</option>
+                                        {{/each}}
+                                    </select>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="setting-item-wrap uk-margin-medium-bottom">
-                    <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                        <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Allow Public Tickets</h6>
-                            <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Allow the creation of tickets by users that are unregistered. (<a href="/newissue" class="no-ajaxy">{{data.common.hosturl}}/newissue</a>)
-                            </h5>
-                        </div>
-                        <div class="right" style="position:relative;">
-                            <!-- Switch -->
-                            <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                <label>
-                                    Enable
-                                    <input type="checkbox" id="allowPublicTickets" name="allowPublicTickets" ng-change="allowPublicTicketsChanged()" ng-model="allowPublicTickets">
-                                    <span class="lever"></span>
-                                </label>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Allow Public Tickets</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Allow the creation of tickets by users that are unregistered. (<a href="/newissue" class="no-ajaxy">{{data.common.hosturl}}/newissue</a>)
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+                                <!-- Switch -->
+                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
+                                    <label>
+                                        Enable
+                                        <input type="checkbox" id="allowPublicTickets" name="allowPublicTickets" ng-change="allowPublicTicketsChanged()" ng-model="allowPublicTickets">
+                                        <span class="lever"></span>
+                                    </label>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="setting-item-wrap uk-margin-medium-bottom">
-                    <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                        <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Allow User Registration</h6>
-                            <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Allow users to create accounts on the login screen.
-                            </h5>
-                        </div>
-                        <div class="right" style="position:relative;">
-                            <!-- Switch -->
-                            <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                <label>
-                                    Enable
-                                    <input type="checkbox" id="allowUserRegistration" name="allowUserRegistration" ng-change="allowUserRegistrationChanged()" ng-model="allowUserRegistration">
-                                    <span class="lever"></span>
-                                </label>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Show Overdue Tickets
+                                    <i class="material-icons"
+                                       style="color: #888;
+                                            font-size: 16px;
+                                            cursor: pointer;
+                                            line-height: 3px;"
+                                       data-uk-tooltip="{cls:'long-text'}" title="If disabled, priority SLA times will not mark tickets overdue.">help</i>
+                                </h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Enable/Disable flashing of tickets based on SLA time of type priority.
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+                                <!-- Switch -->
+                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
+                                    <label>
+                                        Enable
+                                        <input type="checkbox" id="showOverdueTickets" name="showOverdueTickets" ng-change="showOverdueTicketsChanged()" ng-model="showOverdueTickets">
+                                        <span class="lever"></span>
+                                    </label>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <div class="setting-item-wrap uk-margin-medium-bottom">
-                    <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
-                        <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Mailer</h6>
-                            <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Preferences for trudesk to send email notifications to users.
-                            </h5>
-                        </div>
-                        <div class="right" style="position:relative;">
-                            <!-- Switch -->
-                            <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                <label>
-                                    Enable
-                                    <input id="mailerEnabled" name="mailerEnabled" type="checkbox" ng-model="mailerEnabled" ng-change="mailerEnabledChange()">
-                                    <span class="lever"></span>
-                                </label>
+                    <!--Ticket Types-->
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Ticket Types</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Create / Modify Ticket Types
+                                </h5>
                             </div>
-                        </div>
-                        <hr class="nomargin-top clear">
-                        <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
-                            <div class="uk-position-relative">
-                                <div class="uk-margin-medium-bottom">
-                                    <div class="right">
-                                        <div class="md-switch md-green" style="position: absolute; top: 5px; right: -15px; z-index: 99;">
-                                            <label>
-                                                Use SSLv3
-                                                <input id="mailerSSL" name="mailerSSL" type="checkbox" ng-model="mailerSSL" ng-change="mailerSSLChange()">
-                                                <span class="lever"></span>
-                                            </label>
-                                        </div>
+                            <div class="right" style="position:relative;">
+                                <div style="margin: 12px 15px 0 0;">
+                                    <button class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" ng-click="showCreateTicketTypeWindow($event);">Create</button>
+                                </div>
+                            </div>
+                            <hr class="nomargin-top clear">
+                            <div class="panel-body2" style="">
+                                <div class="uk-grid uk-grid-collapse">
+                                    <div class="uk-width-1-4 scrollable" style="background: #f7f8fa; min-height: 400px; max-height: 2000px; border-right: 1px solid #ccc;">
+                                        <ul class="settings-categories " style="border: none; height: auto;">
+                                            {{#forEach data.ticketTypes}}
+                                                <li data-key="{{_id}}" {{#ifeq isFirst compare=true}}class="active"{{/ifeq}} ng-click="switchTicketType($event);">
+                                                    <div class="setting-category">
+                                                        <h3>{{name}}</h3>
+                                                    </div>
+                                                </li>
+                                            {{/forEach}}
+                                        </ul>
                                     </div>
-                                    <label for="mailerHost">Mail Server</label>
-                                    <input id="mailerHost" class="md-input md-input-width-medium" name="mailerHost" type="text" ng-model="mailerHost" />
+                                    <div class="uk-width-3-4" style="padding: 20px 15px 15px 15px;">
+                                        {{#each data.ticketTypes}}
+                                            <div data-ticket-type-id="{{_id}}" {{#ifeq isFirst compare=true}}class="active" {{else}} class="hide"{{/ifeq}} style="{{#ifeq isFirst compare=true}}opacity: 1; {{else}}opacity: 0; {{/ifeq}} height: 100%;">
+                                                <div class="ticket-type-general-wrapper">
+                                                    <h2 class="text-light">General</h2>
+                                                    <hr style="margin: 5px 0 25px 0;" />
 
+                                                    <form ng-submit="submitUpdateTicketType($event, '{{_id}}');">
+                                                        <div class="uk-input-group">
+                                                            <div class="md-input-wrapper">
+                                                                <label for="ticket-type-name-{{_id}}">Type Name</label>
+                                                                <input id="ticket-type-name-{{_id}}" type="text" class="md-input" value="{{name}}">
+                                                            </div>
+                                                            <span class="uk-input-group-addon">
+                                                                <button type="submit" class="md-btn md-btn-small">Rename</button>
+                                                            </span>
+                                                        </div>
+                                                    </form>
+                                                </div>
+
+                                                <div class="priorities-wrapper uk-margin-medium-top">
+                                                    <h2 class="text-light uk-display-inline-block">Priorities
+                                                        <i class="material-icons"
+                                                            style="color: #888;
+                                                            font-size: 16px;
+                                                            cursor: pointer;
+                                                            line-height: 18px;"
+                                                            data-uk-tooltip="{cls:'long-text'}" title="Priorities linked to this type. <br /> Editing a priority will update all types linked.">help</i>
+                                                    </h2>
+                                                    <div class="uk-float-right">
+                                                        <button type="button" class="md-btn md-btn-flat md-btn-flat-success" ng-click="showAddPriorityToType('{{_id}}', $event);">Add</button>
+                                                    </div>
+                                                    <hr style="margin: 5px 0 25px 0;" />
+                                                    <div class="priority-loop zone">
+                                                        {{#forEach priorities}}
+                                                            <div id="t-{{../_id}}-view-p-{{_id}}" data-pId="{{_id}}" class="z-box uk-clearfix">
+                                                                <div class="uk-float-left">
+                                                                    <h5 class="p-{{_id}}-name" style="color: {{htmlColor}}; font-weight: bold;">{{name}}</h5>
+                                                                    <p class="uk-text-muted">SLA Overdue: <strong class="p-{{_id}}-overdueIn">{{durationFormat overdueIn 'minutes'}}</strong></p>
+                                                                </div>
+                                                                <div class="uk-float-right">
+                                                                    <div class="md-btn-group mt-5">
+                                                                        <a class="md-btn md-btn-small" ng-click="editTicketTypePriority('{{../_id}}', '{{_id}}', $event);">Edit</a>
+                                                                        <a class="md-btn md-btn-small md-btn-danger {{#ifeq default compare=true}}1disabled {{/ifeq}}" ng-click="submitRemoveTicketTypePriority('{{../_id}}', '{{_id}}', $event);">Remove</a>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            <div id="t-{{../_id}}-edit-p-{{_id}}" data-pId="{{_id}}" class="z-box uk-clearfix hide" style="padding-top: 19px;">
+                                                                <form data-priority-id="{{_id}}" ng-submit="submitUpdatePriority($event);">
+                                                                    <div class="uk-grid uk-grid-collapse uk-clearfix">
+                                                                        <div class="uk-width-1-4">
+                                                                            <label for="">Priority Name</label>
+                                                                            <input type="text" class="md-input" name="p-{{_id}}-name" value="{{name}}" />
+                                                                        </div>
+                                                                        <div class="uk-width-1-4 uk-padding-small-sides">
+                                                                            <label for="">SLA Overdue (minutes)</label>
+                                                                            <input type="text" class="md-input" name="p-{{_id}}-overdueIn" value="{{overdueIn}}" />
+                                                                        </div>
+                                                                        <div class="uk-width-1-4 uk-padding-small-sides">
+                                                                            <button type="button" class="uk-button uk-button-small uk-color-button mr-5 mt-10" style="background: {{htmlColor}}" ng-click="generateRandomColor('{{_id}}', $event);"><i class="material-icons">refresh</i></button>
+                                                                            <div class="md-input-wrapper uk-float-left" style="width: 70%;">
+                                                                                <label for="">Color</label>
+                                                                                <input type="text" class="md-input" name="p-{{_id}}-htmlColor" value="{{htmlColor}}" />
+                                                                                <span class="md-input-bar"></span>
+                                                                            </div>
+                                                                        </div>
+                                                                        <div class="uk-width-1-4">
+                                                                            <div class="md-btn-group uk-float-right uk-text-right mt-5">
+                                                                                <a class="md-btn md-btn-small" ng-click="cancelEditTicketTypePriority('{{../_id}}','{{_id}}', $event);">Cancel</a>
+                                                                                <button type="submit" class="md-btn md-btn-small md-btn-success">Save</button>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </form>
+                                                            </div>
+                                                        {{/forEach}}
+                                                        <!--<div class="z-box uk-accordion uk-width-1-2" data-uk-accordion="{easing: 'swing', showfirst:false}">-->
+                                                            <!--{{#forEach priorities}}-->
+                                                                    <!--<h3 class="uk-accordion-title uk-accordion-title-small" style="background: {{htmlColor}};">{{name}}</h3>-->
+                                                                    <!--<div class="uk-accordion-content">-->
+                                                                        <!--2134-->
+                                                                    <!--</div>-->
+
+                                                                <!--&lt;!&ndash;<div class="md-btn-group" style="margin-bottom: 15px;">&ndash;&gt;-->
+                                                                    <!--&lt;!&ndash;<div class="md-btn md-btn-small md-btn-wave" style="background: {{htmlColor}}; color: white; border-radius: 2px 0 0 2px;">{{name}}</div>&ndash;&gt;-->
+                                                                    <!--&lt;!&ndash;&lt;!&ndash;<div class="md-btn md-btn-small md-btn-wave" style="background: {{htmlColor}}; color: white; padding:0; min-width: 35px; border-radius: 0;">&ndash;&gt;&ndash;&gt;-->
+                                                                        <!--&lt;!&ndash;&lt;!&ndash;<i class="material-icons" style="font-size: 16px; margin-top: 5px;">edit</i>&ndash;&gt;&ndash;&gt;-->
+                                                                    <!--&lt;!&ndash;&lt;!&ndash;</div>&ndash;&gt;&ndash;&gt;-->
+                                                                    <!--&lt;!&ndash;&lt;!&ndash;<div class="md-btn md-btn-small md-btn-wave" style="background: {{htmlColor}}; color: white; padding:0; min-width: 35px; border-radius: 0 2px 2px 0;">&ndash;&gt;&ndash;&gt;-->
+                                                                        <!--&lt;!&ndash;&lt;!&ndash;<i class="material-icons" style="font-size: 16px; margin-top: 5px;">delete</i>&ndash;&gt;&ndash;&gt;-->
+                                                                    <!--&lt;!&ndash;&lt;!&ndash;</div>&ndash;&gt;&ndash;&gt;-->
+                                                                <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                                                            <!--{{/forEach}}-->
+                                                        <!--</div>-->
+                                                    </div>
+                                                </div>
+
+                                                <div style="margin-top: 25px;">
+                                                    <h2 class="text-light">Danger Zone</h2>
+                                                    <div class="danger-zone">
+                                                        <div class="dz-box uk-clearfix">
+                                                            <div class="uk-float-left">
+                                                                <h5>Delete this type</h5>
+                                                                <p>Once you delete a ticket type, there is no going back. Please be certain.</p>
+                                                            </div>
+                                                            <div class="uk-float-right" style="padding-top: 10px;">
+                                                                <button class="md-btn md-btn-small md-btn-danger" ng-click="showDeleteTicketType('{{_id}}', true)">Delete</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            {{> addPriorityToTypeWindow}}
+                                            {{> deleteTicketTypeWindow}}
+                                        {{/each}}
+                                    </div>
                                 </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerPort">Port</label>
-                                    <input id="mailerPort" class="md-input md-input-width-medium" name="mailerPort" type="text" value="25" ng-model="mailerPort" />
-                                </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerUsername">Auth Username</label>
-                                    <input id="mailerUsername" class="md-input md-input-width-medium" name="mailerUsername" type="text" ng-model="mailerUsername" />
-                                </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerPassword">Auth Password</label>
-                                    <input id="mailerPassword" class="md-input md-input-width-medium" name="mailerPassword" type="password" ng-model="mailerPassword" />
+                            </div>
+                        </div>
+                        {{> createTicketTypeWindow}}
+                    </div>
+
+                    <!--Ticket Priorities-->
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Ticket Priorities</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Ticket priorities set the level of SLAs for each ticket.
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+                                <div style="margin: 12px 15px 0 0;">
+                                    <button class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" ng-click="showCreatePriorityWindow($event);">Create</button>
                                 </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerFrom">From Address</label>
-                                    <input id="mailerFrom" class="md-input md-input-width-medium" name="mailerFrom" type="email" ng-model="mailerFrom" />
+                            </div>
+                            <hr class="nomargin-top clear">
+                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
+                                <div class="uk-position-relative">
+                                    <div class="all-priorities-loop zone">
+                                        {{#each data.priorities}}
+                                            <div id="view-p-{{_id}}" data-pId="{{_id}}" class="z-box uk-clearfix">
+                                                <div class="uk-float-left">
+                                                    <h5 class="p-{{_id}}-name" style="color: {{htmlColor}}; font-weight: bold;">{{name}}</h5>
+                                                    <p class="uk-text-muted">SLA Overdue: <strong class="p-{{_id}}-overdueIn">{{durationFormat overdueIn 'minutes'}}</strong></p>
+                                                </div>
+                                                <div class="uk-float-right">
+                                                    <div class="md-btn-group mt-5">
+                                                        <a class="md-btn md-btn-small" ng-click="editPriority('{{_id}}', $event);">Edit</a>
+                                                        <a class="md-btn md-btn-small md-btn-danger {{#ifeq default compare=true}}disabled {{/ifeq}}" ng-click="removePriorityClicked('{{_id}}', $event);">Remove</a>
+                                                    </div>
+                                                </div>
+                                            </div>
+
+                                            <div id="edit-p-{{_id}}" data-pId="{{_id}}" class="z-box uk-clearfix hide" style="padding-top: 19px;">
+                                                <form data-priority-id="{{_id}}" ng-submit="submitUpdatePriority($event);">
+                                                    <div class="uk-grid uk-grid-collapse uk-clearfix">
+                                                        <div class="uk-width-1-4">
+                                                            <label for="">Priority Name</label>
+                                                            <input type="text" class="md-input" name="p-{{_id}}-name" value="{{name}}" />
+                                                        </div>
+                                                        <div class="uk-width-1-4 uk-padding-small-sides">
+                                                            <label for="">SLA Overdue (minutes)</label>
+                                                            <input type="text" class="md-input" name="p-{{_id}}-overdueIn" value="{{overdueIn}}" />
+                                                        </div>
+                                                        <div class="uk-width-1-4 uk-padding-small-sides">
+                                                            <button class="uk-button uk-button-small uk-color-button mr-5 mt-10" style="background: {{htmlColor}}" ng-click="generateRandomColor('{{_id}}', $event);"><i class="material-icons">refresh</i></button>
+                                                            <div class="md-input-wrapper uk-float-left" style="width: 70%;">
+                                                                <label for="">Color</label>
+                                                                <input type="text" class="md-input" name="p-{{_id}}-htmlColor" value="{{htmlColor}}" />
+                                                                <span class="md-input-bar"></span>
+                                                            </div>
+                                                        </div>
+                                                        <div class="uk-width-1-4">
+                                                            <div class="md-btn-group uk-float-right uk-text-right mt-5">
+                                                                <a class="md-btn md-btn-small" ng-click="cancelEditPriority('{{_id}}', $event);">Cancel</a>
+                                                                <button type="submit" class="md-btn md-btn-small md-btn-success">Save</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </form>
+                                            </div>
+
+                                            {{> deletePriorityWindow}}
+                                        {{/each}}
+                                    </div>
                                 </div>
+                            </div>
+                        </div>
 
-                                <div class="uk-clearfix">
-                                    <button type="submit" class="uk-float-left md-btn md-btn-flat md-btn-flat-primary md-btn-wave-light" id="mailerTest" ng-click="submitTestMailer($event)">Test Settings</button>
-                                    <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="mailerSubmit" ng-click="mailerFormSubmit($event);">Apply</button>
+                        {{> createPriorityWindow}}
+                    </div>
+
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Ticket Tags</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Create / Modify Ticket Tags
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+
+                            </div>
+                            <hr class="nomargin-top clear">
+                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
+                                <div class="uk-position-relative">
+                                    <div class="uk-margin-medium-bottom">
+
+                                    </div>
+
+                                    <div class="uk-clearfix">
+
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
+
                 </div>
-                <div class="setting-item-wrap uk-margin-medium-bottom">
-                    <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                        <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Mailer Check</h6>
-                            <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Trudesk will periodically check a mailbox for emails to convert to tickets. (Over IMAP) - <em>Settings are applied after server restart</em>
-                            </h5>
-                        </div>
-                        <div class="right" style="position:relative;">
-                            <!-- Switch -->
-                            <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                <label>
-                                    Enable
-                                    <input id="mailerCheckEnabled" name="mailerCheckEnabled" type="checkbox" ng-model="mailerCheckEnabled" ng-change="mailerCheckEnabledChange()" />
-                                    <span class="lever"></span>
-                                </label>
+
+                <div data-settings-id="settings-mailer" {{#ifeq subnav compare='settings-mailer'}} class="active" {{/ifeq}}>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Mailer</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Preferences for trudesk to send email notifications to users.
+                                </h5>
                             </div>
-                        </div>
-                        <hr class="nomargin-top clear">
-                        <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
-                            <div class="">
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerCheckHost">Mail Server</label>
-                                    <input id="mailerCheckHost" class="md-input md-input-width-medium" name="mailerCheckHost" type="text" ng-model="mailerCheckHost"/>
+                            <div class="right" style="position:relative;">
+                                <!-- Switch -->
+                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
+                                    <label>
+                                        Enable
+                                        <input id="mailerEnabled" name="mailerEnabled" type="checkbox" ng-model="mailerEnabled" ng-change="mailerEnabledChange()">
+                                        <span class="lever"></span>
+                                    </label>
                                 </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerCheckPort">Port</label>
-                                    <input id="mailerCheckPort" class="md-input md-input-width-medium" name="mailerCheckPort" type="text" value="143" ng-model="mailerCheckPort"/>
+                            </div>
+                            <hr class="nomargin-top clear">
+                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
+                                <div class="uk-position-relative">
+                                    <div class="uk-margin-medium-bottom">
+                                        <div class="right">
+                                            <div class="md-switch md-green" style="position: absolute; top: 5px; right: -15px; z-index: 99;">
+                                                <label>
+                                                    Use SSLv3
+                                                    <input id="mailerSSL" name="mailerSSL" type="checkbox" ng-model="mailerSSL" ng-change="mailerSSLChange()">
+                                                    <span class="lever"></span>
+                                                </label>
+                                            </div>
+                                        </div>
+                                        <label for="mailerHost">Mail Server</label>
+                                        <input id="mailerHost" class="md-input md-input-width-medium" name="mailerHost" type="text" ng-model="mailerHost" />
+
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerPort">Port</label>
+                                        <input id="mailerPort" class="md-input md-input-width-medium" name="mailerPort" type="text" value="25" ng-model="mailerPort" />
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerUsername">Auth Username</label>
+                                        <input id="mailerUsername" class="md-input md-input-width-medium" name="mailerUsername" type="text" ng-model="mailerUsername" />
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerPassword">Auth Password</label>
+                                        <input id="mailerPassword" class="md-input md-input-width-medium" name="mailerPassword" type="password" ng-model="mailerPassword" />
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerFrom">From Address</label>
+                                        <input id="mailerFrom" class="md-input md-input-width-medium" name="mailerFrom" type="email" ng-model="mailerFrom" />
+                                    </div>
+
+                                    <div class="uk-clearfix">
+                                        <button type="submit" class="uk-float-left md-btn md-btn-flat md-btn-flat-primary md-btn-wave-light" id="mailerTest" ng-click="submitTestMailer($event)">Test Settings</button>
+                                        <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="mailerSubmit" ng-click="mailerFormSubmit($event);">Apply</button>
+                                    </div>
                                 </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerCheckUsername">Username</label>
-                                    <input id="mailerCheckUsername" class="md-input md-input-width-medium" name="mailerCheckUsername" type="text" ng-model="mailerCheckUsername"/>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Mailer Check</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Trudesk will periodically check a mailbox for emails to convert to tickets. (Over IMAP) - <em>Settings are applied after server restart</em>
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+                                <!-- Switch -->
+                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
+                                    <label>
+                                        Enable
+                                        <input id="mailerCheckEnabled" name="mailerCheckEnabled" type="checkbox" ng-model="mailerCheckEnabled" ng-change="mailerCheckEnabledChange()" />
+                                        <span class="lever"></span>
+                                    </label>
                                 </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerCheckPassword">Password</label>
-                                    <input id="mailerCheckPassword" class="md-input md-input-width-medium" name="mailerCheckPassword" type="password" ng-model="mailerCheckPassword"/>
+                            </div>
+                            <hr class="nomargin-top clear">
+                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
+                                <div class="">
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerCheckHost">Mail Server</label>
+                                        <input id="mailerCheckHost" class="md-input md-input-width-medium" name="mailerCheckHost" type="text" ng-model="mailerCheckHost"/>
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerCheckPort">Port</label>
+                                        <input id="mailerCheckPort" class="md-input md-input-width-medium" name="mailerCheckPort" type="text" value="143" ng-model="mailerCheckPort"/>
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerCheckUsername">Username</label>
+                                        <input id="mailerCheckUsername" class="md-input md-input-width-medium" name="mailerCheckUsername" type="text" ng-model="mailerCheckUsername"/>
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerCheckPassword">Password</label>
+                                        <input id="mailerCheckPassword" class="md-input md-input-width-medium" name="mailerCheckPassword" type="password" ng-model="mailerCheckPassword"/>
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="mailerCheckTicketType">Default Ticket Type</label>
+                                        <select name="mailerCheckTicketType" id="mailerCheckTicketType" class="selectize-white selectize-noremove" data-md-selectize-inline data-md-selectize-bottom="true" data-md-selectize-top-offset="-12">
+                                            {{#each data.common.ticketTypes}}
+                                                <option value="{{{_id}}}">{{name}}</option>
+                                            {{/each}}
+                                        </select>
+                                    </div>
+                                    <div class="uk-clearfix">
+                                        <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="mailerCheckSubmit" ng-click="mailerCheckFormSubmit($event)">Apply</button>
+                                    </div>
                                 </div>
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="mailerCheckTicketType">Default Ticket Type</label>
-                                    <select name="mailerCheckTicketType" id="mailerCheckTicketType" class="selectize-white selectize-noremove" data-md-selectize-inline data-md-selectize-bottom="true" data-md-selectize-top-offset="-12">
-                                        {{#each data.common.ticketTypes}}
-                                            <option value="{{{_id}}}">{{name}}</option>
-                                        {{/each}}
-                                    </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div data-settings-id="settings-notifications" {{#ifeq subnav compare='settings-notifcations'}} class="active" {{/ifeq}}>
+
+                </div>
+
+                <div data-settings-id="settings-tps" {{#ifeq subnav compare='settings-tps'}} class="active" {{/ifeq}}>
+                    <div class="setting-item-wrap uk-margin-medium-bottom">
+                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
+                            <div class="left">
+                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">TPS</h6>
+                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
+                                    Trudesk Push Server authentication for push notifications. <a href="http://push.trudesk.io/signup" target="_blank">Get API Key</a>
+                                </h5>
+                            </div>
+                            <div class="right" style="position:relative;">
+                                <!-- Switch -->
+                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
+                                    <label>
+                                        Enable
+                                        <input id="tpsEnabled" name="tpsEnabled" type="checkbox" ng-model="tpsEnabled" ng-change="tpsEnabledChange()">
+                                        <span class="lever"></span>
+                                    </label>
                                 </div>
-                                <div class="uk-clearfix">
-                                    <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="mailerCheckSubmit" ng-click="mailerCheckFormSubmit($event)">Apply</button>
+                            </div>
+                            <hr class="nomargin-top clear">
+                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
+                                <div class="">
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="tpsUsername">Username</label>
+                                        <input id="tpsUsername" class="md-input md-input-width-medium" name="tpsUsername" type="text" ng-model="tpsUsername" />
+                                    </div>
+                                    <div class="uk-margin-medium-bottom">
+                                        <label for="tspAPIKey">API Key</label>
+                                        <input id="tspAPIKey" class="md-input md-input-width-medium" name="tpsApiKey" type="text" ng-model="tpsApiKey" />
+                                    </div>
+                                    <div class="uk-clearfix">
+                                        <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="tpsSubmit" ng-click="tpsFormSubmit($event);">Apply</button>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
 
-                <div class="setting-item-wrap uk-margin-medium-bottom">
+                <div data-settings-id="settings-legal" {{#ifeq subnav compare='settings-legal'}} class="active" {{/ifeq}}>
                     <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
                         <div class="left">
-                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">TPS</h6>
+                            <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Privacy Policy</h6>
                             <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                Trudesk Push Server authentication for push notifications. <a href="http://push.trudesk.io/signup" target="_blank">Get API Key</a>
+                                Paste in HTML / Text of your privacy policy.
                             </h5>
                         </div>
                         <div class="right" style="position:relative;">
-                            <!-- Switch -->
-                            <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                <label>
-                                    Enable
-                                    <input id="tpsEnabled" name="tpsEnabled" type="checkbox" ng-model="tpsEnabled" ng-change="tpsEnabledChange()">
-                                    <span class="lever"></span>
-                                </label>
-                            </div>
                         </div>
-                        <hr class="nomargin-top clear">
+                        <hr class="nomargin-top">
                         <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
-                            <div class="">
-                                <div class="uk-margin-medium-bottom">
-                                    <label for="tpsUsername">Username</label>
-                                    <input id="tpsUsername" class="md-input md-input-width-medium" name="tpsUsername" type="text" ng-model="tpsUsername" />
-                                </div>
+                            <div class="uk-position-relative">
                                 <div class="uk-margin-medium-bottom">
-                                    <label for="tspAPIKey">API Key</label>
-                                    <input id="tspAPIKey" class="md-input md-input-width-medium" name="tpsApiKey" type="text" ng-model="tpsApiKey" />
+                                    <textarea name="privacyPolicy" id="privacyPolicy" wrap="soft" ng-model="privacyPolicy"
+                                              style="
+                                              height: 350px;
+                                              width: 100%;
+                                              padding: 15px;
+                                              font-size: 12px;
+                                              resize: none;
+                                              overflow: auto;
+                                              overflow-wrap: normal;
+                                              white-space: pre;
+                                    "></textarea>
                                 </div>
                                 <div class="uk-clearfix">
-                                    <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="tpsSubmit" ng-click="tpsFormSubmit($event);">Apply</button>
+                                    <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="privacyPolicySubmit" ng-click="savePrivacyPolicy($event);">Save</button>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-
             </div>
         </div>
     </div>
diff --git a/src/views/subviews/settings/settings-tickets.hbs b/src/views/subviews/settings/settings-tickets.hbs
deleted file mode 100644
index 90bf26d3d..000000000
--- a/src/views/subviews/settings/settings-tickets.hbs
+++ /dev/null
@@ -1,474 +0,0 @@
-<div class="uk-grid uk-grid-collapse" ng-controller="settingsCtrl" ng-init="
-    defaultTicketType='{{data.settings.defaultTicketType.value}}';
-    mailerEnabled={{data.settings.mailerEnabled.value}};
-    mailerHost='{{data.settings.mailerHost.value}}';
-    mailerSSL={{data.settings.mailerSSL.value}};
-    mailerPort={{data.settings.mailerPort.value}};
-    mailerUsername='{{data.settings.mailerUsername.value}}';
-    mailerPassword='{{data.settings.mailerPassword.value}}';
-    mailerFrom='{{data.settings.mailerFrom.value}}';
-
-    mailerCheckEnabled={{data.settings.mailerCheckEnabled.value}};
-    mailerCheckHost='{{data.settings.mailerCheckHost.value}}';
-    mailerCheckPort={{data.settings.mailerCheckPort.value}};
-    mailerCheckUsername='{{data.settings.mailerCheckUsername.value}}';
-    mailerCheckPassword='{{data.settings.mailerCheckPassword.value}}';
-    mailerCheckTicketType='{{data.settings.mailerCheckTicketType.value}}';
-
-    showTour={{data.settings.showTour.value}};
-    showOverdueTickets={{data.settings.showOverdueTickets.value}};
-    allowPublicTickets={{data.settings.allowPublicTickets.value}};
-    allowUserRegistration={{data.settings.allowUserRegistration.value}};
-    tpsEnabled={{data.settings.tpsEnabled.value}};
-    tpsUsername='{{data.settings.tpsUsername.value}}';
-    tpsApiKey='{{data.settings.tpsApiKey.value}}';
-
-    init();
-">
-    <div class="uk-width-2-10 message-list full-height" data-offset="68">
-        <div class="page-title noshadow nopadding-right" style="border-top: none !important; height: 68px !important; padding-left: 20px !important;">
-            <div class="page-title-border-right1" style="position:relative;">
-                <p style="font-size: 24px;">Settings</p>
-            </div>
-
-        </div>
-
-        <div id="" class="page-content-left noborder full-height">
-            <ul class="settings-categories scrollable">
-                <li {{#ifeq subnav compare='settings-general'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-general');">
-                    <div class="setting-category">
-                        <h3>General</h3>
-                    </div>
-                </li>
-                <li {{#ifeq subnav compare='settings-tickets'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-tickets');">
-                    <div class="setting-category">
-                        <h3>Tickets</h3>
-                    </div>
-                </li>
-                <li {{#ifeq subnav compare='settings-mailer'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-mailer');">
-                    <div class="setting-category">
-                        <h3>Mailer</h3>
-                    </div>
-                </li>
-                <li {{#ifeq subnav compare='settings-notifications'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-notifications');">
-                    <div class="setting-category">
-                        <h3>Notifications</h3>
-                    </div>
-                </li>
-                <li {{#ifeq subnav compare='settings-tps'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-tps');">
-                    <div class="setting-category">
-                        <h3>Push Service</h3>
-                    </div>
-                </li>
-                <li {{#ifeq subnav compare='settings-legal'}} class="active" {{/ifeq}} ng-click="switchSettings($event, 'settings-legal');">
-                    <div class="setting-category">
-                        <h3>Legal</h3>
-                    </div>
-                </li>
-            </ul>
-        </div>
-    </div>
-    <div class="uk-width-8-10">
-        <div class="page-title-right noshadow page-title-border-bottom" style="border-top: none !important; height: 69px !important;"></div>
-        <div class="page-wrapper full-height scrollable no-overflow-x">
-            <div class="settings-wrap">
-                <div data-settings-id="settings-general" {{#ifeq subnav compare='settings-general'}} class="active" {{/ifeq}}>
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Show Tour - <i style="font-size: 13px; color: #a1a1a1;">Beta</i></h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Tour the user interface on initial login.
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <!-- Switch -->
-                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                    <label>
-                                        Enable
-                                        <input type="checkbox" id="showTour" name="showTour" ng-change="showTourChanged()" ng-model="showTour">
-                                        <span class="lever"></span>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Allow User Registration</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Allow users to create accounts on the login screen.
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <!-- Switch -->
-                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                    <label>
-                                        Enable
-                                        <input type="checkbox" id="allowUserRegistration" name="allowUserRegistration" ng-change="allowUserRegistrationChanged()" ng-model="allowUserRegistration">
-                                        <span class="lever"></span>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div data-settings-id="settings-tickets" {{#ifeq subnav compare='settings-tickets'}} class="active" {{/ifeq}}>
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">
-                                    Default Ticket Type
-                                </h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Default ticket type for newly created tickets.
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative; padding-top: 5px;">
-                                <div class="uk-float-left" style="padding-right: 11px; min-width: 130px; width: 100%;">
-                                    <select class="selectize-white" name="type" id="type" ng-model="defaultTicketType"
-                                            data-md-selectize-inline2 selectize>
-                                        {{#each data.common.ticketTypes}}
-                                            <option value="{{{_id}}}">{{name}}</option>
-                                        {{/each}}
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Allow Public Tickets</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Allow the creation of tickets by users that are unregistered. (<a href="/newissue" class="no-ajaxy">{{data.common.hosturl}}/newissue</a>)
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <!-- Switch -->
-                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                    <label>
-                                        Enable
-                                        <input type="checkbox" id="allowPublicTickets" name="allowPublicTickets" ng-change="allowPublicTicketsChanged()" ng-model="allowPublicTickets">
-                                        <span class="lever"></span>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Show Overdue Tickets</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Flash tickets that have been idle for a length of time.
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <!-- Switch -->
-                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                    <label>
-                                        Enable
-                                        <input type="checkbox" id="showOverdueTickets" name="showOverdueTickets" ng-change="showOverdueTicketsChanged()" ng-model="showOverdueTickets">
-                                        <span class="lever"></span>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Ticket Types</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Create / Modify Ticket Types
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <div style="margin: 12px 15px 0 0;">
-                                    <button class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" ng-click="showCreateTicketTypeWindow($event);">Create</button>
-                                </div>
-                            </div>
-                            <hr class="nomargin-top clear">
-                            <div class="panel-body2" style="">
-                                <div class="uk-grid uk-grid-collapse">
-                                    <div class="uk-width-1-3 scrollable" style="min-height: 400px; max-height: 800px; border-right: 1px solid #ccc;">
-                                        <ul class="settings-categories " style="border: none; height: auto;">
-                                            {{#forEach data.ticketTypes}}
-                                                <li data-key="{{_id}}" {{#ifeq isFirst compare=true}}class="active"{{/ifeq}} ng-click="switchTicketType($event);">
-                                                    <div class="setting-category">
-                                                        <h3>{{name}}</h3>
-                                                    </div>
-                                                </li>
-                                            {{/forEach}}
-                                        </ul>
-                                    </div>
-                                    <div class="uk-width-2-3" style="padding: 20px 15px 15px 15px;">
-                                        {{#each data.ticketTypes}}
-                                            <div data-ticket-type-id="{{_id}}" {{#ifeq isFirst compare=true}}class="active" {{else}} class="hide"{{/ifeq}} style="{{#ifeq isFirst compare=true}}opacity: 1; {{else}}opacity: 0; {{/ifeq}} height: 100%;">
-                                                <div class="ticket-type-general-wrapper">
-                                                    <h2 class="text-light">General</h2>
-                                                    <hr style="margin: 5px 0 25px 0;" />
-
-                                                    <form ng-submit="submitUpdateTicketType($event, '{{_id}}');">
-                                                        <div class="uk-input-group">
-                                                            <div class="md-input-wrapper">
-                                                                <label for="ticket-type-name-{{_id}}">Type Name</label>
-                                                                <input id="ticket-type-name-{{_id}}" type="text" class="md-input" value="{{name}}">
-                                                            </div>
-                                                            <span class="uk-input-group-addon">
-                                                                <button type="submit" class="md-btn md-btn-small">Rename</button>
-                                                            </span>
-                                                        </div>
-                                                    </form>
-                                                </div>
-
-                                                <div class="priorities-wrapper uk-margin-medium-top">
-                                                    <h2 class="text-light uk-display-inline-block">Priorities
-                                                        <i class="material-icons"
-                                                            style="color: #888;
-                                                            font-size: 16px;
-                                                            cursor: pointer;
-                                                            line-height: 18px;"
-                                                            data-uk-tooltip="{cls:'long-text'}" title="Priorities linked to this type. <br /> Default priorities can be renamed, but cannot be removed.">help</i>
-                                                    </h2>
-                                                    <div class="uk-float-right">
-                                                        <button class="md-btn md-btn-flat md-btn-flat-success">Add</button>
-                                                    </div>
-                                                    <hr style="margin: 5px 0 25px 0;" />
-                                                    <div class="zone">
-                                                        {{#forEach priorities}}
-                                                            <div class="z-box uk-clearfix">
-                                                                <div class="uk-float-left">
-                                                                    <h5 style="color: {{htmlColor}}; font-weight: bold;">{{name}}</h5>
-                                                                    <p class="uk-text-muted">SLA Overdue: <strong>{{durationFormat overdueIn 'minutes'}}</strong></p>
-                                                                </div>
-                                                                <div class="uk-float-right">
-                                                                    <div class="md-btn-group">
-                                                                        <a class="md-btn md-btn-small">Edit</a>
-                                                                        <a class="md-btn md-btn-small md-btn-danger {{#ifeq default compare=true}}disabled {{/ifeq}}">Remove</a>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        {{/forEach}}
-                                                        <!--<div class="z-box uk-accordion uk-width-1-2" data-uk-accordion="{easing: 'swing', showfirst:false}">-->
-                                                            <!--{{#forEach priorities}}-->
-                                                                    <!--<h3 class="uk-accordion-title uk-accordion-title-small" style="background: {{htmlColor}};">{{name}}</h3>-->
-                                                                    <!--<div class="uk-accordion-content">-->
-                                                                        <!--2134-->
-                                                                    <!--</div>-->
-
-                                                                <!--&lt;!&ndash;<div class="md-btn-group" style="margin-bottom: 15px;">&ndash;&gt;-->
-                                                                    <!--&lt;!&ndash;<div class="md-btn md-btn-small md-btn-wave" style="background: {{htmlColor}}; color: white; border-radius: 2px 0 0 2px;">{{name}}</div>&ndash;&gt;-->
-                                                                    <!--&lt;!&ndash;&lt;!&ndash;<div class="md-btn md-btn-small md-btn-wave" style="background: {{htmlColor}}; color: white; padding:0; min-width: 35px; border-radius: 0;">&ndash;&gt;&ndash;&gt;-->
-                                                                        <!--&lt;!&ndash;&lt;!&ndash;<i class="material-icons" style="font-size: 16px; margin-top: 5px;">edit</i>&ndash;&gt;&ndash;&gt;-->
-                                                                    <!--&lt;!&ndash;&lt;!&ndash;</div>&ndash;&gt;&ndash;&gt;-->
-                                                                    <!--&lt;!&ndash;&lt;!&ndash;<div class="md-btn md-btn-small md-btn-wave" style="background: {{htmlColor}}; color: white; padding:0; min-width: 35px; border-radius: 0 2px 2px 0;">&ndash;&gt;&ndash;&gt;-->
-                                                                        <!--&lt;!&ndash;&lt;!&ndash;<i class="material-icons" style="font-size: 16px; margin-top: 5px;">delete</i>&ndash;&gt;&ndash;&gt;-->
-                                                                    <!--&lt;!&ndash;&lt;!&ndash;</div>&ndash;&gt;&ndash;&gt;-->
-                                                                <!--&lt;!&ndash;</div>&ndash;&gt;-->
-                                                            <!--{{/forEach}}-->
-                                                        <!--</div>-->
-                                                    </div>
-                                                </div>
-
-                                                <div style="margin-top: 25px;">
-                                                    <h2 class="text-light">Danger Zone</h2>
-                                                    <div class="danger-zone">
-                                                        <div class="dz-box uk-clearfix">
-                                                            <div class="uk-float-left">
-                                                                <h5>Delete this type</h5>
-                                                                <p>Once you delete a ticket type, there is no going back. Please be certain.</p>
-                                                            </div>
-                                                            <div class="uk-float-right" style="padding-top: 10px;">
-                                                                <button class="md-btn md-btn-small md-btn-danger">Delete</button>
-                                                            </div> 
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        {{/each}}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        {{> createTicketTypeWindow}}
-                    </div>
-
-                </div>
-
-                <div data-settings-id="settings-mailer" {{#ifeq subnav compare='settings-mailer'}} class="active" {{/ifeq}}>
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Mailer</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Preferences for trudesk to send email notifications to users.
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <!-- Switch -->
-                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                    <label>
-                                        Enable
-                                        <input id="mailerEnabled" name="mailerEnabled" type="checkbox" ng-model="mailerEnabled" ng-change="mailerEnabledChange()">
-                                        <span class="lever"></span>
-                                    </label>
-                                </div>
-                            </div>
-                            <hr class="nomargin-top clear">
-                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
-                                <div class="uk-position-relative">
-                                    <div class="uk-margin-medium-bottom">
-                                        <div class="right">
-                                            <div class="md-switch md-green" style="position: absolute; top: 5px; right: -15px; z-index: 99;">
-                                                <label>
-                                                    Use SSLv3
-                                                    <input id="mailerSSL" name="mailerSSL" type="checkbox" ng-model="mailerSSL" ng-change="mailerSSLChange()">
-                                                    <span class="lever"></span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                        <label for="mailerHost">Mail Server</label>
-                                        <input id="mailerHost" class="md-input md-input-width-medium" name="mailerHost" type="text" ng-model="mailerHost" />
-
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerPort">Port</label>
-                                        <input id="mailerPort" class="md-input md-input-width-medium" name="mailerPort" type="text" value="25" ng-model="mailerPort" />
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerUsername">Auth Username</label>
-                                        <input id="mailerUsername" class="md-input md-input-width-medium" name="mailerUsername" type="text" ng-model="mailerUsername" />
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerPassword">Auth Password</label>
-                                        <input id="mailerPassword" class="md-input md-input-width-medium" name="mailerPassword" type="password" ng-model="mailerPassword" />
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerFrom">From Address</label>
-                                        <input id="mailerFrom" class="md-input md-input-width-medium" name="mailerFrom" type="email" ng-model="mailerFrom" />
-                                    </div>
-
-                                    <div class="uk-clearfix">
-                                        <button type="submit" class="uk-float-left md-btn md-btn-flat md-btn-flat-primary md-btn-wave-light" id="mailerTest" ng-click="submitTestMailer($event)">Test Settings</button>
-                                        <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="mailerSubmit" ng-click="mailerFormSubmit($event);">Apply</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow" style="min-height: 60px;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">Mailer Check</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Trudesk will periodically check a mailbox for emails to convert to tickets. (Over IMAP) - <em>Settings are applied after server restart</em>
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <!-- Switch -->
-                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                    <label>
-                                        Enable
-                                        <input id="mailerCheckEnabled" name="mailerCheckEnabled" type="checkbox" ng-model="mailerCheckEnabled" ng-change="mailerCheckEnabledChange()" />
-                                        <span class="lever"></span>
-                                    </label>
-                                </div>
-                            </div>
-                            <hr class="nomargin-top clear">
-                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
-                                <div class="">
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerCheckHost">Mail Server</label>
-                                        <input id="mailerCheckHost" class="md-input md-input-width-medium" name="mailerCheckHost" type="text" ng-model="mailerCheckHost"/>
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerCheckPort">Port</label>
-                                        <input id="mailerCheckPort" class="md-input md-input-width-medium" name="mailerCheckPort" type="text" value="143" ng-model="mailerCheckPort"/>
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerCheckUsername">Username</label>
-                                        <input id="mailerCheckUsername" class="md-input md-input-width-medium" name="mailerCheckUsername" type="text" ng-model="mailerCheckUsername"/>
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerCheckPassword">Password</label>
-                                        <input id="mailerCheckPassword" class="md-input md-input-width-medium" name="mailerCheckPassword" type="password" ng-model="mailerCheckPassword"/>
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="mailerCheckTicketType">Default Ticket Type</label>
-                                        <select name="mailerCheckTicketType" id="mailerCheckTicketType" class="selectize-white selectize-noremove" data-md-selectize-inline data-md-selectize-bottom="true" data-md-selectize-top-offset="-12">
-                                            {{#each data.common.ticketTypes}}
-                                                <option value="{{{_id}}}">{{name}}</option>
-                                            {{/each}}
-                                        </select>
-                                    </div>
-                                    <div class="uk-clearfix">
-                                        <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="mailerCheckSubmit" ng-click="mailerCheckFormSubmit($event)">Apply</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div data-settings-id="settings-notifications" {{#ifeq subnav compare='settings-notifcations'}} class="active" {{/ifeq}}>
-
-                </div>
-
-                <div data-settings-id="settings-tps" {{#ifeq subnav compare='settings-tps'}} class="active" {{/ifeq}}>
-                    <div class="setting-item-wrap uk-margin-medium-bottom">
-                        <div class="panel trupanel nopadding no-hover-shadow uk-overflow-hidden" style="min-height: 60px; height: auto;">
-                            <div class="left">
-                                <h6 style="padding: 0 0 0 15px; margin: 15px 0 0 0; font-size: 16px; line-height: 14px;">TPS</h6>
-                                <h5 style="padding: 0 0 10px 15px; margin: 2px 0 0 0; font-size: 12px;" class="uk-text-muted">
-                                    Trudesk Push Server authentication for push notifications. <a href="http://push.trudesk.io/signup" target="_blank">Get API Key</a>
-                                </h5>
-                            </div>
-                            <div class="right" style="position:relative;">
-                                <!-- Switch -->
-                                <div class="md-switch md-green" style="margin: 20px 0 0 0;">
-                                    <label>
-                                        Enable
-                                        <input id="tpsEnabled" name="tpsEnabled" type="checkbox" ng-model="tpsEnabled" ng-change="tpsEnabledChange()">
-                                        <span class="lever"></span>
-                                    </label>
-                                </div>
-                            </div>
-                            <hr class="nomargin-top clear">
-                            <div class="panel-body2" style="padding: 20px 15px 15px 15px;">
-                                <div class="">
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="tpsUsername">Username</label>
-                                        <input id="tpsUsername" class="md-input md-input-width-medium" name="tpsUsername" type="text" ng-model="tpsUsername" />
-                                    </div>
-                                    <div class="uk-margin-medium-bottom">
-                                        <label for="tspAPIKey">API Key</label>
-                                        <input id="tspAPIKey" class="md-input md-input-width-medium" name="tpsApiKey" type="text" ng-model="tpsApiKey" />
-                                    </div>
-                                    <div class="uk-clearfix">
-                                        <button type="submit" class="uk-float-right md-btn md-btn-flat md-btn-flat-success md-btn-wave-light" id="tpsSubmit" ng-click="tpsFormSubmit($event);">Apply</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div data-settings-id="settings-legal" {{#ifeq subnav compare='settings-legal'}} class="active" {{/ifeq}}>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-{{#contentFor 'js-plugins'}}
-
-{{/contentFor}}
\ No newline at end of file
diff --git a/src/views/tickets.hbs b/src/views/tickets.hbs
index f5a294472..79bbd5f31 100644
--- a/src/views/tickets.hbs
+++ b/src/views/tickets.hbs
@@ -116,7 +116,7 @@
                     <tbody>
                     {{#each data.tickets}}
                         {{#if_eq status compare=0}}
-                            <tr class="ticket-new  {{#overdue ../data.common.showOverdue date updated priority.overdueIn}} overdue {{/overdue}}" data-ticket="{{uid}}" data-ticketOid="{{_id}}">
+                            <tr class="ticket-new{{#overdue ../data.common.showOverdue date updated priority.overdueIn}} overdue {{/overdue}}" data-ticket="{{uid}}" data-ticketOid="{{_id}}">
                                 <td class="ticket-priority" style="border-color: {{priority.htmlColor}}">
                                     <input id="c_{{_id}}" type="checkbox" class="poloCheckbox" />
                                     <label for="c_{{_id}}"></label>
@@ -144,7 +144,7 @@
                             </tr>
                         {{/if_eq}}
                         {{#is status 1}}
-                            <tr class="ticket-open {{#overdue ../data.common.showOverdue date updated priority.overdueIn}} overdue {{/overdue}}" data-ticket="{{uid}}" data-ticketOid="{{_id}}">
+                            <tr class="ticket-open{{#overdue ../data.common.showOverdue date updated priority.overdueIn}} overdue {{/overdue}}" data-ticket="{{uid}}" data-ticketOid="{{_id}}">
                                 <td class="ticket-priority" style="border-color: {{priority.htmlColor}}">
                                     <input id="c_{{_id}}" type="checkbox" class="poloCheckbox"/>
                                     <label for="c_{{_id}}"></label>