refactored + flex done except table animations