A little tidying - part 1

Fixing buttons for various forms - layout and appearance.