added map positions, changed map position and navigation behaviour