Noted that right click is capable of switching arrest/unarrest batons
Merge pull request #1021 from Noiwex/refactor

Noted that right click is capable of switching arrest/unarrest batons