Add animate and reset buttons and cleanup