Several improvements in mockups