Added enable/disable transitions

TBD: Fix error in Pie Chart template!