diff --git a/src/app/subjects/subjects.component.ts b/src/app/subjects/subjects.component.ts
index eebbe7a..421d22e 100644
--- a/src/app/subjects/subjects.component.ts
+++ b/src/app/subjects/subjects.component.ts
@@ -47,7 +47,8 @@ import {Subscriber, Subscription} from "rxjs";
 							</ul>
 						</div>
 						<!-- View for 'All' -->
-						<div *ngIf="index == 0" class="uk-margin-large-top uk-grid uk-child-width-1-4@m" uk-grid>
+            <div *ngIf="index == 0 && groupedSubjects.length > 1" class="uk-margin-large-top uk-grid uk-child-width-1-4@m" uk-grid>
+<!--            <div *ngIf="index == 0" class="uk-margin-large-top uk-grid uk-child-width-1-4@m" uk-grid>-->
 							<div *ngFor="let item of groupedSubjects.slice(1); let i = index;">
 								<div>
 									<h6>{{item.group}}</h6>
@@ -67,7 +68,8 @@ import {Subscriber, Subscription} from "rxjs";
 							</div>
 						</div>
 						<!-- View for a single group -->
-						<div *ngIf="index != 0" class="uk-margin-large-top">
+            <div *ngIf="index != 0 || groupedSubjects.length == 1" class="uk-margin-large-top">
+<!--            <div *ngIf="index != 0" class="uk-margin-large-top">-->
 							<div>
 								<div>
 									<h6>{{groupedSubjects[index].group}}</h6>
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index b61d152..da47803 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -59,7 +59,7 @@ export let properties: EnvProperties = {
   cookieDomain: ".openaire.eu",
   feedbackmail: "feedback@openaire.eu",
   cacheUrl: "https://demo.openaire.eu/cache/get?url=",
-  adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools",
+  adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/",
   adminToolsCommunity: "connect",
   datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
   contextsAPI: "https://beta.services.openaire.eu/openaire/context",