Pull in substantial refactoring and optimisation for the dashboard.