diff --git a/var/www/modules/hunter/templates/showTracker.html b/var/www/modules/hunter/templates/showTracker.html
index 5f551d24..fef0e808 100644
--- a/var/www/modules/hunter/templates/showTracker.html
+++ b/var/www/modules/hunter/templates/showTracker.html
@@ -67,7 +67,7 @@
                         <li class="list-group-item py-0">
                             <div class="row">
                                 <div class="col-md-10">
-                                    <table class="table">
+                                    <table class="table" style="word-wrap: break-word;">
                                         <thead>
                                         <tr>
                                             <th>Type</th>
@@ -91,7 +91,16 @@
                                         <tbody>
                                         <tr>
                                             <td>{{ tracker_metadata['type'] }}</td>
-                                            <td>{{ tracker_metadata['tracker'] }}</td>
+                                            <td style="word-break: break-word;">
+                                                <a class="btn btn-primary" data-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+                                                    {{ tracker_metadata['tracker'].split(",")[0] }}
+                                                </a>
+                                                <div class="collapse" id="collapseExample">
+                                                    <div class="card card-body">
+                                                        {{ tracker_metadata['tracker'] }}
+                                                    </div>
+                                                </div>
+                                            </td>
                                             <td>{{ tracker_metadata['date'][0:4] }}/{{ tracker_metadata['date'][4:6] }}/{{ tracker_metadata['date'][6:8] }}</td>
                                             <td>
                                                 {% if tracker_metadata['level'] == 0 %}
diff --git a/var/www/modules/hunter/templates/trackersManagement.html b/var/www/modules/hunter/templates/trackersManagement.html
index aedc790d..999093ba 100644
--- a/var/www/modules/hunter/templates/trackersManagement.html
+++ b/var/www/modules/hunter/templates/trackersManagement.html
@@ -70,8 +70,8 @@
                       <span>
                         <a target="_blank" href="{{ url_for('hunter.show_tracker') }}?uuid={{ dict_uuid['uuid'] }}">
                         {% if dict_uuid['term'] %}
-                            {% if dict_uuid['term']|length > 256 %}
-                                {{ dict_uuid['term'][0:256] }}...
+                            {% if dict_uuid['term']|length > 100 %}
+                                {{ dict_uuid['term'][0:100] }}...
                             {% else %}
                                 {{ dict_uuid['term'] }}
                             {% endif %}
@@ -135,8 +135,8 @@
                       <span>
                         <a target="_blank" href="{{ url_for('hunter.show_tracker') }}?uuid={{ dict_uuid['uuid'] }}">
                         {% if dict_uuid['term'] %}
-                            {% if dict_uuid['term']|length > 256 %}
-                                {{ dict_uuid['term'][0:256] }}...
+                            {% if dict_uuid['term']|length > 100 %}
+                                {{ dict_uuid['term'][0:100] }}...
                             {% else %}
                                 {{ dict_uuid['term'] }}
                             {% endif %}