More mockup edits