Refactoring and fixes
Animate the bars