updated layout and style