More visual layout stuff, add buttons