Add validation and change layout