Some fixes to the mockups