changes to XML layout for form and panel_view