Added buttons. Ammends to #119