Improve order code, correct errors animation