Html fixes
Fix single post template and some refactoring
Fix comment template