Refactored form->addButton and addSubmit()

now properly works with layout.