fix table results and form
Merge branch 'restyling.2' into develop