diff --git a/Disco.Web/Views/InitialConfig/Administrators.cshtml b/Disco.Web/Views/InitialConfig/Administrators.cshtml
index 769f605f..56720c4c 100644
--- a/Disco.Web/Views/InitialConfig/Administrators.cshtml
+++ b/Disco.Web/Views/InitialConfig/Administrators.cshtml
@@ -39,7 +39,10 @@
     </div>
 </div>
 <div id="dialogWait" title="Please Wait" class="dialog">
-    <h2><span class="ajaxLoading"></span>Validating Configuration</h2>
+    <h2>
+        <i class="fa fa-lg fa-cog fa-spin"></i>
+        Validating Configuration
+    </h2>
     <div>Please wait while the Disco configuration is validated</div>
 </div>
 @using (Html.BeginForm())
diff --git a/Disco.Web/Views/InitialConfig/Administrators.generated.cs b/Disco.Web/Views/InitialConfig/Administrators.generated.cs
index 4cc90ee7..28c10d57 100644
--- a/Disco.Web/Views/InitialConfig/Administrators.generated.cs
+++ b/Disco.Web/Views/InitialConfig/Administrators.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -241,15 +241,15 @@ WriteLiteral(" title=\"Please Wait\"");
 
 WriteLiteral(" class=\"dialog\"");
 
-WriteLiteral(">\r\n    <h2><span");
+WriteLiteral(">\r\n    <h2>\r\n        <i");
 
-WriteLiteral(" class=\"ajaxLoading\"");
+WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
 
-WriteLiteral("></span>Validating Configuration</h2>\r\n    <div>Please wait while the Disco confi" +
-"guration is validated</div>\r\n</div>\r\n");
+WriteLiteral("></i>\r\n        Validating Configuration\r\n    </h2>\r\n    <div>Please wait while th" +
+"e Disco configuration is validated</div>\r\n</div>\r\n");
 
             
-            #line 45 "..\..\Views\InitialConfig\Administrators.cshtml"
+            #line 48 "..\..\Views\InitialConfig\Administrators.cshtml"
  using (Html.BeginForm())
 {
 
@@ -273,7 +273,7 @@ WriteLiteral(" value=\"Continue\"");
 WriteLiteral(" />\r\n    </div>\r\n");
 
             
-            #line 50 "..\..\Views\InitialConfig\Administrators.cshtml"
+            #line 53 "..\..\Views\InitialConfig\Administrators.cshtml"
 }
 
             
@@ -304,7 +304,7 @@ WriteLiteral(@"<script>
                 url: '");
 
             
-            #line 73 "..\..\Views\InitialConfig\Administrators.cshtml"
+            #line 76 "..\..\Views\InitialConfig\Administrators.cshtml"
                  Write(Url.Action(MVC.InitialConfig.AdministratorsSubject()));
 
             
@@ -340,7 +340,7 @@ WriteLiteral("\',\r\n                method: \'post\',\r\n                data:
 "earch Subjects\')\r\n            .autocomplete({\r\n                source: \'");
 
             
-            #line 130 "..\..\Views\InitialConfig\Administrators.cshtml"
+            #line 133 "..\..\Views\InitialConfig\Administrators.cshtml"
                      Write(Url.Action(MVC.InitialConfig.AdministratorsSearch()));
 
             
diff --git a/Disco.Web/Views/InitialConfig/Complete.cshtml b/Disco.Web/Views/InitialConfig/Complete.cshtml
index afbded65..354f019c 100644
--- a/Disco.Web/Views/InitialConfig/Complete.cshtml
+++ b/Disco.Web/Views/InitialConfig/Complete.cshtml
@@ -168,7 +168,10 @@
     </div>
 </div>
 <div id="dialogWait" title="Please Wait">
-    <h2><span class="ajaxLoading"></span>Re-running Verification Tests</h2>
+    <h2>
+        <i class="fa fa-lg fa-cog fa-spin"></i>
+        Re-running Verification Tests
+    </h2>
     <div>Please wait while the verification tests are performed.</div>
 </div>
 <script>
diff --git a/Disco.Web/Views/InitialConfig/Complete.generated.cs b/Disco.Web/Views/InitialConfig/Complete.generated.cs
index 4c0a6f8e..46a05e26 100644
--- a/Disco.Web/Views/InitialConfig/Complete.generated.cs
+++ b/Disco.Web/Views/InitialConfig/Complete.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -689,11 +689,13 @@ WriteLiteral(" id=\"dialogWait\"");
 
 WriteLiteral(" title=\"Please Wait\"");
 
-WriteLiteral(">\r\n    <h2><span");
+WriteLiteral(">\r\n    <h2>\r\n        <i");
 
-WriteLiteral(" class=\"ajaxLoading\"");
+WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
 
-WriteLiteral(@"></span>Re-running Verification Tests</h2>
+WriteLiteral(@"></i>
+        Re-running Verification Tests
+    </h2>
     <div>Please wait while the verification tests are performed.</div>
 </div>
 <script>
diff --git a/Disco.Web/Views/InitialConfig/Database.cshtml b/Disco.Web/Views/InitialConfig/Database.cshtml
index 38405818..6d05889c 100644
--- a/Disco.Web/Views/InitialConfig/Database.cshtml
+++ b/Disco.Web/Views/InitialConfig/Database.cshtml
@@ -6,12 +6,13 @@
 @using (Html.BeginForm())
 {
     @Html.ValidationSummary(true)
-    
+
     <div class="form" style="width: 650px">
         <h2>SQL Server Connection</h2>
         <table>
             <tr>
-                <th style="width: 150px;">Server:
+                <th style="width: 150px;">
+                    Server:
                 </th>
                 <td>
                     @Html.EditorFor(m => m.Server) @Html.ValidationMessageFor(m => m.Server)
@@ -22,7 +23,8 @@
                 </td>
             </tr>
             <tr>
-                <th>Database Name:
+                <th>
+                    Database Name:
                 </th>
                 <td>
                     @Html.EditorFor(m => m.DatabaseName)  @Html.ValidationMessageFor(m => m.DatabaseName)
@@ -32,7 +34,8 @@
                 </td>
             </tr>
             <tr>
-                <th>Authentication Method:
+                <th>
+                    Authentication Method:
                 </th>
                 <td>
                     @Html.DropDownListFor(m => m.AuthMethod, Model.AuthMethods) @Html.ValidationMessageFor(m => m.AuthMethod)
@@ -65,7 +68,10 @@
     </div>
 }
 <div id="dialogWait" title="Please Wait">
-    <h2><span class="ajaxLoading"></span>Building and Validating Database</h2>
+    <h2>
+        <i class="fa fa-lg fa-cog fa-spin"></i>
+        Building and Validating Database
+    </h2>
     <div>Please wait while the Disco database is created and/or validated</div>
 </div>
 <script>
diff --git a/Disco.Web/Views/InitialConfig/Database.generated.cs b/Disco.Web/Views/InitialConfig/Database.generated.cs
index 04312e83..a77fb31c 100644
--- a/Disco.Web/Views/InitialConfig/Database.generated.cs
+++ b/Disco.Web/Views/InitialConfig/Database.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -81,7 +81,7 @@ Write(Html.ValidationSummary(true));
             
             #line 8 "..\..\Views\InitialConfig\Database.cshtml"
                                  
-    
+
 
             
             #line default
@@ -97,12 +97,12 @@ WriteLiteral(">\r\n        <h2>SQL Server Connection</h2>\r\n        <table>\r\n
 
 WriteLiteral(" style=\"width: 150px;\"");
 
-WriteLiteral(">Server:\r\n                </th>\r\n                <td>\r\n");
+WriteLiteral(">\r\n                    Server:\r\n                </th>\r\n                <td>\r\n");
 
 WriteLiteral("                    ");
 
             
-            #line 17 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 18 "..\..\Views\InitialConfig\Database.cshtml"
                Write(Html.EditorFor(m => m.Server));
 
             
@@ -111,7 +111,7 @@ WriteLiteral("                    ");
 WriteLiteral(" ");
 
             
-            #line 17 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 18 "..\..\Views\InitialConfig\Database.cshtml"
                                               Write(Html.ValidationMessageFor(m => m.Server));
 
             
@@ -127,13 +127,13 @@ WriteLiteral(">\r\n                        If the default instance of SQL Server
 WriteLiteral(" class=\"code\"");
 
 WriteLiteral(">\"SERVER_NAME\\INSTANCE_NAME\"</span>\r\n                    </div>\r\n                " +
-"</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Database Name:\r\n" +
-"                </th>\r\n                <td>\r\n");
+"</td>\r\n            </tr>\r\n            <tr>\r\n                <th>\r\n              " +
+"      Database Name:\r\n                </th>\r\n                <td>\r\n");
 
 WriteLiteral("                    ");
 
             
-            #line 28 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 30 "..\..\Views\InitialConfig\Database.cshtml"
                Write(Html.EditorFor(m => m.DatabaseName));
 
             
@@ -142,7 +142,7 @@ WriteLiteral("                    ");
 WriteLiteral("  ");
 
             
-            #line 28 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 30 "..\..\Views\InitialConfig\Database.cshtml"
                                                      Write(Html.ValidationMessageFor(m => m.DatabaseName));
 
             
@@ -158,7 +158,8 @@ WriteLiteral(@">
                 </td>
             </tr>
             <tr>
-                <th>Authentication Method:
+                <th>
+                    Authentication Method:
                 </th>
                 <td>
 ");
@@ -166,7 +167,7 @@ WriteLiteral(@">
 WriteLiteral("                    ");
 
             
-            #line 38 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 41 "..\..\Views\InitialConfig\Database.cshtml"
                Write(Html.DropDownListFor(m => m.AuthMethod, Model.AuthMethods));
 
             
@@ -175,7 +176,7 @@ WriteLiteral("                    ");
 WriteLiteral(" ");
 
             
-            #line 38 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 41 "..\..\Views\InitialConfig\Database.cshtml"
                                                                            Write(Html.ValidationMessageFor(m => m.AuthMethod));
 
             
@@ -219,7 +220,7 @@ WriteLiteral(">\r\n                            <tr>\r\n
 ":</th>\r\n                                <td>");
 
             
-            #line 51 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 54 "..\..\Views\InitialConfig\Database.cshtml"
                                Write(Html.EditorFor(m => m.Auth_SQL_Username));
 
             
@@ -228,7 +229,7 @@ WriteLiteral(">\r\n                            <tr>\r\n
 WriteLiteral("  ");
 
             
-            #line 51 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 54 "..\..\Views\InitialConfig\Database.cshtml"
                                                                           Write(Html.ValidationMessageFor(m => m.Auth_SQL_Username));
 
             
@@ -239,7 +240,7 @@ WriteLiteral("</td>\r\n                            </tr>\r\n
 "td>");
 
             
-            #line 55 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 58 "..\..\Views\InitialConfig\Database.cshtml"
                                Write(Html.EditorFor(m => m.Auth_SQL_Password));
 
             
@@ -248,7 +249,7 @@ WriteLiteral("</td>\r\n                            </tr>\r\n
 WriteLiteral("  ");
 
             
-            #line 55 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 58 "..\..\Views\InitialConfig\Database.cshtml"
                                                                           Write(Html.ValidationMessageFor(m => m.Auth_SQL_Password));
 
             
@@ -275,7 +276,7 @@ WriteLiteral(" value=\"Continue\"");
 WriteLiteral(" />\r\n    </div>\r\n");
 
             
-            #line 66 "..\..\Views\InitialConfig\Database.cshtml"
+            #line 69 "..\..\Views\InitialConfig\Database.cshtml"
 }
 
             
@@ -287,33 +288,33 @@ WriteLiteral(" id=\"dialogWait\"");
 
 WriteLiteral(" title=\"Please Wait\"");
 
-WriteLiteral(">\r\n    <h2><span");
+WriteLiteral(">\r\n    <h2>\r\n        <i");
 
-WriteLiteral(" class=\"ajaxLoading\"");
+WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
 
-WriteLiteral("></span>Building and Validating Database</h2>\r\n    <div>Please wait while the Dis" +
-"co database is created and/or validated</div>\r\n</div>\r\n<script>\r\n    (function (" +
-") {\r\n\r\n        $(function () {\r\n            var initialized = false;\r\n\r\n        " +
-"    $(\'#AuthMethod\').change(function () {\r\n                $this = $(this);\r\n   " +
-"             if ($this.val() === \'SQL\') {\r\n                    // Enable Validat" +
-"ion\r\n                    $(\'#Auth_SQL_Username\').attr(\'data-val\', true).attr(\'da" +
-"ta-val-required\', \'The Username is required\');\r\n                    $(\'#Auth_SQL" +
-"_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'The Password is re" +
-"quired\');\r\n\r\n                    $(\'#auth_Sql\').slideDown();\r\n                } " +
-"else {\r\n                    $(\'#Auth_SQL_Username\').attr(\'data-val\', false);\r\n  " +
-"                  $(\'#Auth_SQL_Password\').attr(\'data-val\', false);\r\n\r\n          " +
-"          $(\'#auth_Sql\').slideUp();\r\n                }\r\n\r\n                // Reb" +
-"uild Validation\r\n                if (initialized) {\r\n                    $.valid" +
-"ator.unobtrusive.reparse(\'#auth_Sql\');\r\n                }\r\n            }).change" +
-"();\r\n\r\n            $(\'#dialogWait\').dialog({\r\n                autoOpen: false,\r\n" +
-"                draggable: false,\r\n                modal: true,\r\n               " +
-" resizable: false,\r\n                width: 400,\r\n                height: 150,\r\n " +
-"               closeOnEscape: false\r\n            }).closest(\'.ui-dialog\').find(\'" +
-".ui-dialog-titlebar-close\').hide();\r\n\r\n            $(\'#submitForm\').closest(\'for" +
-"m\').submit(function () {\r\n                if ($(this).valid()) {\r\n              " +
-"      $(\'#dialogWait\').dialog(\'open\');\r\n                }\r\n                retur" +
-"n true;\r\n            });\r\n\r\n            initialized = true;\r\n        });\r\n\r\n    " +
-"})();\r\n</script>\r\n");
+WriteLiteral("></i>\r\n        Building and Validating Database\r\n    </h2>\r\n    <div>Please wait " +
+"while the Disco database is created and/or validated</div>\r\n</div>\r\n<script>\r\n  " +
+"  (function () {\r\n\r\n        $(function () {\r\n            var initialized = false" +
+";\r\n\r\n            $(\'#AuthMethod\').change(function () {\r\n                $this = " +
+"$(this);\r\n                if ($this.val() === \'SQL\') {\r\n                    // E" +
+"nable Validation\r\n                    $(\'#Auth_SQL_Username\').attr(\'data-val\', t" +
+"rue).attr(\'data-val-required\', \'The Username is required\');\r\n                   " +
+" $(\'#Auth_SQL_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'The P" +
+"assword is required\');\r\n\r\n                    $(\'#auth_Sql\').slideDown();\r\n     " +
+"           } else {\r\n                    $(\'#Auth_SQL_Username\').attr(\'data-val\'" +
+", false);\r\n                    $(\'#Auth_SQL_Password\').attr(\'data-val\', false);\r" +
+"\n\r\n                    $(\'#auth_Sql\').slideUp();\r\n                }\r\n\r\n         " +
+"       // Rebuild Validation\r\n                if (initialized) {\r\n              " +
+"      $.validator.unobtrusive.reparse(\'#auth_Sql\');\r\n                }\r\n        " +
+"    }).change();\r\n\r\n            $(\'#dialogWait\').dialog({\r\n                autoO" +
+"pen: false,\r\n                draggable: false,\r\n                modal: true,\r\n  " +
+"              resizable: false,\r\n                width: 400,\r\n                he" +
+"ight: 150,\r\n                closeOnEscape: false\r\n            }).closest(\'.ui-di" +
+"alog\').find(\'.ui-dialog-titlebar-close\').hide();\r\n\r\n            $(\'#submitForm\')" +
+".closest(\'form\').submit(function () {\r\n                if ($(this).valid()) {\r\n " +
+"                   $(\'#dialogWait\').dialog(\'open\');\r\n                }\r\n        " +
+"        return true;\r\n            });\r\n\r\n            initialized = true;\r\n      " +
+"  });\r\n\r\n    })();\r\n</script>\r\n");
 
         }
     }
diff --git a/Disco.Web/Views/InitialConfig/FileStore.cshtml b/Disco.Web/Views/InitialConfig/FileStore.cshtml
index caf28d15..d542efd5 100644
--- a/Disco.Web/Views/InitialConfig/FileStore.cshtml
+++ b/Disco.Web/Views/InitialConfig/FileStore.cshtml
@@ -38,7 +38,10 @@
     }
 </div>
 <div id="dialogWait" title="Please Wait" class="dialog">
-    <h2><span class="ajaxLoading"></span>Building and Validating File Store</h2>
+    <h2>
+        <i class="fa fa-lg fa-cog fa-spin"></i>
+        Building and Validating File Store
+    </h2>
     <div>Please wait while the Disco File Store is created and/or validated</div>
 </div>
 <div id="dialogCreateDirectory" title="Create Directory" class="dialog">
diff --git a/Disco.Web/Views/InitialConfig/FileStore.generated.cs b/Disco.Web/Views/InitialConfig/FileStore.generated.cs
index 7bf4d0be..58f330af 100644
--- a/Disco.Web/Views/InitialConfig/FileStore.generated.cs
+++ b/Disco.Web/Views/InitialConfig/FileStore.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -181,12 +181,12 @@ WriteLiteral(" title=\"Please Wait\"");
 
 WriteLiteral(" class=\"dialog\"");
 
-WriteLiteral(">\r\n    <h2><span");
+WriteLiteral(">\r\n    <h2>\r\n        <i");
 
-WriteLiteral(" class=\"ajaxLoading\"");
+WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
 
-WriteLiteral("></span>Building and Validating File Store</h2>\r\n    <div>Please wait while the D" +
-"isco File Store is created and/or validated</div>\r\n</div>\r\n<div");
+WriteLiteral("></i>\r\n        Building and Validating File Store\r\n    </h2>\r\n    <div>Please wai" +
+"t while the Disco File Store is created and/or validated</div>\r\n</div>\r\n<div");
 
 WriteLiteral(" id=\"dialogCreateDirectory\"");
 
@@ -211,7 +211,7 @@ WriteLiteral("></span></div>\r\n</div>\r\n<script>\r\n    (function () {\r\n
 "       var fileSystemBranchUrl = \'");
 
             
-            #line 54 "..\..\Views\InitialConfig\FileStore.cshtml"
+            #line 57 "..\..\Views\InitialConfig\FileStore.cshtml"
                                Write(Url.Action(MVC.InitialConfig.FileStoreBranch()));
 
             
@@ -220,7 +220,7 @@ WriteLiteral("></span></div>\r\n</div>\r\n<script>\r\n    (function () {\r\n
 WriteLiteral("\';\r\n        var rootNodes = processNode(");
 
             
-            #line 55 "..\..\Views\InitialConfig\FileStore.cshtml"
+            #line 58 "..\..\Views\InitialConfig\FileStore.cshtml"
                                 Write(new HtmlString(Json.Encode(Model.DirectoryModel)));
 
             
diff --git a/Disco.Web/Views/InitialConfig/RestartWebApp.cshtml b/Disco.Web/Views/InitialConfig/RestartWebApp.cshtml
index d0e2f094..cd2f1933 100644
--- a/Disco.Web/Views/InitialConfig/RestartWebApp.cshtml
+++ b/Disco.Web/Views/InitialConfig/RestartWebApp.cshtml
@@ -3,7 +3,10 @@
 }
 <h1>@CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco")</h1>
 <div id="dialog" title="Please Wait" style="padding-top: 30px;">
-    <h2><span class="ajaxLoading" style="margin-right: 15px;"></span>Starting Disco</h2>
+    <h2>
+        <i class="fa fa-lg fa-cog fa-spin"></i>
+        Starting Disco
+    </h2>
     <div style="padding-left: 31px;">Please wait while the Disco environment is initialized</div>
 </div>
 <script>
diff --git a/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs b/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
index 02cae9b3..b1067c57 100644
--- a/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
+++ b/Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -69,13 +69,11 @@ WriteLiteral(" title=\"Please Wait\"");
 
 WriteLiteral(" style=\"padding-top: 30px;\"");
 
-WriteLiteral(">\r\n    <h2><span");
+WriteLiteral(">\r\n    <h2>\r\n        <i");
 
-WriteLiteral(" class=\"ajaxLoading\"");
+WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
 
-WriteLiteral(" style=\"margin-right: 15px;\"");
-
-WriteLiteral("></span>Starting Disco</h2>\r\n    <div");
+WriteLiteral("></i>\r\n        Starting Disco\r\n    </h2>\r\n    <div");
 
 WriteLiteral(" style=\"padding-left: 31px;\"");