diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
index ae8cf12..c62c7de 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
@@ -163,7 +163,7 @@
     }
     self.convertToDisplayDateTime = function (dateValue) {
         var date = new Date(dateValue); // dd MM YY HH:mm:ss e.g.: 01 Mar 17 17:34:02
-        return date.getDay() + " "
+        return date.getDate() + " "
             + date.toLocaleString("en-us", { month: "long" }) + " "
             + (date.getYear()-100) + "  "
             + self.padNumber(date.getHours()) + ":"
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.min.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.min.js
index a05021f..47caf59 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.min.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.min.js
@@ -1 +1 @@
-function DataVM(){"use strict";var n=this;n.menuOptions=["Home"];n.chosenMenuItemId=ko.observable();n.appDetails=ko.observable(null);n.userList=ko.observable(null);n.groupsList=ko.observable(null);n.chosenUserDetails=ko.observable(null);n.userTimeLogData=ko.observable(null);n.unassignedCardData=ko.observable(null);n.chosenTimeLogUserId=-1;n.selectedCalendarWeek=ko.observable(0);n.errorData=ko.observable(null);n.apiEndpoints={root:"http://localhost:8800",getUserList:"/api/users",getUserDetails:"/api/users",editUser:"/api/users/edit",getTimeLogs:"/api/timelogs",getUnassignedCards:"/api/cards/unassigned",getGroups:"/api/groups",getAppDetails:"/api/app"};n.uiPages={users:"users",userDetails:"userData",timeLogs:"timelogs",home:function(){return this.users}};n.goToMenuOption=function(n){location.hash=n;console.log("goToMenuOption: "+n)};n.goToUserDetails=function(t){location.hash=n.uiPages.userDetails+"/"+t.UserId};n.goToTimeLogs=function(t,i,r){var f,u;f=t.UserId?t.UserId:t;u="timelogs/"+f;r&&(u=n.createRequestUrl(u,r,!1,!1));location.hash=u};n.assignErrorObject=function(t,i,r){var u={errorCode:t,errorMessage:i,errorSource:r,errorDate:(new Date).toDateString("yyyy-mm-dd")};n.errorData(u)};n.processRequestFailure=function(n){return n.readyState===4?{errorCode:n.status,errorMessage:n.statusText,errorSource:""}:n.readyState===0?{errorCode:n.status,errorMessage:"Network Error - Is the server available?",errorSource:""}:{errorCode:n.status,errorMessage:"Unknown Error",errorSource:""}};n.createRequestUrl=function(t,i,r,u){var o="?",f="",e;if(u&&(f=n.apiEndpoints.root),f=f+t,i!==undefined&&i!==null&&i.length>0)for(e=0;e<i.length;e++)f+=o+i[e].key+"="+i[e].value,o="&";return r&&(f+=o+"callback=?"),f};n.returnButtonClick=function(t,i){var r=null,f,u;if(i.target?r=i.target:i.srcElement&&(r=i.srcElement),f="",r!=null){for(u=0;u<r.attributes.length;u++)if(r.attributes[u].nodeName==="pagedestination"){f=r.attributes[u].value;break}f!==""&&n.goToMenuOption(f)}else console.log("target is null, going nowhere")};n.convertToHours=function(n){var t=n/60,i,r;return t<1?n+" mins":(i=Math.floor(t),r=Math.floor(t%1*60),i+" hrs "+r+" minutes")};n.convertToDisplayTime=function(t){var i=new Date(t);return i.getHours()+":"+n.padNumber(i.getMinutes())};n.correctLogOffset=function(n){return n%2!=0&&(n+=1),n};n.round=function(n,t){return parseFloat(Math.round(n*100)/100).toFixed(t)};n.getTimeLogEntryArrayLength=function(n){return Math.round(n/2)};n.padNumber=function(n){return(n<10?"0":"")+n};n.convertToDisplayDateTime=function(t){var i=new Date(t);return i.getDay()+" "+i.toLocaleString("en-us",{month:"long"})+" "+(i.getYear()-100)+"  "+n.padNumber(i.getHours())+":"+n.padNumber(i.getMinutes())+":"+n.padNumber(i.getSeconds())};n.dismissAlert=function(){n.errorData(null)};n.setPageSize=function(t){n.userList().PageSize!==t&&n.userList().PageSize!==-1&&n.setPagination(t,1)};n.goToUserPage=function(t){n.userList().PageNumber!==t&&n.userList().PageNumber!==-1&&n.setPagination(n.userList().PageSize,t)};n.getCurrentGroupFilter=function(){return n.userList()!==null&&n.userList().GroupFilter!==null?n.userList().GroupFilter.Name:""};n.clearGroupFilter=function(){n.setPagination(20,1)};n.hasGroupFilter=function(){return n.userList()!==null&&n.userList().GroupFilter?!0:!1};n.hasQuery=function(){return n.userList()!==null&&n.userList().Query&&n.userList().Query!==""?!0:!1};n.groupFilter=function(t){console.log("filter by group: "+t);var r=[{key:"groupId",value:t}],i=n.createRequestUrl("users",r,!1,!1);location.hash=i;console.log(i)};n.setPagination=function(t,i){var u=[{key:"pageSize",value:t},{key:"pageNumber",value:i}],r=n.createRequestUrl("users",u,!1,!1);location.hash=r;console.log(r)};n.initDatePicker=function(n){$("#weeklyDatePicker").datepicker({weekStart:1,maxViewMode:2,endDate:"+0d",todayBtn:"linked",format:"yyyy-mm-dd",todayHighlight:!0,calendarWeeks:!0});n=n?new Date(n):new Date;$("#weeklyDatePicker").datepicker("setDate",n)};n.assignHandler=function(){var t=$("#weeklyDatePicker")[0],i=jQuery.hasData(t)&&jQuery._data(t);if(!i.events.changeDate)$("#weeklyDatePicker").on("changeDate",function(t){var i=t.date;n.selectedCalendarWeek(moment(i).isoWeek());n.goToTimeLogs(n.chosenTimeLogUserId,null,[{key:"selectedDate",value:moment(i).format("MM-DD-YYYY")}])})};n.getUserList=function(t,i,r){var u=null,f;t&&i?u=[{key:"pageSize",value:t},{key:"pageNumber",value:i}]:r&&(u=[{key:"groupId",value:r}]);f=n.createRequestUrl(n.apiEndpoints.getUserList,u,!1);$.getJSON(f,function(t){n.userList(t);$('[data-toggle="tooltip"]').tooltip()}).fail(function(t,i,r){console.log("error - getusers");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUserList")})};n.getAppDetails=function(){var t=n.createRequestUrl(n.apiEndpoints.getAppDetails,null,!1,!1);$.getJSON(t,function(t){n.appDetails(t)}).fail(function(t,i,r){console.log("error - getusers");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUserList")})};n.searchUsers=function(t){var i=n.createRequestUrl(n.apiEndpoints.getUserList,[{key:"query",value:t}],!1,!1);$.getJSON(i,function(t){n.userList(t)}).fail(function(t,i,r){n.goToMenuOption(n.uiPages.home());var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"searchUsers")})};n.getUserDetails=function(t){var i=n.createRequestUrl(n.apiEndpoints.getUserDetails+"/"+t,null,!1);$.getJSON(i,function(t){n.chosenUserDetails(t)}).fail(function(t,i,r){console.log("error - getuserdetails");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUserDetails");n.goToMenuOption(n.uiPages.home())})};n.submitChangedUser=function(t){var i=n.apiEndpoints.editUser;$.post(i,t,function(){},"json").done(function(){n.chosenUserDetails(null);n.goToMenuOption(n.uiPages.home())}).fail(function(t,i,r){var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"submitChangedUser");n.chosenUserDetails(null);n.goToMenuOption(n.uiPages.home())})};n.getTimeLogData=function(t,i){var r=[{key:"userId",value:t}],u;i&&r.push({key:"selectedDate",value:i});u=n.createRequestUrl(n.apiEndpoints.getTimeLogs,r,!1);$.getJSON(u,function(t){n.userTimeLogData(t);n.initDatePicker(t.SelectedDate);n.assignHandler()}).fail(function(t,i,r){console.log("error - getuserdetails");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getTimeLogData");n.goToMenuOption(n.uiPages.home())})};n.getUnassignedCardData=function(){var t=n.createRequestUrl(n.apiEndpoints.getUnassignedCards,null,!1);$.getJSON(t,function(t){n.unassignedCardData(t)}).fail(function(t,i,r){console.log("error - getuserdetails");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUnassignedCardData")})};n.getGroups=function(t){var i=n.createRequestUrl(n.apiEndpoints.getGroups,null,!1);return $.getJSON(i,function(n){t(n)}).fail(function(t,i,r){console.log("error - getGroups");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getGroups")})};Sammy(function(){this.get("#users",function(){var i=this.params.query,r=this.params.pageSize,u=this.params.pageNumber,t=this.params.groupId;n.chosenMenuItemId("Home");n.chosenUserDetails(null);n.userList(null);n.userTimeLogData(null);n.appDetails()===null&&n.getAppDetails();n.getGroups(function(t){n.groupsList(t)});i?n.searchUsers(i):t&&t>0?n.getUserList(null,null,t):n.getUserList(r,u)});this.get("#userData/:userId",function(){n.chosenMenuItemId("Data");n.userList(null);n.getUserDetails(this.params.userId);n.userTimeLogData(null);n.getUnassignedCardData()});this.get("#timelogs/:userId",function(){var t=this.params.selectedDate;n.chosenMenuItemId("Other");n.userList(null);n.chosenUserDetails(null);n.chosenTimeLogUserId=this.params.userId;n.getTimeLogData(this.params.userId,t)});this.get("#newUser",function(){n.chosenMenuItemId("newUser");n.userList(null);n.userTimeLogData(null);n.chosenUserDetails({UserId:-1,FirstName:null,LastName:null,HoursPerWeek:null,AssociatedIdentifiers:[],Groups:[],IsContractor:!1});n.getGroups(function(t){n.chosenUserDetails().Groups=t;n.chosenUserDetails.valueHasMutated()});n.getUnassignedCardData()});this.get("#stats",function(){n.goToMenuOption("users")});this.post("#edituser",function(){return $.each(n.chosenUserDetails().AssociatedIdentifiers,function(t,i){i.IsAssociatedToUser!==!0&&n.chosenUserDetails().AssociatedIdentifiers.splice(t,1)}),$.each(n.unassignedCardData().data,function(t,i){i.IsAssociatedToUser===!0&&n.chosenUserDetails().AssociatedIdentifiers.push(i)}),n.submitChangedUser(n.chosenUserDetails()),!1});this.get("",function(){this.app.runRoute("get","#"+n.uiPages.home())})}).run()}ko.applyBindings(new DataVM);$(document).on("mouseenter",".datepicker-days tbody tr",function(){$(this).addClass("highlight")});$(document).on("mouseleave",".datepicker-days tbody tr",function(){$(this).removeClass("highlight")})
\ No newline at end of file
+function DataVM(){"use strict";var n=this;n.menuOptions=["Home"];n.chosenMenuItemId=ko.observable();n.appDetails=ko.observable(null);n.userList=ko.observable(null);n.groupsList=ko.observable(null);n.chosenUserDetails=ko.observable(null);n.userTimeLogData=ko.observable(null);n.unassignedCardData=ko.observable(null);n.chosenTimeLogUserId=-1;n.selectedCalendarWeek=ko.observable(0);n.errorData=ko.observable(null);n.apiEndpoints={root:"http://localhost:8800",getUserList:"/api/users",getUserDetails:"/api/users",editUser:"/api/users/edit",getTimeLogs:"/api/timelogs",getUnassignedCards:"/api/cards/unassigned",getGroups:"/api/groups",getAppDetails:"/api/app"};n.uiPages={users:"users",userDetails:"userData",timeLogs:"timelogs",home:function(){return this.users}};n.goToMenuOption=function(n){location.hash=n;console.log("goToMenuOption: "+n)};n.goToUserDetails=function(t){location.hash=n.uiPages.userDetails+"/"+t.UserId};n.goToTimeLogs=function(t,i,r){var f,u;f=t.UserId?t.UserId:t;u="timelogs/"+f;r&&(u=n.createRequestUrl(u,r,!1,!1));location.hash=u};n.assignErrorObject=function(t,i,r){var u={errorCode:t,errorMessage:i,errorSource:r,errorDate:(new Date).toDateString("yyyy-mm-dd")};n.errorData(u)};n.processRequestFailure=function(n){return n.readyState===4?{errorCode:n.status,errorMessage:n.statusText,errorSource:""}:n.readyState===0?{errorCode:n.status,errorMessage:"Network Error - Is the server available?",errorSource:""}:{errorCode:n.status,errorMessage:"Unknown Error",errorSource:""}};n.createRequestUrl=function(t,i,r,u){var o="?",f="",e;if(u&&(f=n.apiEndpoints.root),f=f+t,i!==undefined&&i!==null&&i.length>0)for(e=0;e<i.length;e++)f+=o+i[e].key+"="+i[e].value,o="&";return r&&(f+=o+"callback=?"),f};n.returnButtonClick=function(t,i){var r=null,f,u;if(i.target?r=i.target:i.srcElement&&(r=i.srcElement),f="",r!=null){for(u=0;u<r.attributes.length;u++)if(r.attributes[u].nodeName==="pagedestination"){f=r.attributes[u].value;break}f!==""&&n.goToMenuOption(f)}else console.log("target is null, going nowhere")};n.convertToHours=function(n){var t=n/60,i,r;return t<1?n+" mins":(i=Math.floor(t),r=Math.floor(t%1*60),i+" hrs "+r+" minutes")};n.convertToDisplayTime=function(t){var i=new Date(t);return i.getHours()+":"+n.padNumber(i.getMinutes())};n.correctLogOffset=function(n){return n%2!=0&&(n+=1),n};n.round=function(n,t){return parseFloat(Math.round(n*100)/100).toFixed(t)};n.getTimeLogEntryArrayLength=function(n){return Math.round(n/2)};n.padNumber=function(n){return(n<10?"0":"")+n};n.convertToDisplayDateTime=function(t){var i=new Date(t);return i.getDate()+" "+i.toLocaleString("en-us",{month:"long"})+" "+(i.getYear()-100)+"  "+n.padNumber(i.getHours())+":"+n.padNumber(i.getMinutes())+":"+n.padNumber(i.getSeconds())};n.dismissAlert=function(){n.errorData(null)};n.setPageSize=function(t){n.userList().PageSize!==t&&n.userList().PageSize!==-1&&n.setPagination(t,1)};n.goToUserPage=function(t){n.userList().PageNumber!==t&&n.userList().PageNumber!==-1&&n.setPagination(n.userList().PageSize,t)};n.getCurrentGroupFilter=function(){return n.userList()!==null&&n.userList().GroupFilter!==null?n.userList().GroupFilter.Name:""};n.clearGroupFilter=function(){n.setPagination(20,1)};n.hasGroupFilter=function(){return n.userList()!==null&&n.userList().GroupFilter?!0:!1};n.hasQuery=function(){return n.userList()!==null&&n.userList().Query&&n.userList().Query!==""?!0:!1};n.groupFilter=function(t){console.log("filter by group: "+t);var r=[{key:"groupId",value:t}],i=n.createRequestUrl("users",r,!1,!1);location.hash=i;console.log(i)};n.setPagination=function(t,i){var u=[{key:"pageSize",value:t},{key:"pageNumber",value:i}],r=n.createRequestUrl("users",u,!1,!1);location.hash=r;console.log(r)};n.initDatePicker=function(n){$("#weeklyDatePicker").datepicker({weekStart:1,maxViewMode:2,endDate:"+0d",todayBtn:"linked",format:"yyyy-mm-dd",todayHighlight:!0,calendarWeeks:!0});n=n?new Date(n):new Date;$("#weeklyDatePicker").datepicker("setDate",n)};n.assignHandler=function(){var t=$("#weeklyDatePicker")[0],i=jQuery.hasData(t)&&jQuery._data(t);if(!i.events.changeDate)$("#weeklyDatePicker").on("changeDate",function(t){var i=t.date;n.selectedCalendarWeek(moment(i).isoWeek());n.goToTimeLogs(n.chosenTimeLogUserId,null,[{key:"selectedDate",value:moment(i).format("MM-DD-YYYY")}])})};n.getUserList=function(t,i,r){var u=null,f;t&&i?u=[{key:"pageSize",value:t},{key:"pageNumber",value:i}]:r&&(u=[{key:"groupId",value:r}]);f=n.createRequestUrl(n.apiEndpoints.getUserList,u,!1);$.getJSON(f,function(t){n.userList(t);$('[data-toggle="tooltip"]').tooltip()}).fail(function(t,i,r){console.log("error - getusers");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUserList")})};n.getAppDetails=function(){var t=n.createRequestUrl(n.apiEndpoints.getAppDetails,null,!1,!1);$.getJSON(t,function(t){n.appDetails(t)}).fail(function(t,i,r){console.log("error - getusers");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUserList")})};n.searchUsers=function(t){var i=n.createRequestUrl(n.apiEndpoints.getUserList,[{key:"query",value:t}],!1,!1);$.getJSON(i,function(t){n.userList(t)}).fail(function(t,i,r){n.goToMenuOption(n.uiPages.home());var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"searchUsers")})};n.getUserDetails=function(t){var i=n.createRequestUrl(n.apiEndpoints.getUserDetails+"/"+t,null,!1);$.getJSON(i,function(t){n.chosenUserDetails(t)}).fail(function(t,i,r){console.log("error - getuserdetails");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUserDetails");n.goToMenuOption(n.uiPages.home())})};n.submitChangedUser=function(t){var i=n.apiEndpoints.editUser;$.post(i,t,function(){},"json").done(function(){n.chosenUserDetails(null);n.goToMenuOption(n.uiPages.home())}).fail(function(t,i,r){var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"submitChangedUser");n.chosenUserDetails(null);n.goToMenuOption(n.uiPages.home())})};n.getTimeLogData=function(t,i){var r=[{key:"userId",value:t}],u;i&&r.push({key:"selectedDate",value:i});u=n.createRequestUrl(n.apiEndpoints.getTimeLogs,r,!1);$.getJSON(u,function(t){n.userTimeLogData(t);n.initDatePicker(t.SelectedDate);n.assignHandler()}).fail(function(t,i,r){console.log("error - getuserdetails");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getTimeLogData");n.goToMenuOption(n.uiPages.home())})};n.getUnassignedCardData=function(){var t=n.createRequestUrl(n.apiEndpoints.getUnassignedCards,null,!1);$.getJSON(t,function(t){n.unassignedCardData(t)}).fail(function(t,i,r){console.log("error - getuserdetails");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getUnassignedCardData")})};n.getGroups=function(t){var i=n.createRequestUrl(n.apiEndpoints.getGroups,null,!1);return $.getJSON(i,function(n){t(n)}).fail(function(t,i,r){console.log("error - getGroups");var u=n.processRequestFailure(t,i,r);n.assignErrorObject(u.errorCode,u.errorMessage,"getGroups")})};Sammy(function(){this.get("#users",function(){var i=this.params.query,r=this.params.pageSize,u=this.params.pageNumber,t=this.params.groupId;n.chosenMenuItemId("Home");n.chosenUserDetails(null);n.userList(null);n.userTimeLogData(null);n.appDetails()===null&&n.getAppDetails();n.getGroups(function(t){n.groupsList(t)});i?n.searchUsers(i):t&&t>0?n.getUserList(null,null,t):n.getUserList(r,u)});this.get("#userData/:userId",function(){n.chosenMenuItemId("Data");n.userList(null);n.getUserDetails(this.params.userId);n.userTimeLogData(null);n.getUnassignedCardData()});this.get("#timelogs/:userId",function(){var t=this.params.selectedDate;n.chosenMenuItemId("Other");n.userList(null);n.chosenUserDetails(null);n.chosenTimeLogUserId=this.params.userId;n.getTimeLogData(this.params.userId,t)});this.get("#newUser",function(){n.chosenMenuItemId("newUser");n.userList(null);n.userTimeLogData(null);n.chosenUserDetails({UserId:-1,FirstName:null,LastName:null,HoursPerWeek:null,AssociatedIdentifiers:[],Groups:[],IsContractor:!1});n.getGroups(function(t){n.chosenUserDetails().Groups=t;n.chosenUserDetails.valueHasMutated()});n.getUnassignedCardData()});this.get("#stats",function(){n.goToMenuOption("users")});this.post("#edituser",function(){return $.each(n.chosenUserDetails().AssociatedIdentifiers,function(t,i){i.IsAssociatedToUser!==!0&&n.chosenUserDetails().AssociatedIdentifiers.splice(t,1)}),$.each(n.unassignedCardData().data,function(t,i){i.IsAssociatedToUser===!0&&n.chosenUserDetails().AssociatedIdentifiers.push(i)}),n.submitChangedUser(n.chosenUserDetails()),!1});this.get("",function(){this.app.runRoute("get","#"+n.uiPages.home())})}).run()}ko.applyBindings(new DataVM);$(document).on("mouseenter",".datepicker-days tbody tr",function(){$(this).addClass("highlight")});$(document).on("mouseleave",".datepicker-days tbody tr",function(){$(this).removeClass("highlight")})
\ No newline at end of file