Sync GUI to tool mode
Also added a button group for add/subtract mode to make intents in code more clear.