Merge pull request #97 from ActivityRez/task-82778100-aaron

follow toggle buttons better
reload after switching users