Re-organising where add/edit takes place for formbuilder. [refs #4411 and spent 3 hours one #4411]