tided up the layout