Updated mockup layout