Fixed another bug with toggle control...
Lots of gui event-handling clean-up.