Fixed form buttons that had been neglected