diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
index 6d2322f82c..54546481ba 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
@@ -15,6 +15,7 @@
   specific language governing permissions and limitations
   under the License.
 }}
+
 {{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}}
 
 {{#zone "breadcrumbs"}}
@@ -24,8 +25,9 @@
         </a>
     </li>
     <li>
+        <!--suppress HtmlUnknownTarget -->
         <a href="{{@app.context}}/certificates">
-           Certificate
+            Certificates
         </a>
     </li>
 {{/zone}}
@@ -33,6 +35,7 @@
 {{#zone "navbarActions"}}
     {{#if removePermitted}}
         <li>
+            <!--suppress HtmlUnknownTarget -->
             <a href="{{@app.context}}/certificates/add">
             <span class="fw-stack">
                <i class="fw fw-ring fw-stack-2x"></i>
@@ -97,10 +100,7 @@
             </tr>
 
             </thead>
-            <tbody id="ast-container">
-
-            <br class="c-both"/>
-            </tbody>
+            <tbody id="ast-container"></tbody>
         </table>
     </div>
     <br class="c-both"/>
@@ -180,9 +180,9 @@
 {{/zone}}
 
 {{#zone "bottomJs"}}
+    <!--suppress HtmlUnknownTarget -->
     <script id="certificate-listing" data-current-user="{{@user.username}}"
             src="{{@page.publicUri}}/templates/certificate-listing.hbs"
             type="text/x-handlebars-template"></script>
-
     {{js "/js/certificate-listing.js"}}
 {{/zone}}