Added MapViewpoint and fixed Marker