DJR:Revised form builder plugin