Crude map icons
Map tidy up