Minor changes to mockup