add grouping around form buttons