Map fix and menu fix

Map style and behaviour update
Closes #16