Change the AuthenticatedController into a mixin, minor updates