Fix form and add button