Animated AP disengage switch; a little cleanup