refactorings
submit button & refactoring