Form buttons reorganized to generic widgets.