Mockup tweaks