generic form panel fixes