Some chnages to forms and styling