Work in progress on UI
End-of-day work on main menu