Working on cleaning up the home screen and expanding work time support