diff --git a/docker/ploughshares/templates/base.html b/docker/ploughshares/templates/base.html
index 1a6f3de..de515df 100644
--- a/docker/ploughshares/templates/base.html
+++ b/docker/ploughshares/templates/base.html
@@ -88,7 +88,7 @@
 
     <script src="{{ url_for('static', filename='js/bootstrap.bundle.min.js') }}"></script>
     {% block scripts %}{% endblock %}
-    <script>
+    <script nonce="{{ csp_nonce() }}">
         // Add ARIA attributes to dynamically created elements
         document.addEventListener('DOMContentLoaded', function() {
             // Make sure all buttons have accessible labels
diff --git a/docker/ploughshares/templates/index.html b/docker/ploughshares/templates/index.html
index 6c08ec2..0f1794c 100644
--- a/docker/ploughshares/templates/index.html
+++ b/docker/ploughshares/templates/index.html
@@ -35,10 +35,10 @@
                             <td>{{ transaction['source_date'].strftime('%Y-%m-%d') if transaction['source_date'] else 'N/A' }}</td>
                             <td>{{ transaction['recipient'] }}</td>
                             <td>
-                                <a href="{{ url_for('view_transaction', id=transaction['id']) }}" class="btn btn-sm btn-info">
+                                <a href="{{ url_for('view_transaction', id=transaction['id']) }}" class="btn btn-sm btn-info" aria-label="View transaction {{ transaction['id'] }}">
                                     <i class="bi bi-eye"></i>
                                 </a>
-                                <a href="{{ url_for('update_transaction', id=transaction['id']) }}" class="btn btn-sm btn-warning">
+                                <a href="{{ url_for('update_transaction', id=transaction['id']) }}" class="btn btn-sm btn-warning" aria-label="Edit transaction {{ transaction['id'] }}">
                                     <i class="bi bi-pencil"></i>
                                 </a>
                             </td>
@@ -53,7 +53,7 @@
 {% endblock %}
 
 {% block scripts %}
-<script>
+<script nonce="{{ csp_nonce() }}">
     document.addEventListener('DOMContentLoaded', function() {
         const searchInput = document.getElementById('searchInput');
         const searchButton = document.getElementById('searchButton');
@@ -72,12 +72,17 @@
             });
         }
         
-        searchButton.addEventListener('click', filterTable);
-        searchInput.addEventListener('keyup', function(e) {
-            if (e.key === 'Enter') {
-                filterTable();
-            }
-        });
+        if (searchButton) {
+            searchButton.addEventListener('click', filterTable);
+        }
+
+        if (searchInput) {
+            searchInput.addEventListener('keyup', function(e) {
+                if (e.key === 'Enter') {
+                    filterTable();
+                }
+            });
+        }
     });
 </script>
 {% endblock %} 
\ No newline at end of file