Updated some of the mockups, will do more later.