Started work on desk - WIP
UI changes