Allow toggling of existing timers
Minor tweaks to timer toggle code