Final changes to make look closer to mockup