clean up the layout just a bit