Dashboard cleanup and other small changes