Maps re-design
enabling gcm