Working some more on the layout