Restructuring of highlights in progress, map view works, edition still broken