Revert "Use section els & remove redundant row"

This reverts commit 03a29a3697b07d583b04b9ccca3ea671ca00fecc.