refactor event map states
Merge branch 'master' of github.com:/ITS-UofIowa/diversity2.uiowa.edu