change layout, we might need TermValues in Outputs...