updated layout stuff