Updated styles, layout