Reworking provider/panel rendering