Added form and validation