Added map and Location activity