Revert odd feature
Improve animations