UI changes for modal (adding hours worked on checkOut) and minor refactoring