diff --git a/jslib b/jslib
index a19a30ffed1..2b931963cd8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit a19a30ffed177e18d6e64801066510bc983a3e8d
+Subproject commit 2b931963cd8dbebdcbdd6a418ac3ef72adb73539
diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index daff1d93c9c..6f6cd028866 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -12,13 +12,12 @@
                     <div class="row-main">
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
                         <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword"
-                               class="monospaced" [(ngModel)]="masterPassword" required>
+                            class="monospaced" [(ngModel)]="masterPassword" required>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick
-                           title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
-                            <i class="fa fa-lg"
-                               [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
+                            (click)="togglePassword()">
+                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </a>
                     </div>
                 </div>
diff --git a/src/app/accounts/premium.component.html b/src/app/accounts/premium.component.html
index 8bb72df658e..9ec4c65ea2d 100644
--- a/src/app/accounts/premium.component.html
+++ b/src/app/accounts/premium.component.html
@@ -57,7 +57,7 @@
                 <button type="button" data-dismiss="modal">{{'close' | i18n}}</button>
                 <div class="right" *ngIf="!isPremium">
                     <button #refreshBtn type="button" appBlurClick (click)="refresh()" [disabled]="refreshBtn.loading"
-                            title="{{'premiumRefresh' | i18n}}" [appApiAction]="refreshPromise">
+                        title="{{'premiumRefresh' | i18n}}" [appApiAction]="refreshPromise">
                         <i class="fa fa-refresh fa-lg fa-fw" [hidden]="refreshBtn.loading"></i>
                         <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!refreshBtn.loading"></i>
                     </button>
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index c7fc6c4cbff..d45abf44e0e 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -6,7 +6,7 @@
                 <div class="box-content-row" appBoxRow>
                     <label for="email">{{'emailAddress' | i18n}}</label>
                     <input id="email" type="text" name="Email" [(ngModel)]="email" required
-                           [appAutofocus]="email === ''">
+                        [appAutofocus]="email === ''">
                 </div>
                 <div class="box-content-row" appBoxRow>
                     <div class="box-content-row-flex">
@@ -14,17 +14,17 @@
                             <label for="masterPassword">
                                 {{'masterPass' | i18n}}
                                 <strong class="sub-label text-{{masterPasswordScoreColor}}"
-                                      *ngIf="masterPasswordScoreText">
+                                    *ngIf="masterPasswordScoreText">
                                     {{masterPasswordScoreText}}
                                 </strong>
                             </label>
                             <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}"
-                                   name="MasterPassword" class="monospaced" [(ngModel)]="masterPassword"
-                                   required [appAutofocus]="email !== ''" (input)="updatePasswordStrength()">
+                                name="MasterPassword" class="monospaced" [(ngModel)]="masterPassword" required
+                                [appAutofocus]="email !== ''" (input)="updatePasswordStrength()">
                         </div>
                         <div class="action-buttons">
-                            <a class="row-btn" href="#" appStopClick appBlurClick
-                                title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                            <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
+                                (click)="togglePassword(false)">
                                 <i class="fa fa-lg"
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </a>
@@ -47,14 +47,12 @@
                     <div class="row-main">
                         <label for="masterPasswordRetype">{{'reTypeMasterPass' | i18n}}</label>
                         <input id="masterPasswordRetype" type="{{showPassword ? 'text' : 'password'}}"
-                               name="MasterPasswordRetype" class="monospaced" [(ngModel)]="confirmMasterPassword"
-                               required>
+                            name="MasterPasswordRetype" class="monospaced" [(ngModel)]="confirmMasterPassword" required>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick appBlurClick
-                           title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
-                            <i class="fa fa-lg"
-                               [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleVisibility' | i18n}}"
+                            (click)="togglePassword(true)">
+                            <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                         </a>
                     </div>
                 </div>
diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index 89bfd86bc97..9ec4ab2f166 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -10,7 +10,7 @@
                         <div class="form-group">
                             <label for="lockOption">{{'lockOptions' | i18n}}</label>
                             <select id="lockOption" name="LockOption" [(ngModel)]="lockOption"
-                                    (change)="saveLockOption()">
+                                (change)="saveLockOption()">
                                 <option *ngFor="let o of lockOptions" [ngValue]="o.value">{{o.name}}</option>
                             </select>
                             <small class="help-block">{{'lockOptionsDesc' | i18n}}</small>
@@ -34,7 +34,7 @@
                             <div class="checkbox">
                                 <label for="disableFavicons">
                                     <input id="disableFavicons" type="checkbox" name="DisableFavicons"
-                                           [(ngModel)]="disableFavicons" (change)="saveFavicons()">
+                                        [(ngModel)]="disableFavicons" (change)="saveFavicons()">
                                     {{'disableFavicon' | i18n}}
                                 </label>
                             </div>
@@ -43,8 +43,8 @@
                         <div class="form-group">
                             <div class="checkbox">
                                 <label for="enableTray">
-                                    <input id="enableTray" type="checkbox" name="EnableTray"
-                                           [(ngModel)]="enableTray" (change)="saveTray()">
+                                    <input id="enableTray" type="checkbox" name="EnableTray" [(ngModel)]="enableTray"
+                                        (change)="saveTray()">
                                     {{'enableTray' | i18n}}
                                 </label>
                             </div>
@@ -54,7 +54,7 @@
                             <div class="checkbox">
                                 <label for="enableMinToTray">
                                     <input id="enableMinToTray" type="checkbox" name="EnableMinToTray"
-                                           [(ngModel)]="enableMinToTray" (change)="saveMinToTray()">
+                                        [(ngModel)]="enableMinToTray" (change)="saveMinToTray()">
                                     {{'enableMinToTray' | i18n}}
                                 </label>
                             </div>
@@ -64,7 +64,7 @@
                             <div class="checkbox">
                                 <label for="enableCloseToTray">
                                     <input id="enableCloseToTray" type="checkbox" name="EnableCloseToTray"
-                                           [(ngModel)]="enableCloseToTray" (change)="saveCloseToTray()">
+                                        [(ngModel)]="enableCloseToTray" (change)="saveCloseToTray()">
                                     {{'enableCloseToTray' | i18n}}
                                 </label>
                             </div>
@@ -73,8 +73,8 @@
                         <div class="form-group" *ngIf="showMinToTray">
                             <div class="checkbox">
                                 <label for="startToTray">
-                                    <input id="startToTray" type="checkbox" name="StartToTray"
-                                           [(ngModel)]="startToTray" (change)="saveStartToTray()">
+                                    <input id="startToTray" type="checkbox" name="StartToTray" [(ngModel)]="startToTray"
+                                        (change)="saveStartToTray()">
                                     {{'startToTray' | i18n}}
                                 </label>
                             </div>
diff --git a/src/app/accounts/two-factor-options.component.html b/src/app/accounts/two-factor-options.component.html
index 740365d1ea1..2127870c70b 100644
--- a/src/app/accounts/two-factor-options.component.html
+++ b/src/app/accounts/two-factor-options.component.html
@@ -8,7 +8,7 @@
                     </div>
                     <div class="box-content">
                         <a href="#" appStopClick *ngFor="let p of providers" class="box-content-row"
-                           (click)="choose(p)">
+                            (click)="choose(p)">
                             <img [src]="'images/two-factor/' + p.type + '.png'" alt="" class="img-right">
                             <span class="text">{{p.name}}</span>
                             <span class="detail">{{p.description}}</span>
diff --git a/src/app/accounts/two-factor.component.html b/src/app/accounts/two-factor.component.html
index 8bfe9fbf927..ef5db977273 100644
--- a/src/app/accounts/two-factor.component.html
+++ b/src/app/accounts/two-factor.component.html
@@ -6,7 +6,7 @@
             {{'enterVerificationCodeEmail' | i18n : twoFactorEmail}}
         </p>
         <div class="box last"
-             *ngIf="selectedProviderType === providerType.Email || selectedProviderType === providerType.Authenticator">
+            *ngIf="selectedProviderType === providerType.Email || selectedProviderType === providerType.Authenticator">
             <div class="box-content">
                 <div class="box-content-row" appBoxRow>
                     <label for="code">{{'verificationCode' | i18n}}</label>
@@ -55,8 +55,7 @@
             </div>
         </div>
         <div class="buttons">
-            <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick
-                    *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
+            <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
                         selectedProviderType !== providerType.OrganizationDuo">
                 <span [hidden]="form.loading"><i class="fa fa-sign-in"></i> {{'continue' | i18n}}</span>
                 <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
@@ -66,7 +65,7 @@
         <div class="sub-options">
             <a href="#" appStopClick (click)="anotherMethod()">{{'useAnotherTwoStepMethod' | i18n}}</a>
             <a href="#" appStopClick (click)="sendEmail(true)" [appApiAction]="emailPromise"
-               *ngIf="selectedProviderType === providerType.Email">
+                *ngIf="selectedProviderType === providerType.Email">
                 {{'sendVerificationCodeEmailAgain' | i18n}}
             </a>
         </div>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 3aeb899bd02..ecb6cac1e4c 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -21,29 +21,29 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="loginUsername">{{'username' | i18n}}</label>
                             <input id="loginUsername" type="text" name="Login.Username"
-                                   [(ngModel)]="cipher.login.username">
+                                [(ngModel)]="cipher.login.username">
                         </div>
                         <div class="box-content-row box-content-row-flex" appBoxRow>
                             <div class="row-main">
                                 <label for="loginPassword">{{'password' | i18n}}</label>
                                 <input id="loginPassword" class="monospaced"
-                                       type="{{showPassword ? 'text' : 'password'}}" name="Login.Password"
-                                       [(ngModel)]="cipher.login.password">
+                                    type="{{showPassword ? 'text' : 'password'}}" name="Login.Password"
+                                    [(ngModel)]="cipher.login.password">
                             </div>
                             <div class="action-buttons">
                                 <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
-                                        title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
-                                        [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
+                                    title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
+                                    [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
                                     <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"></i>
                                     <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"></i>
                                 </button>
                                 <a class="row-btn" href="#" appStopClick appBlurClick
-                                   title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                                    title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
                                     <i class="fa fa-lg"
-                                       [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                                        [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                                 </a>
                                 <a class="row-btn" href="#" appStopClick appBlurClick
-                                   title="{{'generatePassword' | i18n}}" (click)="generatePassword()">
+                                    title="{{'generatePassword' | i18n}}" (click)="generatePassword()">
                                     <i class="fa fa-lg fa-refresh"></i>
                                 </a>
                             </div>
@@ -51,7 +51,7 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="loginTotp">{{'authenticatorKeyTotp' | i18n}}</label>
                             <input id="loginTotp" type="text" name="Login.Totp" class="monospaced"
-                                   [(ngModel)]="cipher.login.totp">
+                                [(ngModel)]="cipher.login.totp">
                         </div>
                     </div>
                     <!-- Card -->
@@ -59,7 +59,7 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="cardCardholderName">{{'cardholderName' | i18n}}</label>
                             <input id="cardCardholderName" type="text" name="Card.CardCardholderName"
-                                   [(ngModel)]="cipher.card.cardholderName">
+                                [(ngModel)]="cipher.card.cardholderName">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="cardNumber">{{'number' | i18n}}</label>
@@ -80,20 +80,19 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="cardExpYear">{{'expirationYear' | i18n}}</label>
                             <input id="cardExpYear" type="text" name="Card.ExpYear" [(ngModel)]="cipher.card.expYear"
-                                   placeholder="{{'ex' | i18n}} 2019">
+                                placeholder="{{'ex' | i18n}} 2019">
                         </div>
                         <div class="box-content-row box-content-row-flex" appBoxRow>
                             <div class="row-main">
                                 <label for="cardCode">{{'securityCode' | i18n}}</label>
-                                <input id="cardCode" class="monospaced"
-                                       type="{{showCardCode ? 'text' : 'password'}}" name="Card.Code"
-                                       [(ngModel)]="cipher.card.code">
+                                <input id="cardCode" class="monospaced" type="{{showCardCode ? 'text' : 'password'}}"
+                                    name="Card.Code" [(ngModel)]="cipher.card.code">
                             </div>
                             <div class="action-buttons">
                                 <a class="row-btn" href="#" appStopClick appBlurClick
-                                   title="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()">
+                                    title="{{'toggleVisibility' | i18n}}" (click)="toggleCardCode()">
                                     <i class="fa fa-lg"
-                                       [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
+                                        [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                                 </a>
                             </div>
                         </div>
@@ -109,27 +108,27 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="idFirstName">{{'firstName' | i18n}}</label>
                             <input id="idFirstName" type="text" name="Identity.FirstName"
-                                   [(ngModel)]="cipher.identity.firstName">
+                                [(ngModel)]="cipher.identity.firstName">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idMiddleName">{{'middleName' | i18n}}</label>
                             <input id="idMiddleName" type="text" name="Identity.MiddleName"
-                                   [(ngModel)]="cipher.identity.middleName">
+                                [(ngModel)]="cipher.identity.middleName">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idLastName">{{'lastName' | i18n}}</label>
                             <input id="idLastName" type="text" name="Identity.LastName"
-                                   [(ngModel)]="cipher.identity.lastName">
+                                [(ngModel)]="cipher.identity.lastName">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idUsername">{{'username' | i18n}}</label>
                             <input id="idUsername" type="text" name="Identity.Username"
-                                   [(ngModel)]="cipher.identity.username">
+                                [(ngModel)]="cipher.identity.username">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idCompany">{{'company' | i18n}}</label>
                             <input id="idCompany" type="text" name="Identity.Company"
-                                   [(ngModel)]="cipher.identity.company">
+                                [(ngModel)]="cipher.identity.company">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idSsn">{{'ssn' | i18n}}</label>
@@ -138,12 +137,12 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="idPassportNumber">{{'passportNumber' | i18n}}</label>
                             <input id="idPassportNumber" type="text" name="Identity.PassportNumber"
-                                   [(ngModel)]="cipher.identity.passportNumber">
+                                [(ngModel)]="cipher.identity.passportNumber">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idLicenseNumber">{{'licenseNumber' | i18n}}</label>
                             <input id="idLicenseNumber" type="text" name="Identity.LicenseNumber"
-                                   [(ngModel)]="cipher.identity.licenseNumber">
+                                [(ngModel)]="cipher.identity.licenseNumber">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idEmail">{{'email' | i18n}}</label>
@@ -156,17 +155,17 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="idAddress1">{{'address1' | i18n}}</label>
                             <input id="idAddress1" type="text" name="Identity.Address1"
-                                   [(ngModel)]="cipher.identity.address1">
+                                [(ngModel)]="cipher.identity.address1">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idAddress2">{{'address2' | i18n}}</label>
                             <input id="idAddress2" type="text" name="Identity.Address2"
-                                   [(ngModel)]="cipher.identity.address2">
+                                [(ngModel)]="cipher.identity.address2">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idAddress3">{{'address3' | i18n}}</label>
                             <input id="idAddress3" type="text" name="Identity.Address3"
-                                   [(ngModel)]="cipher.identity.address3">
+                                [(ngModel)]="cipher.identity.address3">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idCity">{{'cityTown' | i18n}}</label>
@@ -179,12 +178,12 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="idPostalCode">{{'zipPostalCode' | i18n}}</label>
                             <input id="idPostalCode" type="text" name="Identity.PostalCode"
-                                   [(ngModel)]="cipher.identity.postalCode">
+                                [(ngModel)]="cipher.identity.postalCode">
                         </div>
                         <div class="box-content-row" appBoxRow>
                             <label for="idCountry">{{'country' | i18n}}</label>
                             <input id="idCountry" type="text" name="Identity.Country"
-                                   [(ngModel)]="cipher.identity.country">
+                                [(ngModel)]="cipher.identity.country">
                         </div>
                     </div>
                 </div>
@@ -193,26 +192,26 @@
                 <div class="box-content">
                     <ng-container *ngIf="cipher.login.hasUris">
                         <div class="box-content-row box-content-row-multi" appBoxRow
-                             *ngFor="let u of cipher.login.uris; let i = index; trackBy:trackByFunction">
+                            *ngFor="let u of cipher.login.uris; let i = index; trackBy:trackByFunction">
                             <a href="#" appStopClick (click)="removeUri(u)" title="{{'remove' | i18n}}">
                                 <i class="fa fa-minus-circle fa-lg"></i>
                             </a>
                             <div class="row-main">
                                 <label for="loginUri{{i}}">{{'uriPosition' | i18n : (i + 1)}}</label>
                                 <input id="loginUri{{i}}" type="text" name="Login.Uris[{{i}}].Uri" [(ngModel)]="u.uri"
-                                       placeholder="{{'ex' | i18n}} https://google.com">
+                                    placeholder="{{'ex' | i18n}} https://google.com">
                                 <label for="loginUriMatch{{i}}" class="sr-only">
                                     {{'matchDetection' | i18n}} {{(i + 1)}}
                                 </label>
                                 <select id="loginUriMatch{{i}}" name="Login.Uris[{{i}}].Match" [(ngModel)]="u.match"
-                                        [hidden]="u.showOptions === false || (u.showOptions == null && u.match == null)"
-                                        (change)="loginUriMatchChanged(u)">
+                                    [hidden]="u.showOptions === false || (u.showOptions == null && u.match == null)"
+                                    (change)="loginUriMatchChanged(u)">
                                     <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">{{o.name}}</option>
                                 </select>
                             </div>
                             <div class="action-buttons">
-                                <a class="row-btn" href="#" appStopClick appBlurClick
-                                   title="{{'toggleOptions' | i18n}}" (click)="toggleUriOptions(u)">
+                                <a class="row-btn" href="#" appStopClick appBlurClick title="{{'toggleOptions' | i18n}}"
+                                    (click)="toggleUriOptions(u)">
                                     <i class="fa fa-lg fa-cog"></i>
                                 </a>
                             </div>
@@ -236,12 +235,12 @@
                         <input id="favorite" type="checkbox" name="Favorite" [(ngModel)]="cipher.favorite">
                     </div>
                     <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
-                       (click)="attachments()" *ngIf="editMode">
+                        (click)="attachments()" *ngIf="editMode">
                         <div class="row-main">{{'attachments' | i18n}}</div>
                         <i class="fa fa-chevron-right row-sub-icon"></i>
                     </a>
                     <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
-                       (click)="editCollections()" *ngIf="editMode && cipher.organizationId">
+                        (click)="editCollections()" *ngIf="editMode && cipher.organizationId">
                         <div class="row-main">{{'collections' | i18n}}</div>
                         <i class="fa fa-chevron-right row-sub-icon"></i>
                     </a>
@@ -264,8 +263,8 @@
                 <div class="box-content">
                     <ng-container *ngIf="cipher.hasFields">
                         <div class="box-content-row box-content-row-multi" appBoxRow
-                             *ngFor="let f of cipher.fields; let i = index; trackBy:trackByFunction"
-                             [ngClass]="{'box-content-row-checkbox': f.type === fieldType.Boolean}">
+                            *ngFor="let f of cipher.fields; let i = index; trackBy:trackByFunction"
+                            [ngClass]="{'box-content-row-checkbox': f.type === fieldType.Boolean}">
                             <a href="#" appStopClick (click)="removeField(f)" title="{{'remove' | i18n}}">
                                 <i class="fa fa-minus-circle fa-lg"></i>
                             </a>
@@ -273,21 +272,21 @@
                             <label for="fieldValue{{i}}" class="sr-only">{{'value' | i18n}}</label>
                             <div class="row-main">
                                 <input id="fieldName{{i}}" type="text" name="Field.Name{{i}}" [(ngModel)]="f.name"
-                                       class="row-label" placeholder="{{'name' | i18n}}">
+                                    class="row-label" placeholder="{{'name' | i18n}}">
                                 <input id="fieldValue{{i}}" type="text" name="Field.Value{{i}}" [(ngModel)]="f.value"
-                                       *ngIf="f.type === fieldType.Text" placeholder="{{'value' | i18n}}">
+                                    *ngIf="f.type === fieldType.Text" placeholder="{{'value' | i18n}}">
                                 <input id="fieldValue{{i}}" type="{{f.showValue ? 'text' : 'password'}}"
-                                       name="Field.Value{{i}}" [(ngModel)]="f.value" class="monospaced"
-                                       *ngIf="f.type === fieldType.Hidden" placeholder="{{'value' | i18n}}">
+                                    name="Field.Value{{i}}" [(ngModel)]="f.value" class="monospaced"
+                                    *ngIf="f.type === fieldType.Hidden" placeholder="{{'value' | i18n}}">
                             </div>
-                            <input id="fieldValue{{i}}" name="Field.Value{{i}}" type="checkbox"
-                                   [(ngModel)]="f.value" *ngIf="f.type === fieldType.Boolean"
-                                   appTrueFalseValue trueValue="true" falseValue="false">
+                            <input id="fieldValue{{i}}" name="Field.Value{{i}}" type="checkbox" [(ngModel)]="f.value"
+                                *ngIf="f.type === fieldType.Boolean" appTrueFalseValue trueValue="true"
+                                falseValue="false">
                             <div class="action-buttons" *ngIf="f.type === fieldType.Hidden">
                                 <a class="row-btn" href="#" appStopClick appBlurClick
-                                   title="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)">
+                                    title="{{'toggleVisibility' | i18n}}" (click)="toggleFieldValue(f)">
                                     <i class="fa fa-lg"
-                                       [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}"></i>
+                                        [ngClass]="{'fa-eye': !f.showValue, 'fa-eye-slash': f.showValue}"></i>
                                 </a>
                             </div>
                         </div>
@@ -311,7 +310,7 @@
                     <div class="box-content-row" appBoxRow>
                         <label for="organizationId">{{'whoOwnsThisItem' | i18n}}</label>
                         <select id="organizationId" class="form-control" name="OrganizationId"
-                                [(ngModel)]="cipher.organizationId" (change)="organizationChanged()">
+                            [(ngModel)]="cipher.organizationId" (change)="organizationChanged()">
                             <option *ngFor="let o of ownershipOptions" [ngValue]="o.value">{{o.name}}</option>
                         </select>
                     </div>
@@ -325,11 +324,11 @@
                     {{'noCollectionsInList' | i18n}}
                 </div>
                 <div class="box-content" *ngIf="collections && collections.length">
-                    <div class="box-content-row box-content-row-checkbox"
-                         *ngFor="let c of collections; let i = index" appBoxRow>
+                    <div class="box-content-row box-content-row-checkbox" *ngFor="let c of collections; let i = index"
+                        appBoxRow>
                         <label for="collection_{{i}}">{{c.name}}</label>
                         <input id="collection_{{i}}" type="checkbox" [(ngModel)]="c.checked"
-                               name="Collection[{{i}}].Checked">
+                            name="Collection[{{i}}].Checked">
                     </div>
                 </div>
             </div>
@@ -345,12 +344,11 @@
         </button>
         <div class="right">
             <button appBlurClick type="button" (click)="share()" title="{{'shareItem' | i18n}}"
-                    *ngIf="editMode && cipher && !cipher.organizationId">
+                *ngIf="editMode && cipher && !cipher.organizationId">
                 <i class="fa fa-share-alt fa-lg fa-fw"></i>
             </button>
-            <button #deleteBtn appBlurClick type="button" (click)="delete()" class="danger"
-                    title="{{'delete' | i18n}}" *ngIf="editMode" [disabled]="deleteBtn.loading"
-                    [appApiAction]="deletePromise">
+            <button #deleteBtn appBlurClick type="button" (click)="delete()" class="danger" title="{{'delete' | i18n}}"
+                *ngIf="editMode" [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
                 <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading"></i>
                 <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"></i>
             </button>
diff --git a/src/app/vault/attachments.component.html b/src/app/vault/attachments.component.html
index 86394e86542..2181abcf68c 100644
--- a/src/app/vault/attachments.component.html
+++ b/src/app/vault/attachments.component.html
@@ -14,8 +14,8 @@
                             <small class="row-sub-label">{{a.sizeName}}</small>
                             <div class="action-buttons no-pad">
                                 <button class="row-btn btn" type="button" appStopClick appBlurClick
-                                        title="{{'delete' | i18n}}" (click)="delete(a)" #deleteBtn
-                                        [appApiAction]="deletePromises[a.id]" [disabled]="deleteBtn.loading">
+                                    title="{{'delete' | i18n}}" (click)="delete(a)" #deleteBtn
+                                    [appApiAction]="deletePromises[a.id]" [disabled]="deleteBtn.loading">
                                     <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading"></i>
                                     <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"></i>
                                 </button>
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index a8cf15a2e65..7ef12b60c04 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -1,23 +1,20 @@
 <div class="header header-search">
     <div class="search">
         <input type="search" placeholder="{{searchPlaceholder || ('searchVault' | i18n)}}" id="search"
-               [(ngModel)]="searchText" (input)="search(200)" appAutofocus>
+            [(ngModel)]="searchText" (input)="search(200)" appAutofocus>
         <i class="fa fa-search"></i>
     </div>
 </div>
 <div class="content">
     <ng-container *ngIf="ciphers">
         <div class="list" *ngIf="ciphers.length > 0">
-            <a *ngFor="let c of ciphers" appStopClick (click)="selectCipher(c)"
-               (contextmenu)="rightClickCipher(c)" href="#" title="{{'viewItem' | i18n}}"
-               [ngClass]="{'active': c.id === activeCipherId}">
+            <a *ngFor="let c of ciphers" appStopClick (click)="selectCipher(c)" (contextmenu)="rightClickCipher(c)"
+                href="#" title="{{'viewItem' | i18n}}" [ngClass]="{'active': c.id === activeCipherId}">
                 <app-vault-icon [cipher]="c"></app-vault-icon>
                 <span class="text">
                     {{c.name}}
-                    <i class="fa fa-share-alt text-muted" *ngIf="c.organizationId"
-                       title="{{'shared' | i18n}}"></i>
-                    <i class="fa fa-paperclip text-muted" *ngIf="c.hasAttachments"
-                       title="{{'attachments' | i18n}}"></i>
+                    <i class="fa fa-share-alt text-muted" *ngIf="c.organizationId" title="{{'shared' | i18n}}"></i>
+                    <i class="fa fa-paperclip text-muted" *ngIf="c.hasAttachments" title="{{'attachments' | i18n}}"></i>
                 </span>
                 <span class="detail">{{c.subTitle}}</span>
             </a>
@@ -33,8 +30,8 @@
     </ng-container>
 </div>
 <div class="footer">
-    <button appBlurClick (click)="addCipher()" (contextmenu)="addCipherOptions()"
-            class="block primary" title="{{'addItem' | i18n}}">
+    <button appBlurClick (click)="addCipher()" (contextmenu)="addCipherOptions()" class="block primary"
+        title="{{'addItem' | i18n}}">
         <i class="fa fa-plus fa-lg"></i>
     </button>
 </div>
diff --git a/src/app/vault/collections.component.html b/src/app/vault/collections.component.html
index 1e489cd6557..b85fa618bdc 100644
--- a/src/app/vault/collections.component.html
+++ b/src/app/vault/collections.component.html
@@ -11,7 +11,7 @@
                     </div>
                     <div class="box-content" *ngIf="collections && collections.length">
                         <div class="box-content-row box-content-row-checkbox"
-                             *ngFor="let c of collections; let i = index" appBoxRow>
+                            *ngFor="let c of collections; let i = index" appBoxRow>
                             <label for="collection_{{i}}">{{c.name}}</label>
                             <input id="collection_{{i}}" type="checkbox" [(ngModel)]="c.checked"
                                 name="Collection[{{i}}].Checked">
diff --git a/src/app/vault/folder-add-edit.component.html b/src/app/vault/folder-add-edit.component.html
index 5c11d956b18..7d69e397951 100644
--- a/src/app/vault/folder-add-edit.component.html
+++ b/src/app/vault/folder-add-edit.component.html
@@ -10,7 +10,7 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="name">{{'name' | i18n}}</label>
                             <input id="name" type="text" name="Name" [(ngModel)]="folder.name"
-                                   [appAutofocus]="!editMode">
+                                [appAutofocus]="!editMode">
                         </div>
                     </div>
                 </div>
@@ -23,8 +23,8 @@
                 <button type="button" data-dismiss="modal">{{'cancel' | i18n}}</button>
                 <div class="right">
                     <button #deleteBtn appBlurClick type="button" (click)="delete()" class="danger"
-                            title="{{'delete' | i18n}}" *ngIf="editMode" [disabled]="deleteBtn.loading"
-                            [appApiAction]="deletePromise">
+                        title="{{'delete' | i18n}}" *ngIf="editMode" [disabled]="deleteBtn.loading"
+                        [appApiAction]="deletePromise">
                         <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading"></i>
                         <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading"></i>
                     </button>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index fec7e6d5988..c9ff1f91e0a 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -45,27 +45,24 @@
             </h2>
             <ul class="fa-ul">
                 <ng-template #recursiveFolders let-folders>
-                    <li *ngFor="let f of folders" 
+                    <li *ngFor="let f of folders"
                         [ngClass]="{active: selectedFolder && f.node.id === selectedFolderId}">
                         <a href="#" appStopClick appBlurClick (click)="selectFolder(f.node)">
-                            <i class="fa-li fa" title="{{'toggleCollapse' | i18n}}"
-                                [ngClass]="{'fa-caret-right': isCollapsed(f.node),
-                                    'fa-caret-down': !isCollapsed(f.node)}"
-                                (click)="collapse(f.node)" appStopProp></i>
+                            <i class="fa-li fa" title="{{'toggleCollapse' | i18n}}" [ngClass]="{'fa-caret-right': isCollapsed(f.node),
+                                    'fa-caret-down': !isCollapsed(f.node)}" (click)="collapse(f.node)" appStopProp></i>
                             {{f.node.name}}
                             <span appStopProp appStopClick (click)="editFolder(f.node)" title="{{'editFolder' | i18n}}"
-                                    *ngIf="f.node.id">
+                                *ngIf="f.node.id">
                                 <i class="fa fa-pencil fa-fw"></i>
                             </span>
                         </a>
                         <ul class="fa-ul" *ngIf="f.children.length && !isCollapsed(f.node)">
-                            <ng-container
-                                *ngTemplateOutlet="recursiveFolders; context:{ $implicit: f.children }"></ng-container>
+                            <ng-container *ngTemplateOutlet="recursiveFolders; context:{ $implicit: f.children }">
+                            </ng-container>
                         </ul>
                     </li>
                 </ng-template>
-                <ng-container
-                    *ngTemplateOutlet="recursiveFolders; context:{ $implicit: nestedFolders }"></ng-container>
+                <ng-container *ngTemplateOutlet="recursiveFolders; context:{ $implicit: nestedFolders }"></ng-container>
             </ul>
             <div *ngIf="collections && collections.length">
                 <h2>{{'collections' | i18n}}</h2>
@@ -73,10 +70,9 @@
                     <ng-template #recursiveCollections let-collections>
                         <li *ngFor="let c of collections" [ngClass]="{active: c.node.id === selectedCollectionId}">
                             <a href="#" appStopClick appBlurClick (click)="selectCollection(c.node)">
-                                <i class="fa-li fa" title="{{'toggleCollapse' | i18n}}"
-                                    [ngClass]="{'fa-caret-right': isCollapsed(c.node),
-                                        'fa-caret-down': !isCollapsed(c.node)}"
-                                    (click)="collapse(c.node)" appStopProp></i>
+                                <i class="fa-li fa" title="{{'toggleCollapse' | i18n}}" [ngClass]="{'fa-caret-right': isCollapsed(c.node),
+                                        'fa-caret-down': !isCollapsed(c.node)}" (click)="collapse(c.node)"
+                                    appStopProp></i>
                                 {{c.node.name}}
                             </a>
                             <ul class="fa-ul" *ngIf="c.children.length && !isCollapsed(c.node)">
@@ -86,8 +82,7 @@
                             </ul>
                         </li>
                     </ng-template>
-                    <ng-container
-                        *ngTemplateOutlet="recursiveCollections; context:{ $implicit: nestedCollections }">
+                    <ng-container *ngTemplateOutlet="recursiveCollections; context:{ $implicit: nestedCollections }">
                     </ng-container>
                 </ul>
             </div>
diff --git a/src/app/vault/password-generator-history.component.html b/src/app/vault/password-generator-history.component.html
index 57da7814ac1..9baaaea457e 100644
--- a/src/app/vault/password-generator-history.component.html
+++ b/src/app/vault/password-generator-history.component.html
@@ -10,12 +10,12 @@
                         <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
                             <div class="row-main">
                                 <div class="text password-wrapper monospaced" appFlexCopy
-                                     [innerHTML]="h.password | colorPassword"></div>
+                                    [innerHTML]="h.password | colorPassword"></div>
                                 <span class="detail">{{h.date | date:'medium'}}</span>
                             </div>
                             <div class="action-buttons">
                                 <a class="row-btn" href="#" appStopClick title="{{'copyPassword' | i18n}}"
-                                   (click)="copy(h.password)">
+                                    (click)="copy(h.password)">
                                     <i class="fa fa-lg fa-clipboard"></i>
                                 </a>
                             </div>
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index ceef60932bd..c192638aeca 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -5,12 +5,10 @@
                 <div class="password-block" [innerHTML]="password | colorPassword" appFlexCopy></div>
                 <div class="box">
                     <div class="box-content condensed">
-                        <a class="box-content-row" href="#" appStopClick appBlurClick
-                           (click)="regenerate()">
+                        <a class="box-content-row" href="#" appStopClick appBlurClick (click)="regenerate()">
                             <i class="fa fa-fw fa-refresh"></i> {{'regeneratePassword' | i18n}}
                         </a>
-                        <a class="box-content-row" href="#" appStopClick appBlurClick
-                           (click)="copy()">
+                        <a class="box-content-row" href="#" appStopClick appBlurClick (click)="copy()">
                             <i class="fa fa-fw fa-clipboard"></i> {{'copyPassword' | i18n}}
                         </a>
                     </div>
@@ -38,12 +36,12 @@
                         <div class="box-content-row box-content-row-input" appBoxRow>
                             <label for="num-words">{{'numWords' | i18n}}</label>
                             <input id="num-words" type="number" min="3" max="20" (input)="saveOptions()"
-                                    [(ngModel)]="options.numWords">
+                                [(ngModel)]="options.numWords">
                         </div>
                         <div class="box-content-row box-content-row-input" appBoxRow>
                             <label for="word-separator">{{'wordSeparator' | i18n}}</label>
                             <input id="word-separator" type="text" maxlength="1" (input)="saveOptions()"
-                                    [(ngModel)]="options.wordSeparator">
+                                [(ngModel)]="options.wordSeparator">
                         </div>
                     </div>
                 </div>
@@ -53,30 +51,29 @@
                             <div class="box-content-row box-content-row-slider" appBoxRow>
                                 <label for="length">{{'length' | i18n}}</label>
                                 <input id="length" type="number" min="5" max="128" [(ngModel)]="options.length"
-                                        (blur)="saveOptions()">
+                                    (blur)="saveOptions()">
                                 <input id="lengthRange" type="range" min="5" max="128" step="1"
-                                        [(ngModel)]="options.length" (change)="sliderChanged()"
-                                        (input)="sliderInput()">
+                                    [(ngModel)]="options.length" (change)="sliderChanged()" (input)="sliderInput()">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="uppercase">A-Z</label>
                                 <input id="uppercase" type="checkbox" (change)="saveOptions()"
-                                        [(ngModel)]="options.uppercase">
+                                    [(ngModel)]="options.uppercase">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="lowercase">a-z</label>
                                 <input id="lowercase" type="checkbox" (change)="saveOptions()"
-                                        [(ngModel)]="options.lowercase">
+                                    [(ngModel)]="options.lowercase">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="numbers">0-9</label>
                                 <input id="numbers" type="checkbox" (change)="saveOptions()"
-                                        [(ngModel)]="options.number">
+                                    [(ngModel)]="options.number">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="special">!@#$%^&*</label>
                                 <input id="special" type="checkbox" (change)="saveOptions()"
-                                        [(ngModel)]="options.special">
+                                    [(ngModel)]="options.special">
                             </div>
                         </div>
                     </div>
@@ -85,17 +82,17 @@
                             <div class="box-content-row box-content-row-input" appBoxRow>
                                 <label for="min-number">{{'minNumbers' | i18n}}</label>
                                 <input id="min-number" type="number" min="0" max="9" (input)="saveOptions()"
-                                        [(ngModel)]="options.minNumber">
+                                    [(ngModel)]="options.minNumber">
                             </div>
                             <div class="box-content-row box-content-row-input" appBoxRow>
                                 <label for="min-special">{{'minSpecial' | i18n}}</label>
                                 <input id="min-special" type="number" min="0" max="9" (input)="saveOptions()"
-                                        [(ngModel)]="options.minSpecial">
+                                    [(ngModel)]="options.minSpecial">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="ambiguous">{{'ambiguous' | i18n}}</label>
                                 <input id="ambiguous" type="checkbox" (change)="saveOptions()"
-                                        [(ngModel)]="avoidAmbiguous">
+                                    [(ngModel)]="avoidAmbiguous">
                             </div>
                         </div>
                     </div>
@@ -103,7 +100,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="primary" appBlurClick *ngIf="showSelect" (click)="select()"
-                        title="{{'select' | i18n}}">
+                    title="{{'select' | i18n}}">
                     <i class="fa fa-lg fa-fw fa-check"></i>
                 </button>
                 <button type="button" data-dismiss="modal">{{(showSelect ? 'cancel' : 'close') | i18n}}</button>
diff --git a/src/app/vault/password-history.component.html b/src/app/vault/password-history.component.html
index 627f49442de..b67318496e2 100644
--- a/src/app/vault/password-history.component.html
+++ b/src/app/vault/password-history.component.html
@@ -16,7 +16,7 @@
                             </div>
                             <div class="action-buttons">
                                 <a class="row-btn" href="#" appStopClick title="{{'copyPassword' | i18n}}"
-                                   (click)="copy(h.password)">
+                                    (click)="copy(h.password)">
                                     <i class="fa fa-lg fa-clipboard"></i>
                                 </a>
                             </div>
diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html
index d5668370cb8..ee043f3c840 100644
--- a/src/app/vault/share.component.html
+++ b/src/app/vault/share.component.html
@@ -13,7 +13,7 @@
                         <div class="box-content-row" appBoxRow>
                             <label for="organization">{{'organization' | i18n}}</label>
                             <select id="organization" name="OrganizationId" [(ngModel)]="organizationId"
-                                    (change)="filterCollections()">
+                                (change)="filterCollections()">
                                 <option *ngFor="let o of organizations" [ngValue]="o.id">{{o.name}}</option>
                             </select>
                         </div>
@@ -31,17 +31,17 @@
                     </div>
                     <div class="box-content" *ngIf="collections && collections.length">
                         <div class="box-content-row box-content-row-checkbox"
-                             *ngFor="let c of collections; let i = index" appBoxRow>
+                            *ngFor="let c of collections; let i = index" appBoxRow>
                             <label for="collection_{{i}}">{{c.name}}</label>
                             <input id="collection_{{i}}" type="checkbox" [(ngModel)]="c.checked"
-                                   name="Collection[{{i}}].Checked">
+                                name="Collection[{{i}}].Checked">
                         </div>
                     </div>
                 </div>
             </div>
             <div class="modal-footer">
                 <button appBlurClick type="submit" class="primary" title="{{'save' | i18n}}"
-                        [disabled]="form.loading || !canSave" *ngIf="organizations && organizations.length">
+                    [disabled]="form.loading || !canSave" *ngIf="organizations && organizations.length">
                     <i class="fa fa-save fa-lg fa-fw" [hidden]="form.loading"></i>
                     <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!form.loading"></i>
                 </button>
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index 2520d4f5a04..8213b3dc105 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -1,40 +1,25 @@
 <div id="vault">
-    <app-vault-groupings id="groupings"
-                         (onAllClicked)="clearGroupingFilters()"
-                         (onFavoritesClicked)="filterFavorites()"
-                         (onCipherTypeClicked)="filterCipherType($event)"
-                         (onFolderClicked)="filterFolder($event.id)"
-                         (onAddFolder)="addFolder()"
-                         (onEditFolder)="editFolder($event.id)"
-                         (onCollectionClicked)="filterCollection($event.id)">
+    <app-vault-groupings id="groupings" (onAllClicked)="clearGroupingFilters()" (onFavoritesClicked)="filterFavorites()"
+        (onCipherTypeClicked)="filterCipherType($event)" (onFolderClicked)="filterFolder($event.id)"
+        (onAddFolder)="addFolder()" (onEditFolder)="editFolder($event.id)"
+        (onCollectionClicked)="filterCollection($event.id)">
     </app-vault-groupings>
-    <app-vault-ciphers id="items"
-                       [activeCipherId]="cipherId"
-                       (onCipherClicked)="viewCipher($event)"
-                       (onCipherRightClicked)="viewCipherMenu($event)"
-                       (onAddCipher)="addCipher($event)"
-                       (onAddCipherOptions)="addCipherOptions()">
+    <app-vault-ciphers id="items" [activeCipherId]="cipherId" (onCipherClicked)="viewCipher($event)"
+        (onCipherRightClicked)="viewCipherMenu($event)" (onAddCipher)="addCipher($event)"
+        (onAddCipherOptions)="addCipherOptions()">
     </app-vault-ciphers>
-    <app-vault-view id="details"
-                    *ngIf="cipherId && action === 'view'"
-                    [cipherId]="cipherId"
-                    (onEditCipher)="editCipher($event)"
-                    (onViewCipherPasswordHistory)="viewCipherPasswordHistory($event)">
+    <app-vault-view id="details" *ngIf="cipherId && action === 'view'" [cipherId]="cipherId"
+        (onEditCipher)="editCipher($event)" (onViewCipherPasswordHistory)="viewCipherPasswordHistory($event)">
     </app-vault-view>
-    <app-vault-add-edit id="details"
-                        *ngIf="action === 'add' || action === 'edit'"
-                        [folderId]="action === 'add' && folderId !== 'none' ? folderId : null"
-                        [organizationId]="action === 'add' ? addOrganizationId : null"
-                        [collectionIds]="action === 'add' ? addCollectionIds : null"
-                        [type]="action === 'add' ? (addType ? addType : type) : null"
-                        [cipherId]="action === 'edit' ? cipherId : null"
-                        (onSavedCipher)="savedCipher($event)"
-                        (onDeletedCipher)="deletedCipher($event)"
-                        (onEditAttachments)="editCipherAttachments($event)"
-                        (onCancelled)="cancelledAddEdit($event)"
-                        (onShareCipher)="shareCipher($event)"
-                        (onEditCollections)="cipherCollections($event)"
-                        (onGeneratePassword)="openPasswordGenerator(true)">
+    <app-vault-add-edit id="details" *ngIf="action === 'add' || action === 'edit'"
+        [folderId]="action === 'add' && folderId !== 'none' ? folderId : null"
+        [organizationId]="action === 'add' ? addOrganizationId : null"
+        [collectionIds]="action === 'add' ? addCollectionIds : null"
+        [type]="action === 'add' ? (addType ? addType : type) : null" [cipherId]="action === 'edit' ? cipherId : null"
+        (onSavedCipher)="savedCipher($event)" (onDeletedCipher)="deletedCipher($event)"
+        (onEditAttachments)="editCipherAttachments($event)" (onCancelled)="cancelledAddEdit($event)"
+        (onShareCipher)="shareCipher($event)" (onEditCollections)="cipherCollections($event)"
+        (onGeneratePassword)="openPasswordGenerator(true)">
     </app-vault-add-edit>
     <div id="logo" *ngIf="action !== 'add' && action !== 'edit' && action !== 'view'">
         <div class="content">
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index a7d8370374d..6783575f204 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -18,7 +18,7 @@
                         </div>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick title="{{'copyUsername' | i18n}}"
-                               (click)="copy(cipher.login.username, 'username', 'Username')">
+                                (click)="copy(cipher.login.username, 'username', 'Username')">
                                 <i class="fa fa-lg fa-clipboard"></i>
                             </a>
                         </div>
@@ -29,28 +29,28 @@
                             <div [hidden]="showPassword" class="monospaced password-wrapper" appFlexCopy>
                                 {{cipher.login.maskedPassword}}</div>
                             <div [hidden]="!showPassword" class="monospaced password-wrapper" appFlexCopy
-                                 [innerHTML]="cipher.login.password | colorPassword"></div>
+                                [innerHTML]="cipher.login.password | colorPassword"></div>
                         </div>
                         <div class="action-buttons">
                             <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
-                                    title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
-                                    [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
+                                title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
+                                [appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
                                 <i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"></i>
                                 <i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"></i>
                             </button>
                             <a class="row-btn" href="#" appStopClick title="{{'toggleVisibility' | i18n}}"
-                               (click)="togglePassword()">
+                                (click)="togglePassword()">
                                 <i class="fa fa-lg"
-                                   [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                                    [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </a>
                             <a class="row-btn" href="#" appStopClick title="{{'copyPassword' | i18n}}"
-                               (click)="copy(cipher.login.password, 'password', 'Password')">
+                                (click)="copy(cipher.login.password, 'password', 'Password')">
                                 <i class="fa fa-lg fa-clipboard"></i>
                             </a>
                         </div>
                     </div>
                     <div class="box-content-row box-content-row-flex totp" [ngClass]="{'low': totpLow}"
-                         *ngIf="cipher.login.totp && totpCode">
+                        *ngIf="cipher.login.totp && totpCode">
                         <div class="row-main">
                             <span class="row-label">{{'verificationCodeTotp' | i18n}}</span>
                             <span class="totp-code">{{totpCodeFormatted}}</span>
@@ -60,14 +60,14 @@
                             <svg>
                                 <g>
                                     <circle class="totp-circle inner" r="12.6" cy="16" cx="16"
-                                            [ngStyle]="{'stroke-dashoffset.px': totpDash}"></circle>
+                                        [ngStyle]="{'stroke-dashoffset.px': totpDash}"></circle>
                                     <circle class="totp-circle outer" r="14" cy="16" cx="16"></circle>
                                 </g>
                             </svg>
                         </span>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick title="{{'copyValue' | i18n}}"
-                               (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
+                                (click)="copy(totpCode, 'verificationCodeTotp', 'TOTP')">
                                 <i class="fa fa-lg fa-clipboard"></i>
                             </a>
                         </div>
@@ -86,7 +86,7 @@
                         </div>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick title="{{'copyNumber' | i18n}}"
-                               (click)="copy(cipher.card.number, 'number', 'Number')">
+                                (click)="copy(cipher.card.number, 'number', 'Number')">
                                 <i class="fa fa-lg fa-clipboard"></i>
                             </a>
                         </div>
@@ -107,12 +107,12 @@
                         </div>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick title="{{'toggleVisibility' | i18n}}"
-                               (click)="toggleCardCode()">
+                                (click)="toggleCardCode()">
                                 <i class="fa fa-lg"
-                                   [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
+                                    [ngClass]="{'fa-eye': !showCardCode, 'fa-eye-slash': showCardCode}"></i>
                             </a>
                             <a class="row-btn" href="#" appStopClick title="{{'copySecurityCode' | i18n}}"
-                               (click)="copy(cipher.card.code, 'securityCode', 'Security Code')">
+                                (click)="copy(cipher.card.code, 'securityCode', 'Security Code')">
                                 <i class="fa fa-lg fa-clipboard"></i>
                             </a>
                         </div>
@@ -153,7 +153,7 @@
                         {{cipher.identity.phone}}
                     </div>
                     <div class="box-content-row"
-                         *ngIf="cipher.identity.address1 || cipher.identity.city || cipher.identity.country">
+                        *ngIf="cipher.identity.address1 || cipher.identity.city || cipher.identity.country">
                         <span class="row-label">{{'address' | i18n}}</span>
                         <div *ngIf="cipher.identity.address1">{{cipher.identity.address1}}</div>
                         <div *ngIf="cipher.identity.address2">{{cipher.identity.address2}}</div>
@@ -177,12 +177,12 @@
                         <span title="{{u.uri}}">{{u.hostnameOrUri}}</span>
                     </div>
                     <div class="action-buttons">
-                        <a class="row-btn" href="#" appStopClick title="{{'launch' | i18n}}"
-                           *ngIf="u.canLaunch" (click)="launch(u)">
+                        <a class="row-btn" href="#" appStopClick title="{{'launch' | i18n}}" *ngIf="u.canLaunch"
+                            (click)="launch(u)">
                             <i class="fa fa-lg fa-share-square-o"></i>
                         </a>
                         <a class="row-btn" href="#" appStopClick title="{{'copyUri' | i18n}}"
-                           (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')">
+                            (click)="copy(u.uri, u.isWebsite ? 'website' : 'uri', 'URI')">
                             <i class="fa fa-lg fa-clipboard"></i>
                         </a>
                     </div>
@@ -219,13 +219,13 @@
                     </div>
                     <div class="action-buttons">
                         <a class="row-btn" href="#" appStopClick title="{{'toggleVisibility' | i18n}}"
-                           *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)">
+                            *ngIf="field.type === fieldType.Hidden" (click)="toggleFieldValue(field)">
                             <i class="fa fa-lg"
-                               [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
+                                [ngClass]="{'fa-eye': !field.showValue, 'fa-eye-slash': field.showValue}"></i>
                         </a>
                         <a class="row-btn" href="#" appStopClick title="{{'copyValue' | i18n}}"
-                           *ngIf="field.value && field.type !== fieldType.Boolean"
-                           (click)="copy(field.value, 'value', 'Field')">
+                            *ngIf="field.value && field.type !== fieldType.Boolean"
+                            (click)="copy(field.value, 'value', 'Field')">
                             <i class="fa fa-lg fa-clipboard"></i>
                         </a>
                     </div>
@@ -238,8 +238,8 @@
             </div>
             <div class="box-content">
                 <a class="box-content-row box-content-row-flex text-default"
-                   *ngFor="let attachment of cipher.attachments"
-                   href="#" appStopClick appBlurCLick (click)="downloadAttachment(attachment)">
+                    *ngFor="let attachment of cipher.attachments" href="#" appStopClick appBlurCLick
+                    (click)="downloadAttachment(attachment)">
                     <span class="row-main">{{attachment.fileName}}</span>
                     <small class="row-sub-label">{{attachment.sizeName}}</small>
                     <i class="fa fa-download fa-fw row-sub-icon" *ngIf="!attachment.downloading"></i>
@@ -258,7 +258,7 @@
                     {{cipher.passwordRevisionDisplayDate | date:'medium'}}
                 </div>
                 <div *ngIf="cipher.hasPasswordHistory">
-                    <b class="font-weight-semibold">{{'passwordHistory' | i18n}}:</b> 
+                    <b class="font-weight-semibold">{{'passwordHistory' | i18n}}:</b>
                     <a href="#" (click)="viewHistory()" appStopClick title="{{'passwordHistory' | i18n}}">
                         {{cipher.passwordHistory.length}}
                     </a>