first version
completed preferences with +/- buttons
Merge remote-tracking branch 'origin/master'
completed preferences with +/- buttons