Added swift water rescue, cleaned up all screen code