Weekend UI work
Resolved changes to weekend UI work
Resolved conflicts and UI changes for home