Merge board add/edit to single form