Will's CDM

Lightweight tweaks and fixes to Blizzard's Cooldown Manager.