Fixed up some layout issues