diff --git a/src/lib/Navigation.svelte b/src/lib/Navigation.svelte
index e9c7bc1..a4946a2 100644
--- a/src/lib/Navigation.svelte
+++ b/src/lib/Navigation.svelte
@@ -18,40 +18,38 @@ function handleUpdate(event) {
 	isOpen = event.detail.isOpen;
 }
 
-let routes = [
-	{
-		url: '/cloud',
-		name: 'Cloud Services'
-	},
-	// We are hiding these paths for MEDINA, since they can be viewed on the service-specific views
-	// {
-	// 	url: '/discovery',
-	// 	name: 'Discovery'
-	// },
-	// {
-	// 	url: '/assessment',
-	// 	name: 'Assessment'
-	// },
-	{
-		url: '/metrics',
-		name: 'Metrics'
-	},
-	{
-		url: '/catalogs',
-		name: 'Catalogues'
-	},
-	{
-		url: '/certificates',
-		name: 'Certificates'
-	},
-	{
-		name: 'Help'
-	}
-];
+// let routes = [
+// 	{
+// 		url: '/cloud',
+// 		name: 'Cloud Services'
+// 	},
+// 	// We are hiding these paths for MEDINA, since they can be viewed on the service-specific views
+// 	// {
+// 	// 	url: '/discovery',
+// 	// 	name: 'Discovery'
+// 	// },
+// 	// {
+// 	// 	url: '/assessment',
+// 	// 	name: 'Assessment'
+// 	// },
+// 	{
+// 		url: '/metrics',
+// 		name: 'Metrics'
+// 	},
+// 	{
+// 		url: '/catalogs',
+// 		name: 'Catalogues'
+// 	},
+// 	{
+// 		url: '/certificates',
+// 		name: 'Certificates'
+// 	},
+// 	{
+// 		name: 'Help'
+// 	}
+// ];
 
 let loggedIn = localStorage.token ? true : false;
-
-console.log($page.url);
 </script>
 
 <SvelteToast />
@@ -96,7 +94,6 @@ console.log($page.url);
 				<NavLink href="{base}/login">Login</NavLink>
 			</NavItem>
 			{/if}
-			
 			<NavItem>
 				<NavLink href="https://medina-project.eu/wp-content/uploads/MEDINA_User_Manuals/MEDINA_Orchestrator_UserManual.pdf" target="_blank">
 					<Fa icon={faQuestion} /> Help
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index b621869..a05b627 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -52,7 +52,7 @@ function getVersionMessage(): string {
 <Navigation />
 
 <main>
-	<slot />
+    <slot />
 </main>
 
 <Button color="secondary" on:click={() => toggle()}>
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 24ac37f..3905f13 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -3,7 +3,14 @@ import { getRuntimeInfo, listCatalogs, listControls, listMetrics } from "$lib/or
 import { metrics, controls } from "$lib/stores";
 import type { LayoutLoad } from "./$types";
 
-export const load: LayoutLoad = async ({ fetch }) => {
+export const load: LayoutLoad = async ({ fetch, url}) => {
+
+    // If the the path '/public/certificates' was called, we return here without calling the other endpoints.
+    if (url.pathname == "/public/certificates") {
+        console.info("public certificates endpoint called: ignore further load functionality")
+        return
+    }
+    
     // Since we want a map for convenience, we need to use a store, rather than
     // exposing the metric through a layout data props. Layout data props need
     // to be JSON and thus, a real ES6 map cannot be used.
@@ -16,7 +23,6 @@ export const load: LayoutLoad = async ({ fetch }) => {
         .catch(() => {
             // ignore, we will catch it later
             console.error("error getting metrics")
-            return
         });
 
     listControls(null, null, fetch).then((list) => {
@@ -25,7 +31,6 @@ export const load: LayoutLoad = async ({ fetch }) => {
         .catch(() => {
             // ignore, we will catch it later
             console.error("error getting controls")
-            return
         });
 
         try {
@@ -39,8 +44,7 @@ export const load: LayoutLoad = async ({ fetch }) => {
             }
         } catch (error) {
             console.warn("error start page load function")
-            return
-            // return redirectLogin('/cloud');
+            return redirectLogin('/cloud');
         }
 }
 
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index e69de29..bcd1afe 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+import { redirectLogin } from "$lib/oauth";
+
+</script>
+
+{redirectLogin('/cloud')}
\ No newline at end of file
diff --git a/src/routes/public/certificates/+page.svelte b/src/routes/public/certificates/+page.svelte
index aa6e257..f300fb5 100644
--- a/src/routes/public/certificates/+page.svelte
+++ b/src/routes/public/certificates/+page.svelte
@@ -9,7 +9,7 @@
 
 <h3>Certificates</h3>
 
-{#if certificates}
+{#if certificates.length > 0}
 	<Container class="mt-4 ms-0 me-0">
 		<Row cols={2} noGutters>
 			{#each certificates as certificate, i}
diff --git a/src/routes/public/certificates/+page.ts b/src/routes/public/certificates/+page.ts
index 46f2417..1954dde 100644
--- a/src/routes/public/certificates/+page.ts
+++ b/src/routes/public/certificates/+page.ts
@@ -4,7 +4,7 @@ import { redirectLogin } from '$lib/oauth';
 /**
  * @type {import('@sveltejs/kit').PageLoad}
  */
-export async function load({ params, fetch }) {
+export async function load({}) {
 	return listPublicCertificates()
 		.then((certificates) => {
 			return {
@@ -12,6 +12,7 @@ export async function load({ params, fetch }) {
 			};
 		})
 		.catch(() => {
+			console.error("error listPublicCertificates")
 			redirectLogin('/cloud');
 		});
 }