Changed state labels a bit
Addd error img
Merge remote-tracking branch 'origin/master'