Cleaned up map_view