make better
add +/- button implementations