UI Tidy Up
WIP: Adding locations