redesign rescue_controller
fix