Fixed a focus issue with Firefox
Fixed button not being created on some forms