Tidying up some layout