Update button and form classes in generator - Fixes #641