Template changes. Comment list directive fixes.