Starting to make progress on the layout