fixes to forms and page type