made additional updates to layout and added some form validations