base_template: match the form template
buttons template: spacing cleanup