Initial re-design
Implement table of contents