Added a bit more user clean up, making views a bit more role dependent
and limiting data gotten by user and by role