small refactor of map. need to re-think / rework for multiple levels
Fixed positioning with new map lauout and structure