Layout/map position

Fixes #249 
=) Well done!