Added map scrolling effect and some tweaks on positioning