diff --git a/thehive-templates/C1fApp_1_0/long.html b/thehive-templates/C1fApp_1_0/long.html
index c8266a4d1..372bf09a2 100644
--- a/thehive-templates/C1fApp_1_0/long.html
+++ b/thehive-templates/C1fApp_1_0/long.html
@@ -1,38 +1,60 @@
 <!-- Success case -->
 <div class="panel panel-info" ng-if="success">
     <div class="panel-heading">
-        <strong>{{name}}</strong>
+        <strong>{{name}} report</strong>
     </div>
     <div class="panel-body">
      
-      <div>C1fApp information found from {{artifact.data | fang}}</div>
-      <b>DGA indication</b>
-          {{dga}}
-      <ul><b>Assessment</b>
-          <li ng-repeat="assessment in content.assessment">{{assessment}}</li>
-      </ul>
-      <ul><b>Description</b>
-          <li ng-repeat="description in content.description">{{description}}</li>
-      </ul>
-      <ul><b>Feed</b>
-          <li ng-repeat="feed_label in content.feed_label">Feed: {{feed_label}}</li>
-     </ul>
-     
-     <ul>
-          <li ng-repeat="country in content.country">Country: {{country}}</li>
-          
-          <li ng-repeat="asn in content.asn">ASN: {{asn}}</li>
-          <li ng-repeat="asn_desc in content.asn_desc">ASN desc: {{asn_desc}}</li>
-      </ul>
-      <div>IP addresses from {{artifact.data | fang}}</div>
-      <ul>
-      <li ng-repeat="ip in content.ip_addresses">{{ip}}</li>
-      </ul>
-      <div>Domains found from {{artifact.data | fang}}</div>
-      <ul>
-      <li ng-repeat="domain in content.domains">{{domain}}</li>
-      </ul>
-      
+        <h4>C1fApp information for {{artifact.data | fang}}</h4>
+
+        <dl class="dl-horizontal">
+            <dt>DGA indication</dt>
+            <dd>{{dga || "None"}}</dd>
+        </dl>
+
+        <dl class="dl-horizontal" ng-if="content.assessment">
+            <dt>Assessment</dt>
+            <dd>
+                <li ng-repeat="assessment in content.assessment">{{assessment}}</li>
+            </dd>
+        </dl>
+
+        <dl class="dl-horizontal" ng-if="content.description">
+            <dt>Description</dt>
+            <dd>
+                <li ng-repeat="description in content.description">{{description}}</li>
+            </dd>
+        </dl>
+
+        <dl class="dl-horizontal" ng-if="content.feed_label">
+            <dt>Feeds</dt>
+            <dd>
+                <li ng-repeat="feed_label in content.feed_label">Feed: {{feed_label}}</li>
+            </dd>
+        </dl>
+
+        <dl class="dl-horizontal">
+            <dt>Geolocation</dt>
+            <dd>
+                <li  ng-repeat="country in content.country">Country: {{country}}</li>
+                <li  ng-repeat="asn in content.asn">ASN: {{asn}}</li>
+                <li  ng-repeat="asn_desc in content.asn_desc">ASN desc: {{asn_desc}}</li>
+            </dd>
+        </dl>
+
+        <dl class="dl-horizontal">
+            <dt>Related IP addresses</dt>
+            <dd>
+               <li ng-repeat="ip in content.ip_addresses">{{ip}}</li>
+            </dd>
+        </dl>
+        <dl class="dl-horizontal">
+            <dt>Related Domains</dt>
+            <dd>
+                <li ng-repeat="domain in content.domains">{{domain}}</li>
+            </dd>
+        </dl>
+
     </div>
 </div>