Updated Admin Views and controllers