Map is now shown on screen and moving
FIxed conflicts and size of map