Refactor ActionScreen and related code.