diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index a611199..9a53beb 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -169,7 +169,7 @@ export class AppComponent {
     this.configurationService.initCommunityInformation(this.properties, (communityId) ? communityId : this.properties.adminToolsPortalType);
   }
   initLayout(communityId){
-    if(!this.layout && location.pathname.indexOf("/preview") == -1) {
+    if(!this.layout && (typeof location == 'undefined' || (typeof location !== 'undefined'  && location.pathname.indexOf("/preview") == -1))) {
       this._layoutService.getLayout(this.properties, communityId).subscribe(
         layout => {
           if (layout) {
diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html
index 5acbcf1..d940dbd 100644
--- a/src/app/community/community.component.html
+++ b/src/app/community/community.component.html
@@ -617,7 +617,7 @@
                       [tabTitle]="'Ontology Mapping'"  [tabId]="'mapping'" customClass="portalTab">
                 <ng-container *ngTemplateOutlet="mapping_tab;"></ng-container>
               </my-tab>
-              <my-tab *ngIf="properties.environment == 'development' && communityId == 'enermaps' &&
+              <my-tab *ngIf="properties.environment != 'production' && communityId == 'enermaps' &&
               fetchFeaturedDatasets.searchUtils.totalResults > 0 && isEntityEnabled('dataset')"  customClass="portalTab"
                       [tabTitle]="'Featured datasets'"  [tabId]="'enermaps'" [tabNumber]="fetchFeaturedDatasets.searchUtils.totalResults">
                 <ng-container *ngTemplateOutlet="enermaps_tab;"></ng-container>
diff --git a/src/app/utils/customization/customization.component.ts b/src/app/utils/customization/customization.component.ts
index fc1e472..3b4cabb 100644
--- a/src/app/utils/customization/customization.component.ts
+++ b/src/app/utils/customization/customization.component.ts
@@ -65,7 +65,6 @@ export class CustomizationComponent {
       --background-light-color:` + this.layout.backgrounds.light.color+`;
     }
     `;
-    console.log(" create form css " , this.layout.backgrounds.form)
       //Search SVG
       let search = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 532"><defs><style>.cls-1{isolation:isolate;}.cls-2{fill:{{color}};mix-blend-mode:multiply;}</style></defs><title>Asset 3</title><g class="cls-1"><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-2" d="M0,431s362,109,841,62,632,68,1159-9V0H0Z"/><path class="cls-2" d="M0,514s1401,71,2000-69V0H0Z"/></g></g></g></svg>`;
       ;
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index a89ee8b..6c78757 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -51,10 +51,10 @@ export let properties: EnvProperties = {
   vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "80",
-  loginUrl: "https://beta.services.openaire.eu/connect-login/openid_connect_login",
-  userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
+  loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
+  userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
   registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
-  logoutUrl: "https://beta.services.openaire.eu/connect-login/openid_logout",
+  logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
   cookieDomain: ".openaire.eu",
   feedbackmail: "feedback@openaire.eu",
   cacheUrl: "https://demo.openaire.eu/cache/get?url=",