move forms submit buttons in toolbar plus some refactoring