Added WIP category navigation and some progress on TT