Many many changes to bring closer to mockup.