fix form widgets for non form generator forms
add pagination callback