Improved animation and functionality