Tidy the rendering up ten-fold! Also, buttons.