diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html
index 6f05b3b0..8766a1c0 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html
@@ -49,7 +49,7 @@
 			<div class="modal-body">
 				<div class="text-muted" ng-if="currentDuplicates.length == 0">No duplicates</div>
 				<org-details org="currentOrgDetails" org-title="Registered organization" show="default"></org-details>
-				<org-form-duplicates duplicates="currentDuplicates"></org-form-duplicates>
+				<org-duplicates duplicates="currentDuplicates"></org-form-duplicates>
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/new.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/new.html
index 31f8a1b7..fda7ff45 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/new.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/new.html
@@ -4,5 +4,7 @@
 			<li class="nav-item"><a href="javascript:void(0)" class="nav-link active">Metadata</a></li>
 		</ul>
 	</div>
-	<org-form-metadata org="org" vocabularies="vocabularies" mode="insert"></org-form-metadata>
+	<div class="card-body">
+		<org-form-metadata org="org" vocabularies="vocabularies" mode="insert"></org-form-metadata>
+	</div>
 </div>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html
index 77925069..86dfb34b 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html
@@ -30,11 +30,11 @@
 
 	<div class="card-body" ng-if="currentTab == 2 && (org.status == 'approved' || org.status == 'suggested')">
 		<org-details org="org" org-title="Current organization" show="default"></org-details>
-		<org-form-duplicates duplicates="duplicates" save-function="saveDuplicates()" show-save-button="1"></org-form-duplicates>
+		<org-duplicates duplicates="duplicates" save-function="saveDuplicates()" show-save-button="1"></org-form-duplicates>
 	</div>
 
 	<div class="card-body" ng-if="currentTab == 3 && (org.status == 'approved' || org.status == 'suggested')">
-		<org-form-conflicts org="org" conflicts="conflicts" save-function="saveConflicts()" show-save-button="1"></org-form-conflicts>
+		<org-conflicts org="org" conflicts="conflicts" save-function="saveConflicts()" show-save-button="1"></org-form-conflicts>
 	</div>
 
 </div>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/forms/org_conflicts.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html
similarity index 100%
rename from apps/dnet-orgs-database-application/src/main/resources/static/resources/html/forms/org_conflicts.html
rename to apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/forms/org_duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html
similarity index 100%
rename from apps/dnet-orgs-database-application/src/main/resources/static/resources/html/forms/org_duplicates.html
rename to apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
index 6d476058..a812adb3 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
@@ -204,7 +204,7 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route) {
      }
 });
 
-orgsModule.directive('orgFormDuplicates', function($http, $location, $route) {
+orgsModule.directive('orgDuplicates', function($http, $location, $route) {
 	return {
 		restrict: 'E',
 		scope: {
@@ -212,12 +212,12 @@ orgsModule.directive('orgFormDuplicates', function($http, $location, $route) {
 			'showSaveButton' : '@',
 			'saveFunction'   : '&'
 		},
-		templateUrl: 'resources/html/forms/org_duplicates.html',
+		templateUrl: 'resources/html/parts/org_duplicates.html',
 		link: function(scope, element, attrs, ctrl) {}
      }
 });
 
-orgsModule.directive('orgFormConflicts', function($http, $location, $route, $q) {
+orgsModule.directive('orgConflicts', function($http, $location, $route, $q) {
 	return {
 		restrict: 'E',
 		scope: {
@@ -226,7 +226,7 @@ orgsModule.directive('orgFormConflicts', function($http, $location, $route, $q)
 			'showSaveButton' : '@',
 			'saveFunction'   : '&'
 		},
-		templateUrl: 'resources/html/forms/org_conflicts.html',
+		templateUrl: 'resources/html/parts/org_conflicts.html',
 		link: function(scope, element, attrs, ctrl) {
 			scope.candidateConflicts = [];
 			scope.selectedConflicts = [];