Changed layout and style