Changed layout and updated CSS