Started working on the layout