Martin's overview changes

For #389.