Updates from mockups