TOC fixes, and new fixed search bar