Dashboard tidying, and preparing for content