Pushing up some admin managers controller views and code cleanup