Move section headers out of block-grid and push sidebar to the bottom in source order