Experimental tweaks for panel