Rewritten Table of content so it gives more flexibility
Marginal Backend Improvements