diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
index fd89ac2..a45d00b 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
@@ -88,19 +88,19 @@
                     <th class="col-md-1"></th>
                     <th class="col-md-3">
                         <div class="col-md-1">
-                            <a href="#users?sort=firstAsc"><span data-bind="css:{ 'text-success': $root.sortIsActive('firstAsc')}" class="glyphicon glyphicon-chevron-up"></span></a>
+                            <a href="#users?sort=firstAsc"><span data-bind="css:{ 'text-warning': $root.sortIsActive('firstAsc')}" class="glyphicon glyphicon-chevron-up"></span></a>
                         </div>
                         <div class="col-md-1">
-                            <a href="#users?sort=firstDesc"><span data-bind="css:{ 'text-success': $root.sortIsActive('firstDesc')}" class="glyphicon glyphicon-chevron-down"></span></a>
+                            <a href="#users?sort=firstDesc"><span data-bind="css:{ 'text-warning': $root.sortIsActive('firstDesc')}" class="glyphicon glyphicon-chevron-down"></span></a>
                         </div>
                         <span class="col-md-9">First Name</span>
                     </th>
                     <th class="col-md-3">
                         <div class="col-md-1">
-                            <a href="#users?sort=lastAsc"><span  data-bind="css:{ 'text-success': $root.sortIsActive('lastAsc')}" class="glyphicon glyphicon-chevron-up"></span></a>
+                            <a href="#users?sort=lastAsc"><span  data-bind="css:{ 'text-warning': $root.sortIsActive('lastAsc')}" class="glyphicon glyphicon-chevron-up"></span></a>
                         </div>
                         <div class="col-md-1">
-                            <a href="#users?sort=lastDesc"><span  data-bind="css:{ 'text-success': $root.sortIsActive('lastDesc')}"class="glyphicon glyphicon-chevron-down"></span></a>
+                            <a href="#users?sort=lastDesc"><span  data-bind="css:{ 'text-warning': $root.sortIsActive('lastDesc')}"class="glyphicon glyphicon-chevron-down"></span></a>
                         </div>
                         <span class="col-md-9">Last Name</span></th>
                     <th class="col-md-1 text-center">Contractor</th>
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
index 53c13a6..94e05f4 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
@@ -442,7 +442,7 @@ function DataVM() {
     };
     function convertSortOption(opt) {
         if (!opt) {
-            return SortOptions.LastAsc;
+            return null
         }
         if (opt === "firstAsc") {
             return SortOptions.FirstAsc;
@@ -461,13 +461,13 @@ function DataVM() {
         if (option === "firstAsc" && self.userList().SelectedSortOption === SortOptions.FirstAsc) {
             return true;
         }
-        if (option === "firstDesc" && self.selectedSort() === SortOptions.FirstDesc) {
+        if (option === "firstDesc" && self.userList().SelectedSortOption === SortOptions.FirstDesc) {
             return true;
         }
-        if (option === "lastAsc" && self.selectedSort() === SortOptions.LastAsc) {
+        if (option === "lastAsc" && self.userList().SelectedSortOption === SortOptions.LastAsc) {
             return true;
         }
-        if (option === "lastDesc" && self.selectedSort() === SortOptions.LastDesc) {
+        if (option === "lastDesc" && self.userList().SelectedSortOption === SortOptions.LastDesc) {
             return true;
         }
         return false;