Changed layout and CSS