Worked on layout and style