Modified StateManager and SubmitButton