fixes to alleged offender button and controller
Merge origin/master