Added icons for state
Cleanup