diff --git a/bin/lib/objects/ail_objects.py b/bin/lib/objects/ail_objects.py
index 8eaf84d8..c9e1d7bc 100755
--- a/bin/lib/objects/ail_objects.py
+++ b/bin/lib/objects/ail_objects.py
@@ -158,8 +158,7 @@ def get_object_card_meta(obj_type, subtype, id, related_btc=False):
         meta["vt"] = obj.get_meta_vt()
         meta["vt"]["status"] = obj.is_vt_enabled()
     # TAGS MODAL
-    if obj.get_type() == 'screenshot' or obj.get_type() == 'decoded' or obj.get_type() == 'cve':
-        meta["add_tags_modal"] = Tag.get_modal_add_tags(obj.id, obj.get_type(), obj.get_subtype(r_str=True))
+    meta["add_tags_modal"] = Tag.get_modal_add_tags(obj.id, obj.get_type(), obj.get_subtype(r_str=True))
     return meta
 
 
diff --git a/var/www/templates/correlation/metadata_card_cryptocurrency.html b/var/www/templates/correlation/metadata_card_cryptocurrency.html
index 7d9318e8..2698caa5 100644
--- a/var/www/templates/correlation/metadata_card_cryptocurrency.html
+++ b/var/www/templates/correlation/metadata_card_cryptocurrency.html
@@ -1,3 +1,12 @@
+<link href="{{ url_for('static', filename='css/tags.css') }}" rel="stylesheet" type="text/css" />
+<script src="{{ url_for('static', filename='js/tags.js') }}"></script>
+
+{% with modal_add_tags=dict_object['metadata_card']['add_tags_modal']%}
+	{% include 'modals/add_tags.html' %}
+{% endwith %}
+
+{% include 'modals/edit_tag.html' %}
+
 <div class="card my-3">
 	<div class="card-header" style="background-color:#d9edf7;font-size: 15px">
 		<h4 class="text-secondary">{{ dict_object["correlation_id"] }} :</h4>
@@ -39,6 +48,21 @@
 					</div>
 				</div>
 			</li>
+            <li class="list-group-item py-0">
+				<br>
+				<div class="mb-3">
+					Tags:
+					{% for tag in dict_object["metadata"]['tags'] %}
+						<button class="btn btn-{{ bootstrap_label[loop.index0 % 5] }}" data-toggle="modal" data-target="#edit_tags_modal"
+						data-tagid="{{ tag }}" data-objtype="decoded" data-objsubtype="" data-objid="{{ dict_object["correlation_id"] }}">
+							{{ tag }}
+						</button>
+					{%  endfor %}
+					<button type="button" class="btn btn-light" data-toggle="modal" data-target="#add_tags_modal">
+          	            <i class="far fa-plus-square"></i>
+                    </button>
+				</div>
+			</li>
 		</ul>
 		{% if dict_object["metadata"]["type_id"] == "bitcoin" %}
 			{% if "related_btc" in dict_object["metadata_card"] %}
diff --git a/var/www/templates/correlation/metadata_card_pgp.html b/var/www/templates/correlation/metadata_card_pgp.html
index 17746183..03d73a2b 100644
--- a/var/www/templates/correlation/metadata_card_pgp.html
+++ b/var/www/templates/correlation/metadata_card_pgp.html
@@ -1,3 +1,12 @@
+<link href="{{ url_for('static', filename='css/tags.css') }}" rel="stylesheet" type="text/css" />
+<script src="{{ url_for('static', filename='js/tags.js') }}"></script>
+
+{% with modal_add_tags=dict_object['metadata_card']['add_tags_modal']%}
+	{% include 'modals/add_tags.html' %}
+{% endwith %}
+
+{% include 'modals/edit_tag.html' %}
+
 <div class="card my-3">
 	<div class="card-header" style="background-color:#d9edf7;font-size: 15px">
 		<h4 class="text-secondary">{{ dict_object["correlation_id"] }} :</h4>
@@ -39,16 +48,21 @@
 					</div>
 				</div>
 			</li>
-            {% if dict_object["metadata"]['tags'] %}
-                <li class="list-group-item py-0">
-				    <div class="my-3">
-				    	<b>Tags:</b>
-				    	{% for tag in dict_object["metadata"]['tags'] %}
-				    		<span class="badge badge-{{ bootstrap_label[loop.index0 % 5] }}">{{ tag }}</span>
-				    	{%  endfor %}
-				    </div>
+            <li class="list-group-item py-0">
+				<br>
+				<div class="mb-3">
+					Tags:
+					{% for tag in dict_object["metadata"]['tags'] %}
+						<button class="btn btn-{{ bootstrap_label[loop.index0 % 5] }}" data-toggle="modal" data-target="#edit_tags_modal"
+						data-tagid="{{ tag }}" data-objtype="decoded" data-objsubtype="" data-objid="{{ dict_object["correlation_id"] }}">
+							{{ tag }}
+						</button>
+					{%  endfor %}
+					<button type="button" class="btn btn-light" data-toggle="modal" data-target="#add_tags_modal">
+          	            <i class="far fa-plus-square"></i>
+                    </button>
+				</div>
 			</li>
-            {% endif %}
 		</ul>
 
 		{% with obj_type='pgp', obj_id=dict_object['correlation_id'], obj_subtype=dict_object["metadata"]["type_id"] %}
diff --git a/var/www/templates/correlation/metadata_card_username.html b/var/www/templates/correlation/metadata_card_username.html
index 9467eee9..e1d4dbe1 100644
--- a/var/www/templates/correlation/metadata_card_username.html
+++ b/var/www/templates/correlation/metadata_card_username.html
@@ -1,3 +1,12 @@
+<link href="{{ url_for('static', filename='css/tags.css') }}" rel="stylesheet" type="text/css" />
+<script src="{{ url_for('static', filename='js/tags.js') }}"></script>
+
+{% with modal_add_tags=dict_object['metadata_card']['add_tags_modal']%}
+	{% include 'modals/add_tags.html' %}
+{% endwith %}
+
+{% include 'modals/edit_tag.html' %}
+
 <div class="card my-3">
 	<div class="card-header" style="background-color:#d9edf7;font-size: 15px">
 		<h4 class="text-secondary">{{ dict_object["correlation_id"] }} :</h4>
@@ -39,6 +48,21 @@
 					</div>
 				</div>
 			</li>
+            <li class="list-group-item py-0">
+				<br>
+				<div class="mb-3">
+					Tags:
+					{% for tag in dict_object["metadata"]['tags'] %}
+						<button class="btn btn-{{ bootstrap_label[loop.index0 % 5] }}" data-toggle="modal" data-target="#edit_tags_modal"
+						data-tagid="{{ tag }}" data-objtype="decoded" data-objsubtype="" data-objid="{{ dict_object["correlation_id"] }}">
+							{{ tag }}
+						</button>
+					{%  endfor %}
+					<button type="button" class="btn btn-light" data-toggle="modal" data-target="#add_tags_modal">
+          	            <i class="far fa-plus-square"></i>
+                    </button>
+				</div>
+			</li>
 		</ul>
 
 		{% with obj_type='username', obj_id=dict_object['correlation_id'], obj_subtype=dict_object["metadata"]["type_id"] %}
diff --git a/var/www/templates/objects/cve/CveDaterange.html b/var/www/templates/objects/cve/CveDaterange.html
index 1b477b0f..762fca8f 100644
--- a/var/www/templates/objects/cve/CveDaterange.html
+++ b/var/www/templates/objects/cve/CveDaterange.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Decoded - AIL</title>
+  <title>CVEs - AIL</title>
 	<link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}">
 
   <!-- Core CSS -->
diff --git a/var/www/templates/objects/subtypes_objs_dashboard.html b/var/www/templates/objects/subtypes_objs_dashboard.html
index 78eb1aad..e8cd3bc4 100644
--- a/var/www/templates/objects/subtypes_objs_dashboard.html
+++ b/var/www/templates/objects/subtypes_objs_dashboard.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Decoded - AIL</title>
+  <title>{{ obj_type }} - AIL</title>
 	<link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}">
 
   <!-- Core CSS -->