Updates to Application Controller and Users Controller