Remove submit button; optimize failure logic