Fix Disqus comments and clean up templates