Map activity re-organization