test
commented and cleaned code
Merge branch 'master' into develop

Accidentally made edits to master
removed tooltip and added state name to top
Merge branch 'master' into develop

accidentally made changes to master