Slight change to listeners to use the pull style of state updates
Adding nice activation switch to main activity