More changes to the mockup.