Grid and panel fixes.