Made the layout less puke-inducing