Message/Reporters fixes

Various fixes to restore the message and reporters admin to a working state.
Mostly just reverts some changes to the views