diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js
index 44fc2dde8b..66218fb9cf 100644
--- a/src/popup/app/settings/settingsController.js
+++ b/src/popup/app/settings/settingsController.js
@@ -1,16 +1,60 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsController', function ($scope, loginService, $state, syncService) {
+    .controller('settingsController', function ($scope, loginService, $state, syncService, SweetAlert) {
         $scope.sync = function () {
             syncService.fullSync(function () {
                 alert('Sync done!');
             });
         };
 
-        $scope.logOut = function (model) {
+        $scope.logOut = function () {
             loginService.logOut(function () {
                 $state.go('login');
             });
         };
+
+        $scope.changePassword = function () {
+            SweetAlert.swal({
+                title: 'Change Master Password',
+                text: 'You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?',
+                type: 'info',
+                showCancelButton: true,
+                confirmButtonText: 'Yes',
+                cancelButtonText: 'Cancel'
+            }, alertCallback);
+        };
+
+        $scope.changeEmail = function () {
+            SweetAlert.swal({
+                title: 'Change Email',
+                text: 'You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?',
+                type: 'info',
+                showCancelButton: true,
+                confirmButtonText: 'Yes',
+                cancelButtonText: 'Cancel'
+            }, alertCallback);
+        };
+
+        $scope.twoStep = function () {
+            SweetAlert.swal({
+                title: 'Two-step Login',
+                text: 'Two-step login makes your account more secure by requiring you to enter a security code from an authenticator app whenever you log in. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?',
+                type: 'info',
+                showCancelButton: true,
+                confirmButtonText: 'Yes',
+                cancelButtonText: 'Cancel'
+            }, alertCallback);
+        };
+
+        function alertCallback(confirmed) {
+            if (confirmed) {
+                chrome.tabs.create({ url: 'https://vault.bitwarden.com' });
+            }
+        }
+
+        $scope.rate = function () {
+            // TODO: detect which extension store to send them to
+            chrome.tabs.create({ url: 'https://google.com' });
+        };
     });
diff --git a/src/popup/app/settings/settingsModule.js b/src/popup/app/settings/settingsModule.js
index efddc81eb8..087cba1448 100644
--- a/src/popup/app/settings/settingsModule.js
+++ b/src/popup/app/settings/settingsModule.js
@@ -1,2 +1,2 @@
 angular
-    .module('bit.settings', []);
+    .module('bit.settings', ['oitozero.ngSweetAlert']);
diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index ed05d2b61c..6feec6a6e9 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -3,36 +3,26 @@
 </div>
 <div class="content content-tabs">
     <div class="list">
-        <div class="list-section">
-            <div class="list-section-header">
-                Security
-            </div>
-            <div class="list-section-items">
-                <a class="list-section-item" href="#">
-                    Lock Options
-                </a>
-                <a class="list-section-item" href="#">
-                    Unlock with PIN Code
-                </a>
-                <a class="list-section-item" href="#">
-                    Two-step Login
-                    <i class="fa fa-chevron-right fa-lg"></i>
-                </a>
-            </div>
-        </div>
         <div class="list-section">
             <div class="list-section-header">
                 Account
             </div>
             <div class="list-section-items">
-                <a class="list-section-item" href="#">
+                <a class="list-section-item" href="" ng-click="changePassword()">
                     Change Master Password
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
-                <a class="list-section-item" href="#">
+                <a class="list-section-item" href="" ng-click="changeEmail()">
                     Change Email
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
+                <a class="list-section-item" href="" ng-click="twoStep()">
+                    Two-step Login
+                    <i class="fa fa-chevron-right fa-lg"></i>
+                </a>
+                <a class="list-section-item" href="" ng-click="logOut()">
+                    Log out
+                </a>
             </div>
         </div>
         <div class="list-section">
@@ -50,19 +40,6 @@
                 </a>
             </div>
         </div>
-        <div class="list-section">
-            <div class="list-section-header">
-                Current Session
-            </div>
-            <div class="list-section-items">
-                <a class="list-section-item" href="">
-                    Lock
-                </a>
-                <a class="list-section-item" href="" ng-click="logOut()">
-                    Log out
-                </a>
-            </div>
-        </div>
         <div class="list-section">
             <div class="list-section-header">
                 Other
@@ -76,7 +53,7 @@
                     Help &amp; Feedback
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
-                <a class="list-section-item" href="#">
+                <a class="list-section-item" href="" ng-click="rate()">
                     Rate the Extension
                     <i class="fa fa-chevron-right fa-lg"></i>
                 </a>
diff --git a/src/popup/app/tools/toolsController.js b/src/popup/app/tools/toolsController.js
index dea703e8ab..a48fe160a1 100644
--- a/src/popup/app/tools/toolsController.js
+++ b/src/popup/app/tools/toolsController.js
@@ -22,8 +22,8 @@
                 showCancelButton: true,
                 confirmButtonText: 'Yes',
                 cancelButtonText: 'Cancel'
-            }, function (confirm) {
-                if (confirm) {
+            }, function (confirmed) {
+                if (confirmed) {
                     chrome.tabs.create({ url: 'https://vault.bitwarden.com' });
                 }
             });
diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js
index 019af0ede0..33dd52cc2c 100644
--- a/src/popup/app/vault/vaultEditSiteController.js
+++ b/src/popup/app/vault/vaultEditSiteController.js
@@ -61,7 +61,6 @@ angular
         };
 
         $scope.generatePassword = function () {
-            var confirmed = true;
             if ($scope.site.password) {
                 SweetAlert.swal({
                     title: 'Warning',
@@ -70,8 +69,8 @@ angular
                     showCancelButton: true,
                     confirmButtonText: 'Yes',
                     cancelButtonText: 'No'
-                }, function (confirm) {
-                    if (confirm) {
+                }, function (confirmed) {
+                    if (confirmed) {
                         goPasswordGenerator();
                     }
                 });
diff --git a/src/popup/less/plugins.less b/src/popup/less/plugins.less
index 16345bb56b..3e1f530e03 100644
--- a/src/popup/less/plugins.less
+++ b/src/popup/less/plugins.less
@@ -84,6 +84,10 @@
 /* Sweet alert */
 
 .sweet-alert {
+    border-radius: 0;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+
     p {
         color: @text-color;
         font-weight: normal;