fix refrence, improve UI
delegate activity tracking to the button itself, vs. reaching in from another module