Map view fits better

Made the map view fit better on the screen + other small fixes