Oops, fix and optimize mockups