Removed custom FAPI element as it is not needed
Changed form elements in the widget to match new advanced widget