Cleanup of unused elements
Fixed animations