added some buttons, implemented +/- button properly