Moved the rest of the computation on the admin page into the controller
Mend merge conflicts