Additions to forms and buttons