cleaned up the layout a little bit