Improve alignment of form buttons