Changes to the Ui and introducing Form validation