cleaned up map and navigation