Fixed merge bug and view constraint issues in VictimListView.
Git is dumb.
Merge remote-tracking branch 'origin/master'