Fixed some layout stuff, nearly finalized the design