Moved comment section to template