tweaks to forms and panel margin fix