Change new variant to button, add form & validation