Added buttons. Moved stuff around a bit.