fixed overly aggressive cleanup of dial callbacks. Cleaned up some more UI code.