Layout/map position

Fixes #249