finished working on the layout