Moved toc, icon, key board nav code into new modules