Worked on the layout