Refactored ControllerActivity