diff --git a/heron/tools/ui/resources/templates/application.html b/heron/tools/ui/resources/templates/application.html
index c86a3cce46f..c15eecd03ae 100644
--- a/heron/tools/ui/resources/templates/application.html
+++ b/heron/tools/ui/resources/templates/application.html
@@ -1,4 +1,4 @@
-<!--
+{#
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+#}
 
 <!DOCTYPE html>
 <html lang="en" class="not-showing-stats no-colors">
diff --git a/heron/tools/ui/resources/templates/browse.html b/heron/tools/ui/resources/templates/browse.html
index 39772d186e5..6bbb3274375 100644
--- a/heron/tools/ui/resources/templates/browse.html
+++ b/heron/tools/ui/resources/templates/browse.html
@@ -1,4 +1,4 @@
-<!--
+{#
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -10,7 +10,7 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
- -->
+ #}
 <html>
 
 <head>
diff --git a/heron/tools/ui/resources/templates/config.html b/heron/tools/ui/resources/templates/config.html
index e9d07068cc1..0dc80723769 100644
--- a/heron/tools/ui/resources/templates/config.html
+++ b/heron/tools/ui/resources/templates/config.html
@@ -1,4 +1,4 @@
-<!--
+{#
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+#}
 
 {% extends "application.html" %}
 {% block content %}
diff --git a/heron/tools/ui/resources/templates/error.html b/heron/tools/ui/resources/templates/error.html
index a22469b7202..96a361145d5 100644
--- a/heron/tools/ui/resources/templates/error.html
+++ b/heron/tools/ui/resources/templates/error.html
@@ -1,4 +1,4 @@
-<!--
+{#
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+#}
 
 <!DOCTYPE html>
 
diff --git a/heron/tools/ui/resources/templates/exception.html b/heron/tools/ui/resources/templates/exception.html
index 5531f31c90b..77a9f7dafe7 100644
--- a/heron/tools/ui/resources/templates/exception.html
+++ b/heron/tools/ui/resources/templates/exception.html
@@ -1,4 +1,4 @@
-<!--
+{#
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+#}
 
 {% extends "application.html" %}
 {% block content %}
diff --git a/heron/tools/ui/resources/templates/file.html b/heron/tools/ui/resources/templates/file.html
index 38b678e9702..b75d630577e 100644
--- a/heron/tools/ui/resources/templates/file.html
+++ b/heron/tools/ui/resources/templates/file.html
@@ -1,4 +1,4 @@
-<!--
+{#
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -10,7 +10,7 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
- -->
+ #}
 
 <html>
 
diff --git a/heron/tools/ui/resources/templates/nav.html b/heron/tools/ui/resources/templates/nav.html
index 00c3ccfb53d..54cfdd6ff7c 100644
--- a/heron/tools/ui/resources/templates/nav.html
+++ b/heron/tools/ui/resources/templates/nav.html
@@ -1,4 +1,4 @@
-<!--
+{#
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+#}
 
 <div id="mainnav">
 <ul style="margin-left:5px;">
diff --git a/heron/tools/ui/resources/templates/shell.snip.html b/heron/tools/ui/resources/templates/shell.snip.html
index 652780fbda9..60b2f6cfb95 100644
--- a/heron/tools/ui/resources/templates/shell.snip.html
+++ b/heron/tools/ui/resources/templates/shell.snip.html
@@ -1,3 +1,22 @@
+{#
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+#}
+
 {{ info | safe }}
 <pre>
 <br/>
diff --git a/heron/tools/ui/resources/templates/topologies.html b/heron/tools/ui/resources/templates/topologies.html
index 926c3847a4c..1cbbfd9d52e 100644
--- a/heron/tools/ui/resources/templates/topologies.html
+++ b/heron/tools/ui/resources/templates/topologies.html
@@ -1,4 +1,4 @@
-<!--
+{#
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+#}
 
 {% extends "application.html" %}
 
diff --git a/heron/tools/ui/resources/templates/topology.html b/heron/tools/ui/resources/templates/topology.html
index f6e8f538fb4..38f55c753c4 100644
--- a/heron/tools/ui/resources/templates/topology.html
+++ b/heron/tools/ui/resources/templates/topology.html
@@ -1,4 +1,4 @@
-<!--
+{#
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information
@@ -15,7 +15,7 @@
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->
+#}
 
 {% extends "application.html" %}
 
@@ -87,7 +87,7 @@ <h4 class="space-above">
 
 <!-- Details section. It contains a navigator and the details. -->
 <div class="col-md-12">
-  <!-- Navegator -->
+  <!-- Navigator -->
   <div id="display-navigator">
     <div class="navbar-default">
       <div class="row navbar-collapse collapse navbar-responsive-collapse">
