Added proper map centering using MapRenderer properties, refactoring