Added More State

-States for more UI