Modified admin view and controllers