Updated mock-ups