diff --git a/src/client/containers/Departments/index.jsx b/src/client/containers/Departments/index.jsx
index 23149c6c9..a232e5f17 100644
--- a/src/client/containers/Departments/index.jsx
+++ b/src/client/containers/Departments/index.jsx
@@ -25,6 +25,7 @@ import Button from 'components/Button'
 import PageContent from 'components/PageContent'
 
 import UIKit from 'uikit'
+import helpers from 'lib/helpers'
 
 class DepartmentsContainer extends React.Component {
   componentDidMount () {
@@ -60,10 +61,6 @@ class DepartmentsContainer extends React.Component {
   }
 
   render () {
-    const mappedDepartments = this.props.departments.map(department => {
-      return department.name
-    })
-
     return (
       <div>
         <PageTitle
@@ -157,19 +154,23 @@ class DepartmentsContainer extends React.Component {
                     </td>
                     <td>
                       <ButtonGroup>
-                        <Button
-                          text={'Edit'}
-                          small={true}
-                          waves={true}
-                          onClick={() => this.onEditDepartmentClick(department)}
-                        />
-                        <Button
-                          text={'Delete'}
-                          style={'danger'}
-                          small={true}
-                          waves={true}
-                          onClick={() => this.onDeleteDepartmentClick(department.get('_id'))}
-                        />
+                        {helpers.canUser('departments:update', true) && (
+                          <Button
+                            text={'Edit'}
+                            small={true}
+                            waves={true}
+                            onClick={() => this.onEditDepartmentClick(department)}
+                          />
+                        )}
+                        {helpers.canUser('departments:delete', true) && (
+                          <Button
+                            text={'Delete'}
+                            style={'danger'}
+                            small={true}
+                            waves={true}
+                            onClick={() => this.onDeleteDepartmentClick(department.get('_id'))}
+                          />
+                        )}
                       </ButtonGroup>
                     </td>
                   </tr>
diff --git a/src/client/containers/Groups/index.jsx b/src/client/containers/Groups/index.jsx
index a9775731e..517f6fdbb 100644
--- a/src/client/containers/Groups/index.jsx
+++ b/src/client/containers/Groups/index.jsx
@@ -29,6 +29,7 @@ import TableCell from 'components/Table/TableCell'
 import ButtonGroup from 'components/ButtonGroup'
 
 import UIKit from 'uikit'
+import helpers from 'lib/helpers'
 
 class GroupsContainer extends React.Component {
   componentDidMount () {
@@ -106,14 +107,18 @@ class GroupsContainer extends React.Component {
           </TableCell>
           <TableCell style={{ textAlign: 'right', paddingRight: 15 }}>
             <ButtonGroup>
-              <Button text={'Edit'} small={true} waves={true} onClick={() => this.onEditGroupClick(group.toJS())} />
-              <Button
-                text={'Delete'}
-                style={'danger'}
-                small={true}
-                waves={true}
-                onClick={() => this.onDeleteGroupClick(group.get('_id'))}
-              />
+              {helpers.canUser('groups:update', true) && (
+                <Button text={'Edit'} small={true} waves={true} onClick={() => this.onEditGroupClick(group.toJS())} />
+              )}
+              {helpers.canUser('groups:delete', true) && (
+                <Button
+                  text={'Delete'}
+                  style={'danger'}
+                  small={true}
+                  waves={true}
+                  onClick={() => this.onDeleteGroupClick(group.get('_id'))}
+                />
+              )}
             </ButtonGroup>
           </TableCell>
         </TableRow>
diff --git a/src/client/containers/Settings/Elasticsearch/index.jsx b/src/client/containers/Settings/Elasticsearch/index.jsx
index c3227e08c..4f04f15c3 100644
--- a/src/client/containers/Settings/Elasticsearch/index.jsx
+++ b/src/client/containers/Settings/Elasticsearch/index.jsx
@@ -129,8 +129,8 @@ class ElasticsearchSettingsContainer extends React.Component {
 
   getStatus () {
     const self = this
-    self.esStatus = 'Please Wait...'
-    self.inSyncText = 'Please Wait...'
+    // self.esStatus = 'Please Wait...'
+    // self.inSyncText = 'Please Wait...'
     // if (!this.state.configured) {
     //   this.esStatus = 'Not Configured'
     //   this.indexCount = 0
@@ -144,7 +144,10 @@ class ElasticsearchSettingsContainer extends React.Component {
       .get('/api/v2/es/status')
       .then(res => {
         const data = res.data
-        self.esStatus = data.status.esStatus
+        if (data.status.isRebuilding) {
+          self.esStatus = 'Rebuilding...'
+          self.esStatusClass = ''
+        } else self.esStatus = data.status.esStatus
         if (self.esStatus.toLowerCase() === 'connected') self.esStatusClass = 'text-success'
         else if (self.esStatus.toLowerCase() === 'error') self.esStatusClass = 'text-danger'
 
@@ -158,7 +161,7 @@ class ElasticsearchSettingsContainer extends React.Component {
         }
 
         if (data.status.isRebuilding) {
-          setTimeout(self.getStatus, 5000)
+          setTimeout(self.getStatus, 3000)
           self.disableRebuild = true
         } else self.disableRebuild = false
       })
@@ -207,7 +210,7 @@ class ElasticsearchSettingsContainer extends React.Component {
     return (
       <div className={this.props.active ? '' : 'hide'}>
         <SettingItem
-          title={'Elasticsearch'}
+          title={'Elasticsearch - Beta'}
           subtitle={'Enable the Elasticsearch engine'}
           component={
             <EnableSwitch
@@ -236,7 +239,7 @@ class ElasticsearchSettingsContainer extends React.Component {
         />
         <SettingItem
           title={'Elasticsearch Server Configuration'}
-          tooltip={'Changing server settings will require a rebuild of the index'}
+          tooltip={'Changing server settings will require a rebuild of the index and server restart.'}
           subtitle={'The connection settings to the Elasticsearch server.'}
         >
           <form onSubmit={e => this.onFormSubmit(e)}>
diff --git a/src/client/containers/Teams/index.jsx b/src/client/containers/Teams/index.jsx
index 7147cedd8..7a9d7d6d3 100644
--- a/src/client/containers/Teams/index.jsx
+++ b/src/client/containers/Teams/index.jsx
@@ -124,14 +124,18 @@ class TeamsContainer extends React.Component {
           </TableCell>
           <TableCell style={{ textAlign: 'right', paddingRight: 15 }}>
             <ButtonGroup>
-              <Button text={'Edit'} small={true} waves={true} onClick={() => this.onEditTeamClick(team.toJS())} />
-              <Button
-                text={'Delete'}
-                style={'danger'}
-                small={true}
-                waves={true}
-                onClick={() => this.onDeleteTeamClick(team.get('_id'))}
-              />
+              {helpers.canUser('teams:update', true) && (
+                <Button text={'Edit'} small={true} waves={true} onClick={() => this.onEditTeamClick(team.toJS())} />
+              )}
+              {helpers.canUser('teams:delete', true) && (
+                <Button
+                  text={'Delete'}
+                  style={'danger'}
+                  small={true}
+                  waves={true}
+                  onClick={() => this.onDeleteTeamClick(team.get('_id'))}
+                />
+              )}
             </ButtonGroup>
           </TableCell>
         </TableRow>
diff --git a/src/controllers/api/v2/elasticsearch.js b/src/controllers/api/v2/elasticsearch.js
index d35421468..9d47fcc8a 100644
--- a/src/controllers/api/v2/elasticsearch.js
+++ b/src/controllers/api/v2/elasticsearch.js
@@ -32,6 +32,9 @@ apiElasticSearch.status = function (req, res) {
 
   async.parallel(
     [
+      function (done) {
+        return es.checkConnection(done)
+      },
       function (done) {
         es.getIndexCount(function (err, data) {
           if (err) return done(err)
@@ -51,7 +54,7 @@ apiElasticSearch.status = function (req, res) {
       if (err) return res.status(500).json({ success: false, error: err })
 
       response.esStatus = global.esStatus
-      response.isRebuilding = global.esRebuilding || false
+      response.isRebuilding = global.esRebuilding === true
       response.inSync = response.dbCount === response.indexCount
 
       res.json({ success: true, status: response })
diff --git a/src/controllers/install.js b/src/controllers/install.js
index 887f31bbc..b55d32827 100644
--- a/src/controllers/install.js
+++ b/src/controllers/install.js
@@ -203,7 +203,9 @@ installController.install = function (req, res) {
               )
             }
           ],
-          next
+          function (err) {
+            return next(err)
+          }
         )
       },
       function (next) {
@@ -298,33 +300,18 @@ installController.install = function (req, res) {
         )
       },
       function (roleResults, next) {
-        GroupSchema.getGroupByName('Administrators', function (err, group) {
-          if (err) {
-            winston.error('Database Error: ' + err.message)
-            return next('Database Error:' + err.message)
-          }
-
-          if (!_.isNull(group) && !_.isUndefined(group) && !_.isEmpty(group)) {
-            return next(null, group)
-          }
-
-          // Create Admin Group
-          var adminGroup = new GroupSchema({
-            name: 'Administrators',
+        var TeamSchema = require('../models/team')
+        TeamSchema.create(
+          {
+            name: 'Support (Default)',
             members: []
-          })
-
-          adminGroup.save(function (err) {
-            if (err) {
-              winston.error('Database Error:' + err.message)
-              return next('Database Error:' + err.message)
-            }
-
-            return next(null, adminGroup, roleResults)
-          })
-        })
+          },
+          function (err, team) {
+            return next(err, team, roleResults)
+          }
+        )
       },
-      function (adminGroup, roleResults, next) {
+      function (defaultTeam, roleResults, next) {
         UserSchema.getUserByUsername(user.username, function (err, admin) {
           if (err) {
             winston.error('Database Error: ' + err.message)
@@ -356,7 +343,7 @@ installController.install = function (req, res) {
               return next('Database Error: ' + err.message)
             }
 
-            adminGroup.addMember(savedUser._id, function (err, success) {
+            defaultTeam.addMember(savedUser._id, function (err, success) {
               if (err) {
                 winston.error('Database Error: ' + err.message)
                 return next('Database Error: ' + err.message)
@@ -366,18 +353,32 @@ installController.install = function (req, res) {
                 return next('Unable to add user to Administrator group!')
               }
 
-              adminGroup.save(function (err) {
+              defaultTeam.save(function (err) {
                 if (err) {
                   winston.error('Database Error: ' + err.message)
                   return next('Database Error: ' + err.message)
                 }
 
-                return next(null)
+                return next(null, defaultTeam)
               })
             })
           })
         })
       },
+      function (defaultTeam, next) {
+        var DepartmentSchema = require('../models/department')
+        DepartmentSchema.create(
+          {
+            name: 'Support - All Groups (Default)',
+            teams: [defaultTeam._id],
+            allGroups: true,
+            groups: []
+          },
+          function (err) {
+            return next(err)
+          }
+        )
+      },
       function (next) {
         if (!process.env.TRUDESK_DOCKER) return next()
         var S = require('../models/setting')
@@ -411,10 +412,6 @@ installController.install = function (req, res) {
             database: database,
             shard: port === '---'
           },
-          elasticsearch: {
-            host: eHost,
-            port: ePort
-          },
           tokens: {
             secret: chance.hash() + chance.md5(),
             expires: 900 // 15min
diff --git a/src/elasticsearch/index.js b/src/elasticsearch/index.js
index 308530924..39830748b 100644
--- a/src/elasticsearch/index.js
+++ b/src/elasticsearch/index.js
@@ -39,16 +39,16 @@ function checkConnection (callback) {
   )
 }
 
-ES.testConnection = function (callback) {
-  if (process.env.ELATICSEARCH_URI) ES.host = process.env.ELATICSEARCH_URI
-  else ES.host = nconf.get('elasticsearch:host') + ':' + nconf.get('elasticsearch:port')
-
-  ES.esclient = new elasticsearch.Client({
-    host: ES.host
-  })
-
-  checkConnection(callback)
-}
+// ES.testConnection = function (callback) {
+//   if (process.env.ELATICSEARCH_URI) ES.host = process.env.ELATICSEARCH_URI
+//   else ES.host = nconf.get('elasticsearch:host') + ':' + nconf.get('elasticsearch:port')
+//
+//   ES.esclient = new elasticsearch.Client({
+//     host: ES.host
+//   })
+//
+//   checkConnection(callback)
+// }
 
 ES.setupHooks = function () {
   var ticketSchema = require('../models/ticket')
@@ -208,6 +208,7 @@ ES.rebuildIndex = function () {
 
     esFork.once('message', function (data) {
       global.esStatus = data.success ? 'Connected' : 'Error'
+      global.esRebuilding = false
     })
 
     esFork.on('exit', function () {
@@ -275,4 +276,18 @@ ES.init = function (callback) {
   })
 }
 
+ES.checkConnection = function (callback) {
+  // global.esStatus = 'Please Wait...'
+  return checkConnection(function (err) {
+    if (err) {
+      global.esStatus = 'Error'
+      winston.warn(err)
+      return callback()
+    }
+
+    global.esStatus = 'Connected'
+    return callback()
+  })
+}
+
 module.exports = ES
diff --git a/src/elasticsearch/rebuildIndexChild.js b/src/elasticsearch/rebuildIndexChild.js
index 68a36ddbc..a152a8d8f 100644
--- a/src/elasticsearch/rebuildIndexChild.js
+++ b/src/elasticsearch/rebuildIndexChild.js
@@ -210,7 +210,7 @@ function sendAndEmptyQueue (bulk, callback) {
         }
       }
     )
-  }
+  } else if (typeof callback === 'function') return callback()
 
   return []
 }
@@ -370,14 +370,13 @@ function rebuild (callback) {
   setupClient()
   rebuild(function (err) {
     if (err) {
-      process.send({ success: false, error: err })
-      process.kill(0)
+      return process.send({ success: false, error: err })
     }
 
-    process.send({ success: true })
     //  Kill it in 10sec to offset refresh timers
     setTimeout(function () {
-      process.kill(0)
-    }, 10000)
+      process.send({ success: true })
+      return process.kill(0)
+    }, 6000)
   })
 })()
diff --git a/src/install/elasticsearchtest.js b/src/install/elasticsearchtest.js
index 44c3cacbe..ff8030fee 100644
--- a/src/install/elasticsearchtest.js
+++ b/src/install/elasticsearchtest.js
@@ -1,45 +1,54 @@
-var elasticsearch = require('../elasticsearch');
-var winston = require('winston');
+var elasticsearch = require('../elasticsearch')
+var winston = require('winston')
 
-global.env = process.env.NODE_ENV || 'production';
+global.env = process.env.NODE_ENV || 'production'
 
-winston.setLevels(winston.config.cli.levels);
-winston.remove(winston.transports.Console);
+winston.setLevels(winston.config.cli.levels)
+winston.remove(winston.transports.Console)
 winston.add(winston.transports.Console, {
-    colorize: true,
-    timestamp: function() {
-        var date = new Date();
-        return (date.getMonth() + 1) + '/' + date.getDate() + ' ' + date.toTimeString().substr(0,8) + ' [Child:ElasticSearch:' + global.process.pid + ']';
-    },
-    level: global.env === 'production' ? 'info' : 'verbose'
-});
+  colorize: true,
+  timestamp: function () {
+    var date = new Date()
+    return (
+      date.getMonth() +
+      1 +
+      '/' +
+      date.getDate() +
+      ' ' +
+      date.toTimeString().substr(0, 8) +
+      ' [Child:ElasticSearch:' +
+      global.process.pid +
+      ']'
+    )
+  },
+  level: global.env === 'production' ? 'info' : 'verbose'
+})
+;(function () {
+  var ELATICSEARCH_URI = process.env.ELATICSEARCH_URI
+  if (!ELATICSEARCH_URI) return process.send({ error: { message: 'Invalid connection uri' } })
 
-(function() {
-    var ELATICSEARCH_URI = process.env.ELATICSEARCH_URI;
-    if (!ELATICSEARCH_URI) return process.send({error: {message: 'Invalid connection uri'}});
+  elasticsearch.testConnection(function (err) {
+    if (err) {
+      return process.send({ error: err })
+      // return process.kill(0);
+    }
 
-    elasticsearch.testConnection(function(err) {
-        if (err) {
-            process.send({error: err});
-            return process.kill(0);
-        }
+    return process.send({ success: true })
+    // return process.kill(0);
+  })
 
-        process.send({success: true});
-        return process.kill(0);
-    });
-
-    // database.init(function(e, db) {
-    //     if (e) {
-    //         process.send({error: e});
-    //         return process.kill(0);
-    //     }
-    //
-    //     if (!db) {
-    //         process.send({error: {message: 'Unable to open database'}});
-    //         return process.kill(0);
-    //     }
-    //
-    //     process.send({success: true});
-    //
-    // }, CONNECTION_URI, options);
-})();
\ No newline at end of file
+  // database.init(function(e, db) {
+  //     if (e) {
+  //         process.send({error: e});
+  //         return process.kill(0);
+  //     }
+  //
+  //     if (!db) {
+  //         process.send({error: {message: 'Unable to open database'}});
+  //         return process.kill(0);
+  //     }
+  //
+  //     process.send({success: true});
+  //
+  // }, CONNECTION_URI, options);
+})()
diff --git a/src/migration/index.js b/src/migration/index.js
index c2a6a0abd..a70d8cb5a 100644
--- a/src/migration/index.js
+++ b/src/migration/index.js
@@ -62,8 +62,9 @@ function saveVersion (callback) {
 function getDatabaseVersion (callback) {
   SettingsSchema.getSettingByName('gen:version', function (err, setting) {
     if (err) return callback(err)
-    // TODO: Throw error after 1.0.7 if missing ver num
-    if (!setting) return callback(null, '1.0.6')
+
+    if (!setting) throw new Error('Please upgrade to v1.0.7+ Exiting...')
+
     return callback(null, setting.value)
   })
 }
@@ -154,7 +155,7 @@ function createAdminTeamDepartment (callback) {
 
         Team.create(
           {
-            name: 'Default - Admins',
+            name: 'Support (Default)',
             members: adminsIds
           },
           next
@@ -163,7 +164,7 @@ function createAdminTeamDepartment (callback) {
       function (adminTeam, next) {
         Department.create(
           {
-            name: 'Default - Admins',
+            name: 'Support - All Groups (Default)',
             teams: adminTeam._id,
             allGroups: true,
             groups: []