Some small changes to forms and button bars