Oops. Fixed the other comments links
Merge branch 'hotfix' into feature/bootstrap

fixed more comments
Buttonified comments and tags