Further work on the layout