Code Restructure
Added State button.