1. Bug reports included in TODOs
2. Fix of +/- button