Fix row encapsulation for other pages