improved forms and views