Fixed problems with form buttons