add map and clean up nav