Graphical improvements/Locations and Interfaces