More work on the layout