Added JavaScript form verification on submit + minor changes