Fix controller and routing