More modifications to the mockup.