further panel fixes