Added better state screen