revert demos to non-gridplot