Put buttons into new form too. Oops.