Add "layout" field, and term creation logic.