Improve rulebuilder form submit conversion logic
Finalize offer screen