Got some master layout stuff done.