MapFragment implemented + layout changes