Clean up add grid form.
Merge branch 'develop' of github.com:opencomparison/opencomparison into develop