Jekyll TOC improvements

Should have been part of the original PR implementing TOC in Jekyll but I did a mistake...