Fixed bug with buttons on forms