Some improvements to the mockups