Added rendering for all states