Feature/map updates

Cleans up map layout and styles.