Desks 1 rearrangement 

Had to merge other before-made changes on devel into this branch to get the app working