Tidying up the layout