diff --git a/contracts/admin.py b/contracts/admin.py
index 8216dbe60cd465b01fef5a3fae71efb24c0b2ad4..34394e3b13f352aa871f4da96aa219d5918c812b 100644
--- a/contracts/admin.py
+++ b/contracts/admin.py
@@ -82,13 +82,13 @@ class SigneeSignatureInline(NestedStackedInline):
     extra = 0
 
 
-class ContractFileInline(admin.TabularInline):
+class ContractFileInline(NestedTabularInline):
     model = ContractFile
     form = ContractFileAdminForm
     extra = 0
 
 
-class ContractIntentInline(admin.TabularInline):
+class ContractIntentInline(NestedTabularInline):
     model = ContractIntent
     extra = 0
 
diff --git a/contracts/templates/contracts/view_contract_filing_areas.html b/contracts/templates/contracts/view_contract_filing_areas.html
index 2271ea32e02627379198b961a94be2c844d474ea..4ee14b85a7b4ae02d8c9755964f62448621d6d1d 100644
--- a/contracts/templates/contracts/view_contract_filing_areas.html
+++ b/contracts/templates/contracts/view_contract_filing_areas.html
@@ -22,6 +22,7 @@
                 <tr>
                     <td>
                         <a
+                            class="underline"
                             href="{{ filing_area.url }}"
                         >{{ filing_area.name }}</a>
                     </td>
diff --git a/contracts/templates/contracts/view_contract_issues.html b/contracts/templates/contracts/view_contract_issues.html
index 07307cfb025b21301c367efb19a5c2e23bdc66df..bbabe0247b40d4eefa71bca8a464fbb93de9bd42 100644
--- a/contracts/templates/contracts/view_contract_issues.html
+++ b/contracts/templates/contracts/view_contract_issues.html
@@ -33,6 +33,7 @@
                 <tr>
                     <td>
                         <a
+                            class="underline"
                             href="{{ issue.url }}"
                         >{{ issue.name }}</a>
                     </td>
diff --git a/contracts/templates/contracts/view_contract_types.html b/contracts/templates/contracts/view_contract_types.html
index b5ffa05599fd257879c703564e84257be365e6ad..6a674b6042c4e3e7462a4346134fe03595558217 100644
--- a/contracts/templates/contracts/view_contract_types.html
+++ b/contracts/templates/contracts/view_contract_types.html
@@ -21,6 +21,7 @@
                 <tr>
                     <td>
                         <a
+                            class="underline"
                             href="{{ type.url }}"
                         >{{ type.name }}</a>
                     </td>
diff --git a/contracts/templates/contracts/view_contractees.html b/contracts/templates/contracts/view_contractees.html
index 6a9837747bdd3084bcbc4f399903bd5214ae8286..6c33a7b23ad0f9a4ef89e4362fa87389cf593e6a 100644
--- a/contracts/templates/contracts/view_contractees.html
+++ b/contracts/templates/contracts/view_contractees.html
@@ -21,6 +21,7 @@
                 <tr>
                     <td>
                         <a
+                            class="underline"
                             href="{{ contractee.url }}"
                         >
                             <strong>{{ contractee.name }}</strong>
diff --git a/contracts/templates/contracts/view_signees.html b/contracts/templates/contracts/view_signees.html
index 3d09b0b16b566576321785032914a1b6388faeee..758e132abeaac32cb2abc79f93c3803c2d9c6d32 100644
--- a/contracts/templates/contracts/view_signees.html
+++ b/contracts/templates/contracts/view_signees.html
@@ -21,6 +21,7 @@
                 <tr>
                     <td>
                         <a
+                            class="underline"
                             href="{{ signee.url }}"
                         >
                             <strong>{{ signee.name }}</strong>