Improve toc highlighting also tweak the links back to the top