Improved some animations & other small tweaks