Changed layout to match mockup