improve state labels
Merge pull request #111 from frankrousseau/master

improve state labels