updated form and buttons