reorganizing of states, buttons and text
reorganizing of states, buttons and text