New changes to styles and layout