Added nicer display for states.
Merge branch 'test' into dev
Merge.