Change app-state to work with form