Several fixes. Form validation & submit