Reorganized locations. Aligned map to center
More reorganization