Update mockup for final layout