layout fixes
more layout stuff and fixes