fix form button on FF
Merge branch 'develop'