Group buttons; remove useless form block