Fix Custom/Page/Option.tpl to separate form from page
fix tpl space
Merge pull request #4501 from colemanw/Fix

Fix Custom/Page/Option.tpl to separate form from page