Fixed up the layout some.