Form layout changes

Form layout changes in Badwords, Blacklists & Autocorrect
Merge remote-tracking branch 'origin/master' into 10.2_design_changes_forms
Conflict resolved

Conflict resolved
Merge remote-tracking branch 'origin/10.2_design_changes_forms'
update history while insert

update history while insert