Updated templates (header & removed comment bubble)

Updated templates (header & removed comment bubble)