plot_panel more improvements