diff --git a/src/app/settings/board-admin/board-admin.component.html b/src/app/settings/board-admin/board-admin.component.html
index 7bda558..08f8f6f 100644
--- a/src/app/settings/board-admin/board-admin.component.html
+++ b/src/app/settings/board-admin/board-admin.component.html
@@ -1,5 +1,5 @@
 <section>
-    <h2>{{ strings['settings_boardAdmin'] }}</h2>
+    <h2>{{ strings['settings_boardAdministration'] }}</h2>
 
     <div class="row">
         <h3>{{ strings['settings_currentBoards']  }}</h3>
@@ -75,7 +75,8 @@
                         <ul *ngIf="board.categories && board.categories.length">
                             <li *ngFor="let cat of board.categories">
                                 {{ cat.name }}
-                                <span class="badge" title="Default Task Color"
+                                <span class="badge"
+                                    [title]="strings['settings_defaultTaskColor']"
                                     [style.background-color]="getColor(cat)">
                                     &nbsp;
                                 </span>
@@ -191,13 +192,13 @@
         <label>{{ strings['settings_categories'] }}</label>
         <ul *ngIf="modalProps.categories.length" class="modal-list">
             <li *ngFor="let category of modalProps.categories; let i = index">
-                <span class="badge" title="Default Task Color"
+                <span class="badge" [title]="strings['settings_defaultTaskColor']"
                     [style.background-color]="getColor(category)"></span>
                 <inline-edit [text]="getPropertyValue('categories', 'name', i)"
                     (edit)="onPropertyEdit('categories', 'name', i, $event)"></inline-edit>
                 <span class="actions">
                     <i class="icon icon-trash-empty color-secondary"
-                        title="Remove"
+                        title="{{ strings['settings_removeCategory'] }}"
                         (click)="modalProps.removeCategory(category)"></i>
                 </span>
             </li>
@@ -210,9 +211,9 @@
                     (keyup.enter)="cancelEnterKey($event)"
                     [(ngModel)]="modalProps.newCategoryName">
                 <input type="color" name="category-default-color"
-                    title="Default Task Color"
+                    [title]="strings['settings_defaultTaskColor']"
                     [(ngModel)]="modalProps.categoryDefaultColor">
-                <button type="submit" class="flat" title="Add Category"
+                <button type="submit" class="flat" [title]="strings['settings_addCategory']"
                      (click)="modalProps.addCategory($event)">
                     <i class="icon icon-plus"></i>
                 </button>
@@ -224,10 +225,9 @@
 
     <div class="issue-trackers">
         <label>
-            Issue Trackers
+            {{ strings['settings_issueTrackers'] }}
             <i class="icon icon-help-circled"
-                alt="Example URL: https://github.com/kiswa/TaskBoard/issues/%BUGID\1%
-                     Example RegExp: (?:Issue)?#(\d+)"></i>
+                [attr.data-help]="strings['settings_issueTrackersHelp']"></i>
         </label>
 
         <ul *ngIf="modalProps.issue_trackers.length" class="modal-list">
@@ -251,14 +251,14 @@
         <div>
             <form>
                 <input type="text" name="issue-tracker"
-                    placeholder="Issue Tracker URL - use %BUGID% as placeholder"
+                    placeholder="{{ strings['settings_issueTrakcerUrl'] }}"
                     (keyup.enter)="cancelEnterKey($event)"
                     [(ngModel)]="modalProps.issueTrackerUrl">
                 <input type="text" name="issue-tracker-bug-id"
-                    placeholder="BUGID RegExp"
+                    placeholder="{{ strings['settings_issueTrackerRegExp'] }}"
                     (keyup.enter)="cancelEnterKey($event)"
                     [(ngModel)]="modalProps.issueTrackerBugId">
-                <button type="submit" class="flat" title="Add Issue Tracker"
+                <button type="submit" class="flat" [title]="strings['settings_addIssueTracker']"
                     (click)="modalProps.addIssueTracker($event)">
                     <i class="icon icon-plus"></i>
                 </button>
@@ -267,7 +267,7 @@
     </div>
 
     <div class="users">
-        <label>Select Users</label>
+        <label>{{ strings['settings_selectUsers'] }}</label>
         <div class="clearfix"></div>
         <label class="user-select" *ngFor="let user of users; let i = index">
                 <input type="checkbox" [(ngModel)]="users[i].selected">
@@ -276,10 +276,9 @@
         </label>
 
         <div>
-            <em *ngIf="hasBAUsers"><strong>*</strong> Including a Board Admin,
-            makes them an admin of this board.<br></em>
-            <em>Administrators have access to all boards and are
-            not listed here.</em>
+            <em *ngIf="hasBAUsers"><strong>*</strong>
+            {{ strings['settings_boardAdminMessage'] }}<br></em>
+            <em>{{ strings['settings_adminAccessMessage'] }}</em>
         </div>
     </div>
 
@@ -287,11 +286,12 @@
         <button #defaultAction (click)="addEditBoard()" [disabled]="saving">
             <i class="icon"
                 [ngClass]="{ 'icon-plus': modalProps.title === 'Add', 'icon-floppy': modalProps.title !== 'Add' }"></i>
-            {{ modalProps.title === 'Add' ? 'Add' : 'Save' }}
-            Board
+            {{ modalProps.title === 'Add'
+                ? strings['settings_addBoard']
+                : strings['settings_saveBoard'] }}
         </button>
         <button class="flat" (click)="modal.close(MODAL_ID)">
-            Cancel
+            {{ strings['cancel'] }}
         </button>
     </div>
 </tb-modal>
diff --git a/src/app/settings/user-admin/user-admin.component.ts b/src/app/settings/user-admin/user-admin.component.ts
index f916429..3d9de0b 100644
--- a/src/app/settings/user-admin/user-admin.component.ts
+++ b/src/app/settings/user-admin/user-admin.component.ts
@@ -181,7 +181,7 @@ export class UserAdmin {
 
     private replaceUser(newUser: User) {
         this.users.forEach((user, index) => {
-            if (user.id === +newUser.id) {
+            if (+user.id === +newUser.id) {
                 this.users[index] = this.convertUser(newUser);
                 this.updateUserList();
             }
diff --git a/src/json/en.json b/src/json/en.json
index c5846b1..d203756 100644
--- a/src/json/en.json
+++ b/src/json/en.json
@@ -41,6 +41,7 @@
     "settings_removeUser": "Remove User",
     "settings_addUser": "Add User",
     "settings_editUser": "Edit User",
+    "settings_saveUser": "Save User",
     "settings_confirmUserRemoval": "Confirm User Removal",
     "settings_removeUserWarning": "Removing a user cannot be undone.",
     "settings_continue": "Continue?",
@@ -52,7 +53,7 @@
     "settings_boardAdmin": "Board Admin",
     "settings_admin": "Admin",
 
-    "settings_boardAdmin": "Board Administration",
+    "settings_boardAdministration": "Board Administration",
     "settings_currentBoards": "Current Boards",
     "settings_showByUser": "Show By User",
     "settings_filterBy": "Filter By",
@@ -76,6 +77,18 @@
     "settings_removeColumn": "Remove Column",
     "settings_columnName": "Column Name",
     "settings_addColumn": "Add Column",
-    "settings_categoryName": "Category Name"
+    "settings_removeCategory": "Remove Category",
+    "settings_categoryName": "Category Name",
+    "settings_defaultTaskColor": "Default Task Color",
+    "settings_addCategory": "Add Category",
+    "settings_issueTrackers": "Issue Trackers",
+    "settings_issueTrackersHelp": "Example URL: https://github.com/kiswa/TaskBoard/issues/%BUGID\\1% Example RegExp: (?:Issue)?#(\\d+)",
+    "settings_issueTrakcerUrl": "Issue Tracker URL - use %BUGID% as placeholder",
+    "settings_issueTrackerRegExp": "BUGID RegExp",
+    "settings_addIssueTracker": "Add Issue Tracker",
+    "settings_selectUsers": "Select Users",
+    "settings_boardAdminMessage": "Including a Board Admin, makes them an admin of this board.",
+    "settings_adminAccessMessage": "Administrators have access to all boards and are not listed here.",
+    "settings_saveBoard": "Save Board"
 }
 
diff --git a/src/json/es.json b/src/json/es.json
index c219df7..ca096c3 100644
--- a/src/json/es.json
+++ b/src/json/es.json
@@ -41,6 +41,7 @@
     "settings_removeUser": "Eliminar Usuario",
     "settings_addUser": "Agregar Usuario",
     "settings_editUser": "Cambia Usuario",
+    "settings_saveUser": "Guardar Usuario",
     "settings_confirmUserRemoval": "Confirmar Eliminación del Usuario",
     "settings_removeUserWarning": "No se puede deshacer la eliminación de un usuario.",
     "settings_continue": "¿Continuar?",
@@ -52,7 +53,7 @@
     "settings_boardAdmin": "Administrador de los Tableros",
     "settings_admin": "Administrador",
 
-    "settings_boardAdmin": "Administración de Tableros",
+    "settings_boardAdministration": "Administración de Tableros",
     "settings_currentBoards": "Tableros Actuales",
     "settings_showByUser": "Mostrar por Usuario",
     "settings_filterBy": "Filtrar por",
@@ -76,6 +77,18 @@
     "settings_removeColumn": "Eliminar Columna",
     "settings_columnName": "Nombre del Columna",
     "settings_addColumn": "Agregar Columna",
-    "settings_categoryName": "Nombre del Categoría"
+    "settings_removeCategory": "Eliminar Categoría",
+    "settings_categoryName": "Nombre del Categoría",
+    "settings_defaultTaskColor": "Color de Tarea Predeterminado",
+    "settings_addCategory": "Agregar Categoría",
+    "settings_issueTrackers": "Seguimiento de Incidencias",
+    "settings_issueTrackersHelp": "Ejemplo URL: https://github.com/kiswa/TaskBoard/issues/%BUGID\\1% Ejemplo RegExp: (?:Issue)?#(\\d+)",
+    "settings_issueTrakcerUrl": "URL de Seguimiento de Incidencia: Utilice %BUGID% como marcador de posición",
+    "settings_issueTrackerRegExp": "BUGID RegExp",
+    "settings_addIssueTracker": "Agregar Seguimiento de Incidencia",
+    "settings_selectUsers": "Seleccionar Usuarios",
+    "settings_boardAdminMessage": "Incluyendo un Administrador de Tableros, hace de ellos un administrador de este tablero.",
+    "settings_adminAccessMessage": "Los administradores tienen acceso a todas las tableros y no se enumeran aquí.",
+    "settings_saveBoard": "Guardar Tablero"
 }
 
diff --git a/src/scss/_settings.scss b/src/scss/_settings.scss
index 49eaae0..8968517 100644
--- a/src/scss/_settings.scss
+++ b/src/scss/_settings.scss
@@ -72,7 +72,7 @@
 
         [type="text"] {
             &:first-of-type {
-                width: 380px;
+                width: 430px;
             }
 
             &:last-of-type {