Add Disqus
Merge views and controller