Real checkin of right flyout and fix rotation