diff --git a/app/partials/accounts/list.html b/app/partials/accounts/list.html
index e2af0c7..1788ca7 100644
--- a/app/partials/accounts/list.html
+++ b/app/partials/accounts/list.html
@@ -1,18 +1,14 @@
 <label class="item item-input">
-	<i class="icon ion-search placeholder-icon"></i>
-	<input
-		tabindex="1"
-		id="search"
-		type="text"
-		placeholder="Search"
-		ng-model="query"
-	/>
+    <i class="icon ion-search placeholder-icon"></i>
+    <input tabindex="1"
+           id="search"
+           type="text"
+           placeholder="Search"
+           ng-model="query" />
 </label>
-<a
-	class="item item-icon-right"
-	ui-sref="accounts.show({accountId: account.id})"
-	ng-repeat="account in accounts.accounts |filter:query | orderBy:orderProp"
->
+<a class="item item-icon-right"
+   ui-sref="accounts.show({accountId: account.id})"
+   ng-repeat="account in accounts.accounts |filter:query | orderBy:orderProp">
 	{{account.name}}
 	<i class="icon ion-ios-arrow-forward"></i>
-</a>
+</a>
\ No newline at end of file
diff --git a/app/partials/accounts/show.html b/app/partials/accounts/show.html
index 5bac12a..568cc5f 100644
--- a/app/partials/accounts/show.html
+++ b/app/partials/accounts/show.html
@@ -1,49 +1,37 @@
 <ion-list>
-  <label class="item item-input item-stacked-label">
-	  <span class="input-label">Name</span>
-	  <input
-	  	type="text"
-	    placeholder="My Account"
-	    ng-model="account.name"
-	  />
-  </label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">Name</span>
+        <input type="text"
+               placeholder="My Account"
+               ng-model="account.name" />
+    </label>
 
-  <label class="item item-input item-stacked-label">
-	  <span class="input-label">AWS Account Number</span>
-	  <input
-	  	type="text"
-	    placeholder="12345654321"
-	    ng-model="account.number"
-	  />
-  </label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">AWS Account Number</span>
+        <input type="text"
+               placeholder="12345654321"
+               ng-model="account.number" />
+    </label>
 
-  <label class="item item-input item-stacked-label">
-	  <span class="input-label">AWS Access Key ID</span>
-	  <input
-	  	type="text"
-	    placeholder="AKIAXXXXXXXXXXXXXXXX"
-	    ng-model="account.access_key_id"
-	  />
-  </label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">AWS Access Key ID</span>
+        <input type="text"
+               placeholder="AKIAXXXXXXXXXXXXXXXX"
+               ng-model="account.access_key_id" />
+    </label>
 
-	<label class="item item-input item-stacked-label">
-		<span class="input-label">Avatar URL</span>
-		<input
-			type="text"
-			placeholder="http://path.to/some_image.png"
-			ng-model="account.avatar_url"
-		/>
-	</label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">Avatar URL</span>
+        <input type="text"
+               placeholder="http://path.to/some_image.png"
+               ng-model="account.avatar_url" />
+    </label>
 </ion-list>
 
 <div class="padding">
-	<button
-		class="button button-block button-positive"
-		ng-click="save()"
-	>Save Account</button>
+    <button class="button button-block button-positive"
+            ng-click="save()">Save Account</button>
 
-	<button
-		class="button button-block button-assertive"
-		ng-click="delete()"
-	>Delete Account</button>
-</div>
+    <button class="button button-block button-assertive"
+            ng-click="delete()">Delete Account</button>
+</div>
\ No newline at end of file
diff --git a/app/partials/bookmarks/index.html b/app/partials/bookmarks/index.html
index b1ae398..d782ab5 100644
--- a/app/partials/bookmarks/index.html
+++ b/app/partials/bookmarks/index.html
@@ -1,3 +1,4 @@
-<ion-content overflow-scroll="true" class="has-header has-footer">
-	<div ui-view></div>
-</ion-content>
+<ion-content overflow-scroll="true"
+             class="has-header has-footer">
+    <div ui-view></div>
+</ion-content>
\ No newline at end of file
diff --git a/app/partials/bookmarks/list.html b/app/partials/bookmarks/list.html
index c2e139e..bf0bf84 100644
--- a/app/partials/bookmarks/list.html
+++ b/app/partials/bookmarks/list.html
@@ -1,30 +1,27 @@
-<ion-list ng-keydown="keydown($event)" id="bookmarks">
-	<label class="item item-input">
-		<i class="icon ion-search placeholder-icon"></i>
-		<input
-			tabindex="1"
-			id="search"
-			type="text"
-			placeholder="Search"
-			ng-model="query"
-		/>
-	</label>
-	<a
-		class="item item-avatar item-button-right"
-		ng-class="{active: $index == position}"
-		ng-click="getToken(bookmark)"
-		ng-repeat="bookmark in bookmarks.bookmarks
-		          |byNameOrAccountNumber:query
-		          |orderBy:orderProp"
-	>
-		<img ng-if="!gravatar(bookmark)" ng-src="{{bookmark.avatar_url}}" />
-		<img ng-if="gravatar(bookmark)" gravatar-src="bookmark.avatar_url || bookmark.name" />
-		<h2>{{bookmark.name}}</h2>
-		<p>{{bookmark.account_number}}/{{bookmark.role_name}}</p>
-		<button
-			class="button button-clear button-positive"
-			ui-sref="bookmarks.show({bookmarkId: bookmark.id})"
-			ng-click="$event.stopPropagation()"
-		><i class="icon ion-ios-information-outline"></i></button>
-	</a>
+<ion-list ng-keydown="keydown($event)"
+          id="bookmarks">
+    <label class="item item-input">
+        <i class="icon ion-search placeholder-icon"></i>
+        <input tabindex="1"
+               id="search"
+               type="text"
+               placeholder="Search"
+               ng-model="query" />
+    </label>
+    <a class="item item-avatar item-button-right"
+       ng-class="{active: $index == position}"
+       ng-click="getToken(bookmark)"
+       ng-repeat="bookmark in bookmarks.bookmarks
+              |byNameOrAccountNumber:query
+              |orderBy:orderProp">
+        <img ng-if="!gravatar(bookmark)"
+             ng-src="{{bookmark.avatar_url}}" />
+        <img ng-if="gravatar(bookmark)"
+             gravatar-src="bookmark.avatar_url || bookmark.name" />
+        <h2>{{bookmark.name}}</h2>
+        <p>{{bookmark.account_number}}/{{bookmark.role_name}}</p>
+        <button class="button button-clear button-positive"
+                ui-sref="bookmarks.show({bookmarkId: bookmark.id})"
+                ng-click="$event.stopPropagation()"><i class="icon ion-ios-information-outline"></i></button>
+    </a>
 </ion-list>
diff --git a/app/partials/bookmarks/otp.html b/app/partials/bookmarks/otp.html
index 1cabb57..59cbebb 100644
--- a/app/partials/bookmarks/otp.html
+++ b/app/partials/bookmarks/otp.html
@@ -1,11 +1,9 @@
 <div class="list list-inset">
-	<label class="item-input">
-		<i class="icon ion-locked placeholder-icon"></i>
-		<input
-			id="token_code"
-			type="text"
-			ng-model="data.token_code"
-			autofocus="autofocus"
-		></input>
-	</label>
+    <label class="item-input">
+        <i class="icon ion-locked placeholder-icon"></i>
+        <input id="token_code"
+               type="text"
+               ng-model="data.token_code"
+               autofocus="autofocus"></input>
+    </label>
 </div>
\ No newline at end of file
diff --git a/app/partials/bookmarks/show.html b/app/partials/bookmarks/show.html
index 8be0089..323614a 100644
--- a/app/partials/bookmarks/show.html
+++ b/app/partials/bookmarks/show.html
@@ -1,49 +1,37 @@
 <ion-list>
-  <label class="item item-input item-stacked-label">
-	  <span class="input-label">Name</span>
-	  <input
-	  	type="text"
-	    placeholder="My Bookmark"
-	    ng-model="bookmark.name"
-	  />
-  </label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">Name</span>
+        <input type="text"
+               placeholder="My Bookmark"
+               ng-model="bookmark.name" />
+    </label>
 
-  <label class="item item-input item-stacked-label">
-	  <span class="input-label">AWS Account Number</span>
-	  <input
-	  	type="text"
-	    placeholder="12345654321"
-	    ng-model="bookmark.account_number"
-	  />
-  </label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">AWS Account Number</span>
+        <input type="text"
+               placeholder="12345654321"
+               ng-model="bookmark.account_number" />
+    </label>
 
-  <label class="item item-input item-stacked-label">
-	  <span class="input-label">Role Name</span>
-	  <input
-	  	type="text"
-	    placeholder="johndoe"
-	    ng-model="bookmark.role_name"
-	  />
-  </label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">Role Name</span>
+        <input type="text"
+               placeholder="johndoe"
+               ng-model="bookmark.role_name" />
+    </label>
 
-  <label class="item item-input item-stacked-label">
-	  <span class="input-label">Avatar URL</span>
-	  <input
-	  	type="text"
-	    placeholder="http://path.to/some_image.png"
-	    ng-model="bookmark.avatar_url"
-	  />
-  </label>
+    <label class="item item-input item-stacked-label">
+        <span class="input-label">Avatar URL</span>
+        <input type="text"
+               placeholder="http://path.to/some_image.png"
+               ng-model="bookmark.avatar_url" />
+    </label>
 </ion-list>
 
 <div class="padding">
-	<button
-		class="button button-block button-positive"
-		ng-click="save()"
-	>Save Bookmark</button>
+    <button class="button button-block button-positive"
+            ng-click="save()">Save Bookmark</button>
 
-	<button
-		class="button button-block button-assertive"
-		ng-click="delete()"
-	>Delete Bookmark</button>
-</div>
+    <button class="button button-block button-assertive"
+            ng-click="delete()">Delete Bookmark</button>
+</div>
\ No newline at end of file
diff --git a/app/partials/common/empty.html b/app/partials/common/empty.html
index 31800c0..f182cdd 100644
--- a/app/partials/common/empty.html
+++ b/app/partials/common/empty.html
@@ -1 +1 @@
-<div ui-view></div>
+<div ui-view></div>
\ No newline at end of file
diff --git a/app/partials/common/list-index.html b/app/partials/common/list-index.html
index c325cb9..e9f5da5 100644
--- a/app/partials/common/list-index.html
+++ b/app/partials/common/list-index.html
@@ -1,3 +1,4 @@
-<ion-content overflow-scroll="true" class="has-header has-footer">
-	<ion-list ui-view></ion-list>
-</ion-content>
+<ion-content overflow-scroll="true"
+             class="has-header has-footer">
+    <ion-list ui-view></ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/app/partials/footer/empty.html b/app/partials/footer/empty.html
index 646963c..25b9a31 100644
--- a/app/partials/footer/empty.html
+++ b/app/partials/footer/empty.html
@@ -1,2 +1,2 @@
 <div class="button-bar">
-</div>
+</div>
\ No newline at end of file
diff --git a/app/partials/footer/footer.html b/app/partials/footer/footer.html
index 299821a..2d3552b 100644
--- a/app/partials/footer/footer.html
+++ b/app/partials/footer/footer.html
@@ -1,24 +1,21 @@
 <div class="button-bar">
-	<button class="button button-clear"
-	        ui-sref="bookmarks.list"
-	        ng-class="{
-	        	'button-positive': $state.includes('bookmarks')
-	        }"
-	><i class="icon ion-ios-unlocked"></i></button>
+    <button class="button button-clear"
+            ui-sref="bookmarks.list"
+            ng-class="{
+            'button-positive': $state.includes('bookmarks')
+          }"><i class="icon ion-ios-unlocked"></i></button>
 
-	<button class="button button-clear"
-			ng-show="$settings.account_management"
-	        ui-sref="accounts.list"
-	        ng-class="{
-	        	'button-positive': $state.includes('accounts')
-	        }"
-	><i class="icon ion-cloud"></i></button>
+    <button class="button button-clear"
+            ng-show="$settings.account_management"
+            ui-sref="accounts.list"
+            ng-class="{
+            'button-positive': $state.includes('accounts')
+          }"><i class="icon ion-cloud"></i></button>
 
-	<button class="button button-clear"
-	        ui-sref="settings"
-	        ng-class="{
-	        	'button-positive': $state.includes('settings'),
-	        	'icon-spin': jobs > 0
-	        }"
-	><i class="icon ion-gear-a"></i></button>
-</div>
\ No newline at end of file
+    <button class="button button-clear"
+            ui-sref="settings"
+            ng-class="{
+            'button-positive': $state.includes('settings'),
+            'icon-spin': jobs > 0
+          }"><i class="icon ion-gear-a"></i></button>
+</div>
diff --git a/app/partials/header/accounts.html b/app/partials/header/accounts.html
index 46e98e4..54da141 100644
--- a/app/partials/header/accounts.html
+++ b/app/partials/header/accounts.html
@@ -1,13 +1,10 @@
-<button
-	ui-sref="accounts.show"
-	class="button button-positive button-clear"
-	ng-show="$state.includes('accounts.list')"
-><i class="icon ion-ios-plus-empty"></i></button>
+<button ui-sref="accounts.show"
+        class="button button-positive button-clear"
+        ng-show="$state.includes('accounts.list')"><i class="icon ion-ios-plus-empty"></i></button>
 
-<button
-	ui-sref="accounts.list"
-	class="button button-positive button-clear"
-	ng-hide="$state.includes('accounts.list')"
-><i class="icon ion-ios-arrow-back"></i> Accounts</button>
+<button ui-sref="accounts.list"
+        class="button button-positive button-clear"
+        ng-hide="$state.includes('accounts.list')"><i class="icon ion-ios-arrow-back"></i> Accounts</button>
 
-<h1 id="title" class="title">Accounts</h1>
+<h1 id="title"
+    class="title">Accounts</h1>
\ No newline at end of file
diff --git a/app/partials/header/bookmarks.html b/app/partials/header/bookmarks.html
index e190223..c7120ac 100644
--- a/app/partials/header/bookmarks.html
+++ b/app/partials/header/bookmarks.html
@@ -1,13 +1,10 @@
-<button
-	ui-sref="bookmarks.show"
-	class="button button-positive button-clear"
-	ng-show="$state.includes('bookmarks.list')"
-><i class="icon ion-ios-plus-empty"></i></button>
+<button ui-sref="bookmarks.show"
+        class="button button-positive button-clear"
+        ng-show="$state.includes('bookmarks.list')"><i class="icon ion-ios-plus-empty"></i></button>
 
-<button
-	ui-sref="bookmarks.list"
-	class="button button-positive button-clear"
-	ng-hide="$state.includes('bookmarks.list')"
-><i class="icon ion-ios-arrow-back"></i> Bookmarks</button>
+<button ui-sref="bookmarks.list"
+        class="button button-positive button-clear"
+        ng-hide="$state.includes('bookmarks.list')"><i class="icon ion-ios-arrow-back"></i> Bookmarks</button>
 
-<h1 id="title" class="title">Bookmarks</h1>
\ No newline at end of file
+<h1 id="title"
+    class="title">Bookmarks</h1>
\ No newline at end of file
diff --git a/app/partials/header/setup.html b/app/partials/header/setup.html
index 7e5b461..3f67dbb 100644
--- a/app/partials/header/setup.html
+++ b/app/partials/header/setup.html
@@ -1 +1,2 @@
-<h1 id="title" class="title">Setup</h1>
+<h1 id="title"
+    class="title">Setup</h1>
\ No newline at end of file
diff --git a/app/partials/header/welcome.html b/app/partials/header/welcome.html
index bca796a..181080b 100644
--- a/app/partials/header/welcome.html
+++ b/app/partials/header/welcome.html
@@ -1 +1,2 @@
-<h1 id="title" class="title">Welcome</h1>
\ No newline at end of file
+<h1 id="title"
+    class="title">Welcome</h1>
\ No newline at end of file
diff --git a/app/partials/settings.html b/app/partials/settings.html
index eb8f150..d1ff700 100644
--- a/app/partials/settings.html
+++ b/app/partials/settings.html
@@ -1,143 +1,126 @@
-<ion-content overflow-scroll="true" class="has-header has-footer">
-	<form>
-		<div class="card">
-			<div class="item item-body">
-				<img class="full-image" src="dist/img/sentia.png" />
-			</div>
-		</div>
-		
-		<div class="card">
-			<div class="item item-divider">Locksmith</div>
-
-			<div class="item item-toggle">
-				Use Local Storage
-	  			<label class="toggle toggle-balanced">
-					<input
-					    type="checkbox"
-						ng-model="$settings.use_local_storage"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-
-			<div class="item item-toggle">
-				Use Switch Role
-	  			<label class="toggle toggle-balanced">
-					<input
-					    type="checkbox"
-						ng-model="$settings.use_switch_role"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-
-			<div
-			    ng-show="$is_extension && !$settings.use_switch_role"
-				class="item item-toggle"
-			>
-				Use Incognito Sessions
-	  			<label class="toggle toggle-balanced">
-					<input
-					    type="checkbox"
-						ng-model="$settings.incognito_sessions"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-		</div>
-
-		<div ng-show="!$settings.use_local_storage" class="card">
-			<div class="item item-divider">Locksmith API</div>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">URL</span>
-				<input
-				    type="text"
-					id="api"
-					ng-model="$settings.api"
-					placeholder="https://locksmith.io/api"
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Username</span>
-				<input
-				    type="text"
-					id="api"
-					ng-model="$settings.api_username"
-					placeholder="john.doe@example.com"
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Password</span>
-				<input
-				    type="password"
-					id="api"
-					ng-model="$settings.api_password"
-					placeholder="sUper5ecret!"
-				/>
-			</label>
-		</div>
-
-		<div ng-show="!$settings.use_switch_role" class="card">
-			<div class="item item-divider">AWS Credentials</div>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Access Key ID</span>
-				<input
-				    type="text"
-					id="aws_access_key_id"
-					ng-model="$settings.aws_access_key_id"
-					placeholder="AKIAXXXXXXXXXXXXXXXX"
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Secret Access Key</span>
-				<input
-				    type="password"
-					id="aws_secret_access_key"
-					ng-model="$settings.aws_secret_access_key"
-					placeholder="pUtY0urAws-S3cr3tAcce55K3yHere/LikeTh1s="
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">MFA Token Serial Number</span>
-				<input
-				    type="text"
-					id="mfa_serial_number"
-					ng-model="$settings.mfa_serial_number"
-					placeholder="arn:aws:iam::12345654321:mfa/johndoe"
-				/>
-			</label>
-		</div>
-
-		<div ng-show="!$settings.use_local_storage" class="card">
-			<div class="item item-divider">Management</div>
-
-			<div class="item item-toggle">
-				Account Management
-	  			<label class="toggle toggle-balanced">
-					<input
-					    type="checkbox"
-						ng-model="$settings.account_management"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-		</div>
-	</form>
-
-
-	<p>&nbsp;</p>
-</ion-content>
+<ion-content overflow-scroll="true"
+             class="has-header has-footer">
+    <form>
+        <div class="card">
+            <div class="item item-body">
+                <img class="full-image"
+                     src="dist/img/sentia.png" />
+            </div>
+        </div>
+
+        <div class="card">
+            <div class="item item-divider">Locksmith</div>
+
+            <div class="item item-toggle">
+                Use Local Storage
+                <label class="toggle toggle-balanced">
+                    <input type="checkbox"
+                           ng-model="$settings.use_local_storage" />
+                    <div class="track">
+                        <div class="handle"></div>
+                    </div>
+                </label>
+            </div>
+
+            <div class="item item-toggle">
+                Use Switch Role
+                <label class="toggle toggle-balanced">
+                    <input type="checkbox"
+                           ng-model="$settings.use_switch_role" />
+                    <div class="track">
+                        <div class="handle"></div>
+                    </div>
+                </label>
+            </div>
+
+            <div ng-show="$is_extension && !$settings.use_switch_role"
+                 class="item item-toggle">
+                Use Incognito Sessions
+                <label class="toggle toggle-balanced">
+                    <input type="checkbox"
+                           ng-model="$settings.incognito_sessions" />
+                    <div class="track">
+                        <div class="handle"></div>
+                    </div>
+                </label>
+            </div>
+        </div>
+
+        <div ng-show="!$settings.use_local_storage"
+             class="card">
+            <div class="item item-divider">Locksmith API</div>
+
+            <label class="item item-input item-stacked-label">
+                <span class="input-label">URL</span>
+                <input type="text"
+                       id="api"
+                       ng-model="$settings.api"
+                       placeholder="https://locksmith.io/api" />
+            </label>
+
+            <label class="item item-input item-stacked-label">
+                <span class="input-label">Username</span>
+                <input type="text"
+                       id="api"
+                       ng-model="$settings.api_username"
+                       placeholder="john.doe@example.com" />
+            </label>
+
+            <label class="item item-input item-stacked-label">
+                <span class="input-label">Password</span>
+                <input type="password"
+                       id="api"
+                       ng-model="$settings.api_password"
+                       placeholder="sUper5ecret!" />
+            </label>
+        </div>
+
+        <div ng-show="!$settings.use_switch_role"
+             class="card">
+            <div class="item item-divider">AWS Credentials</div>
+
+            <label class="item item-input item-stacked-label">
+                <span class="input-label">Access Key ID</span>
+                <input type="text"
+                       id="aws_access_key_id"
+                       ng-model="$settings.aws_access_key_id"
+                       placeholder="AKIAXXXXXXXXXXXXXXXX" />
+            </label>
+
+            <label class="item item-input item-stacked-label">
+                <span class="input-label">Secret Access Key</span>
+                <input type="password"
+                       id="aws_secret_access_key"
+                       ng-model="$settings.aws_secret_access_key"
+                       placeholder="pUtY0urAws-S3cr3tAcce55K3yHere/LikeTh1s=" />
+            </label>
+
+            <label class="item item-input item-stacked-label">
+                <span class="input-label">MFA Token Serial Number</span>
+                <input type="text"
+                       id="mfa_serial_number"
+                       ng-model="$settings.mfa_serial_number"
+                       placeholder="arn:aws:iam::12345654321:mfa/johndoe" />
+            </label>
+        </div>
+
+        <div ng-show="!$settings.use_local_storage"
+             class="card">
+            <div class="item item-divider">Management</div>
+
+            <div class="item item-toggle">
+                Account Management
+                <label class="toggle toggle-balanced">
+                    <input type="checkbox"
+                           ng-model="$settings.account_management" />
+                    <div class="track">
+                        <div class="handle"></div>
+                    </div>
+                </label>
+            </div>
+        </div>
+    </form>
+
+
+    <p>&nbsp;</p>
+</ion-content>
\ No newline at end of file
diff --git a/app/partials/setup.html b/app/partials/setup.html
index 119449a..ad3b4a4 100644
--- a/app/partials/setup.html
+++ b/app/partials/setup.html
@@ -1,147 +1,133 @@
-<ion-content overflow-scroll="true" class="has-header has-footer">
-		<div class="card">
-                  <div class="item item-text-wrap item-positive">
-                    You have followed a link to apply a configuration in
-                    Locksmith.
-                    Please carefully review the following configuration and
-                    apply these settings using the save button at the bottom.
-                  </div>
+<ion-content overflow-scroll="true"
+             class="has-header has-footer">
+    <div class="card">
+        <div class="item item-text-wrap item-positive">
+            You have followed a link to apply a configuration in Locksmith. Please carefully review the following configuration and apply these settings using the save button at the bottom.
+        </div>
+    </div>
+
+    <div class="card">
+        <div class="item item-divider">Locksmith</div>
+
+        <div class="item item-toggle">
+            Use Local Storage
+            <label class="toggle toggle-balanced">
+                <input disabled="disabled"
+                       type="checkbox"
+                       ng-model="use_local_storage" />
+                <div class="track">
+                    <div class="handle"></div>
                 </div>
-
-		<div class="card">
-			<div class="item item-divider">Locksmith</div>
-
-			<div class="item item-toggle">
-				Use Local Storage
-	  			<label class="toggle toggle-balanced">
-					<input disabled="disabled"
-					    type="checkbox"
-						ng-model="use_local_storage"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-
-			<div class="item item-toggle">
-				Use Switch Role
-	  			<label class="toggle toggle-balanced">
-					<input disabled="disabled"
-					    type="checkbox"
-						ng-model="use_switch_role"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-
-			<div class="item item-toggle">
-				Use Incognito Sessions
-	  			<label class="toggle toggle-balanced">
-					<input disabled="disabled"
-					    type="checkbox"
-						ng-model="incognito_sessions"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-		</div>
-
-		<div class="card">
-			<div class="item item-divider">Locksmit API</div>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">URL</span>
-				<input disabled="disabled"
-				    type="text"
-					id="api"
-					ng-model="api"
-					placeholder="https://locksmith.io/api"
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Username</span>
-				<input disabled="disabled"
-				    type="text"
-					id="api"
-					ng-model="api_username"
-					placeholder="john.doe@example.com"
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Password</span>
-				<input disabled="disabled"
-				    type="text"
-					id="api"
-					ng-model="api_password"
-					placeholder="sUper5ecret!"
-				/>
-			</label>
-		</div>
-
-		<div class="card">
-			<div class="item item-divider">AWS Credentials</div>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Access Key ID</span>
-				<input disabled="disabled"
-				    type="text"
-					id="aws_access_key_id"
-					ng-model="aws_access_key_id"
-					placeholder="AKIAXXXXXXXXXXXXXXXX"
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">Secret Access Key</span>
-				<input disabled="disabled"
-				    type="text"
-					id="aws_secret_access_key"
-					ng-model="aws_secret_access_key"
-					placeholder="pUtY0urAws-S3cr3tAcce55K3yHere/LikeTh1s="
-				/>
-			</label>
-
-			<label class="item item-input item-stacked-label">
-	  			<span class="input-label">MFA Token Serial Number</span>
-				<input disabled="disabled"
-				    type="text"
-					id="mfa_serial_number"
-					ng-model="mfa_serial_number"
-					placeholder="arn:aws:iam::12345654321:mfa/johndoe"
-				/>
-			</label>
-		</div>
-
-		<div class="card">
-			<div class="item item-divider">Management</div>
-
-			<div class="item item-toggle">
-				Account Management
-	  			<label class="toggle toggle-balanced">
-					<input disabled="disabled"
-					    type="checkbox"
-						ng-model="account_management"
-					/>
-					<div class="track">
-						<div class="handle"></div>
-					</div>
-				</label>
-			</div>
-		</div>
-
-                <div class="padding">
-                  <button
-		    class="button button-block button-positive"
-		    ng-click="save()"
-	          >Save Settings</button>
+            </label>
+        </div>
+
+        <div class="item item-toggle">
+            Use Switch Role
+            <label class="toggle toggle-balanced">
+                <input disabled="disabled"
+                       type="checkbox"
+                       ng-model="use_switch_role" />
+                <div class="track">
+                    <div class="handle"></div>
+                </div>
+            </label>
+        </div>
+
+        <div class="item item-toggle">
+            Use Incognito Sessions
+            <label class="toggle toggle-balanced">
+                <input disabled="disabled"
+                       type="checkbox"
+                       ng-model="incognito_sessions" />
+                <div class="track">
+                    <div class="handle"></div>
                 </div>
+            </label>
+        </div>
+    </div>
+
+    <div class="card">
+        <div class="item item-divider">Locksmit API</div>
+
+        <label class="item item-input item-stacked-label">
+            <span class="input-label">URL</span>
+            <input disabled="disabled"
+                   type="text"
+                   id="api"
+                   ng-model="api"
+                   placeholder="https://locksmith.io/api" />
+        </label>
+
+        <label class="item item-input item-stacked-label">
+            <span class="input-label">Username</span>
+            <input disabled="disabled"
+                   type="text"
+                   id="api"
+                   ng-model="api_username"
+                   placeholder="john.doe@example.com" />
+        </label>
+
+        <label class="item item-input item-stacked-label">
+            <span class="input-label">Password</span>
+            <input disabled="disabled"
+                   type="text"
+                   id="api"
+                   ng-model="api_password"
+                   placeholder="sUper5ecret!" />
+        </label>
+    </div>
+
+    <div class="card">
+        <div class="item item-divider">AWS Credentials</div>
+
+        <label class="item item-input item-stacked-label">
+            <span class="input-label">Access Key ID</span>
+            <input disabled="disabled"
+                   type="text"
+                   id="aws_access_key_id"
+                   ng-model="aws_access_key_id"
+                   placeholder="AKIAXXXXXXXXXXXXXXXX" />
+        </label>
+
+        <label class="item item-input item-stacked-label">
+            <span class="input-label">Secret Access Key</span>
+            <input disabled="disabled"
+                   type="text"
+                   id="aws_secret_access_key"
+                   ng-model="aws_secret_access_key"
+                   placeholder="pUtY0urAws-S3cr3tAcce55K3yHere/LikeTh1s=" />
+        </label>
+
+        <label class="item item-input item-stacked-label">
+            <span class="input-label">MFA Token Serial Number</span>
+            <input disabled="disabled"
+                   type="text"
+                   id="mfa_serial_number"
+                   ng-model="mfa_serial_number"
+                   placeholder="arn:aws:iam::12345654321:mfa/johndoe" />
+        </label>
+    </div>
+
+    <div class="card">
+        <div class="item item-divider">Management</div>
+
+        <div class="item item-toggle">
+            Account Management
+            <label class="toggle toggle-balanced">
+                <input disabled="disabled"
+                       type="checkbox"
+                       ng-model="account_management" />
+                <div class="track">
+                    <div class="handle"></div>
+                </div>
+            </label>
+        </div>
+    </div>
+
+    <div class="padding">
+        <button class="button button-block button-positive"
+                ng-click="save()">Save Settings</button>
+    </div>
 
-	<p>&nbsp;</p>
-</ion-content>
+    <p>&nbsp;</p>
+</ion-content>
\ No newline at end of file
diff --git a/app/partials/welcome.html b/app/partials/welcome.html
index 1bbbb77..dc32615 100644
--- a/app/partials/welcome.html
+++ b/app/partials/welcome.html
@@ -1,3 +1,3 @@
 <div class="list card">
-	<div class="item item-body">Welcome</div>
-</div>
+    <div class="item item-body">Welcome</div>
+</div>
\ No newline at end of file
diff --git a/gruntfile.js b/gruntfile.js
index bf9667f..a143f58 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -2,8 +2,21 @@ module.exports = function (grunt) {
     grunt.initConfig({
 
     jsbeautifier: {
-      files : ["app/js/**/*.js"],
+      files : [
+        "app/js/**/*.js",
+        "app/partials/**/*.html"
+      ],
       options : {
+        html: {
+          braceStyle: "collapse",
+          indentChar: " ",
+          indentScripts: "keep",
+          indentSize: 4,
+          maxPreserveNewlines: 10,
+          preserveNewlines: true,
+          unformatted: ["a", "sub", "sup", "b", "i", "u"],
+          wrapAttributes: 'force-aligned'
+        }
       }
     },
 
@@ -102,6 +115,7 @@ grunt.loadNpmTasks('grunt-contrib-cssmin');
 grunt.loadNpmTasks('grunt-contrib-copy');
 grunt.loadNpmTasks('grunt-zip');
 
+
 // register at least this one task
 grunt.registerTask('default', [ 'jsbeautifier', 'uglify', 'cssmin', 'copy', 'zip' ]);