Updated styles and layouts