fundamental redesign: row-layout, elementary variables work again