More cleaning up of the overview