Fixup button groups

The feature/resource changed segmented the group so that the "Done"
button was always being ignored.

Fixes #1247
Fixes #1246