Graphical improvements/Locations