Bug fixes in animation screen