Completed most admin functionality with CSP inplace