Improved animation + bugfix