form buttons moved into partial, clean-up