further tweaks to mockup