Added buttons. Amends to #119