diff --git a/web/startScan/templates/startScan/subdomains.html b/web/startScan/templates/startScan/subdomains.html
index a040cb37..7de5abc8 100644
--- a/web/startScan/templates/startScan/subdomains.html
+++ b/web/startScan/templates/startScan/subdomains.html
@@ -296,12 +296,17 @@ $(document).ready(function() {
 				// Action
 				{
 					"render": function ( data, type, row ) {
+						const cms_detector_http_url = row['http_url'] ? row['http_url'] : 'https://' + row['name'];
 						return `
-						<div class="mt-2">
-						<a href="javascript:void(0);" class="action-icon btn-scan-subdomain" data-toggle="tooltip" data-placement="top" title="Further Scan Subdomain" id="${row['id']}"> <i class="text-primary mdi mdi-lightning-bolt-outline"></i></a>
-						<a href="#" onclick="add_note_for_subdomain(${row['id']}, '${row['name']}')" class="action-icon" data-toggle="tooltip" data-placement="top" title="Add Recon Todo/Note" id="${row['id']}"> <i class="text-success mdi mdi-notebook-plus-outline"></i></a>
-						<a href="#" onclick="mark_important_subdomain(row=this, subdomain_id=${row['id']})" class="action-icon" data-toggle="tooltip" data-placement="top" title="Toggle Important Subdomain" id="${row['id']}"> <i class="text-danger mdi mdi-alert-rhombus-outline"></i></a>
-						<a href="javascript:void(0);" class="action-icon btn-delete-subdomain" data-toggle="tooltip" data-placement="top" title="Delete Subdomain" id="${row['id']}"> <i class="text-danger mdi mdi-delete-forever-outline"></i></a>
+						<div class="btn-group mt-2">
+							<button type="button" data-toggle="tooltip" data-placement="top" title="Further Scan Subdomain" class="btn btn-primary btn-scan-subdomain me-1" id="${row['id']}"><i class="fe-zap"></i></button>
+							<button type="button" data-toggle="tooltip" data-placement="top" title="Add Recon Todo/Note" class="btn btn-primary me-1" id="${row['id']}" onclick="add_note_for_subdomain(${row['id']}, '${row['name']}')"><i class="fe-file-plus"></i></button>
+							<button class="btn btn-primary me-1 dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></button>
+							<div class="dropdown-menu dropdown-menu-end">
+							<a class="dropdown-item" href="#" onclick="mark_important_subdomain(this, ${row['id']})" id="${row['id']}"><i class="mdi mdi-alert-rhombus-outline me-2 text-muted font-18 vertical-middle"></i>Mark Important Subdomain</a>
+							<a class="dropdown-item" href="#" onclick="detect_subdomain_cms('${cms_detector_http_url}', ${row['http_status']})"><i class="fe-grid me-2 text-muted font-18 vertical-middle"></i>Detect CMS</a>
+							<a class="text-danger dropdown-item btn-delete-subdomain" href="#" id="${row['id']}"><i class="text-danger mdi mdi-delete-forever-outline me-2 font-18 vertical-middle"></i>Delete Subdomain</a>
+							</div>
 						</div>
 						`;
 					},
diff --git a/web/startScan/views.py b/web/startScan/views.py
index 34278b66..a610b7f6 100644
--- a/web/startScan/views.py
+++ b/web/startScan/views.py
@@ -134,6 +134,8 @@ def all_subdomains(request):
     context['important_count'] = Subdomain.objects.values('name').distinct().filter(
         is_important=True).count()
 
+    context['scan_engines'] = EngineType.objects.all()
+
     context['scan_history_active'] = 'active'
 
     return render(request, 'startScan/subdomains.html', context)
diff --git a/web/targetApp/templates/target/summary.html b/web/targetApp/templates/target/summary.html
index 26e7251f..463c5bc2 100644
--- a/web/targetApp/templates/target/summary.html
+++ b/web/targetApp/templates/target/summary.html
@@ -1044,12 +1044,17 @@ $(document).ready(function(){
 						// Action
 						{
 							"render": function ( data, type, row ) {
+								const cms_detector_http_url = row['http_url'] ? row['http_url'] : 'https://' + row['name'];
 								return `
-								<div class="mt-2">
-								<a href="javascript:void(0);" class="action-icon btn-scan-subdomain" data-toggle="tooltip" data-placement="top" title="Further Scan Subdomain" id="${row['id']}"> <i class="text-primary mdi mdi-lightning-bolt-outline"></i></a>
-								<a href="#" onclick="add_note_for_subdomain(${row['id']}, '${row['name']}')" class="action-icon" data-toggle="tooltip" data-placement="top" title="Add Recon Todo/Note" id="${row['id']}"> <i class="text-success mdi mdi-notebook-plus-outline"></i></a>
-								<a href="#" onclick="mark_important_subdomain(row=this, subdomain_id=${row['id']})" class="action-icon" data-toggle="tooltip" data-placement="top" title="Toggle Important Subdomain" id="${row['id']}"> <i class="text-danger mdi mdi-alert-rhombus-outline"></i></a>
-								<a href="javascript:void(0);" class="action-icon btn-delete-subdomain" data-toggle="tooltip" data-placement="top" title="Delete Subdomain" id="${row['id']}"> <i class="text-danger mdi mdi-delete-forever-outline"></i></a>
+								<div class="btn-group mt-2">
+									<button type="button" data-toggle="tooltip" data-placement="top" title="Further Scan Subdomain" class="btn btn-primary btn-scan-subdomain me-1" id="${row['id']}"><i class="fe-zap"></i></button>
+									<button type="button" data-toggle="tooltip" data-placement="top" title="Add Recon Todo/Note" class="btn btn-primary me-1" id="${row['id']}" onclick="add_note_for_subdomain(${row['id']}, '${row['name']}')"><i class="fe-file-plus"></i></button>
+									<button class="btn btn-primary me-1 dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></button>
+									<div class="dropdown-menu dropdown-menu-end">
+									<a class="dropdown-item" href="#" onclick="mark_important_subdomain(this, ${row['id']})" id="${row['id']}"><i class="mdi mdi-alert-rhombus-outline me-2 text-muted font-18 vertical-middle"></i>Mark Important Subdomain</a>
+									<a class="dropdown-item" href="#" onclick="detect_subdomain_cms('${cms_detector_http_url}', ${row['http_status']})"><i class="fe-grid me-2 text-muted font-18 vertical-middle"></i>Detect CMS</a>
+									<a class="text-danger dropdown-item btn-delete-subdomain" href="#" id="${row['id']}"><i class="text-danger mdi mdi-delete-forever-outline me-2 font-18 vertical-middle"></i>Delete Subdomain</a>
+									</div>
 								</div>
 								`;
 							},
diff --git a/web/targetApp/views.py b/web/targetApp/views.py
index a0333a2f..cd4bfc72 100644
--- a/web/targetApp/views.py
+++ b/web/targetApp/views.py
@@ -255,6 +255,8 @@ def target_summary(request, id):
     context['endpoint_count'] = endpoints.count()
     context['endpoint_alive_count'] = endpoints.filter(http_status__exact=200).count()
 
+    context['scan_engines'] = EngineType.objects.all()
+
     info_count = Vulnerability.objects.filter(
         target_domain=id).filter(severity=0).count()
     low_count = Vulnerability.objects.filter(
diff --git a/web/templates/base/_items/subscan_modal.html b/web/templates/base/_items/subscan_modal.html
index 97ac04dc..8a8f2c2c 100644
--- a/web/templates/base/_items/subscan_modal.html
+++ b/web/templates/base/_items/subscan_modal.html
@@ -41,7 +41,6 @@
 								<option value="{{engine.id}}">{{engine}}</option>
 							{% endif %}
 						{% endfor %}
-						<option>Custom Engine</option>
 					</select>
 				</div>
 			</div>