straighten out some of the layout issues