Fixed discussion page issue

Also some Table of Contents stuff - which remains unfinished