Fixed language settings
Fixed scrolling position coming from the map