Fix canonical urls
Clean up main/articles template