Refactor frame sizing
Fix animations not be destroyed