More cleanup. Moved callback setters to UI.