updated lots of layout stuff, austin please take a look, see what you think