Updates for offender tab
Merge conflicts