Fixed up some sizing issues