Mild code cleanup.
Moved new comment form directly onto tour page.