small fixes to layout and way the map loads