Added correct initial map view. Refactored map centering code