slight cleanup, better layout stuff