Worked on layout and CSS