More attempts at cleaning up the look a bit