Underp some things, make map responsive