Improve mockups