Improve performance and animations