diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 15ca240..4332f91 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -5,27 +5,26 @@ import UIString from "./UIString.astro";
 import { getLanguageFromURL } from "../i18n/utils";
 
 const pageLang = getLanguageFromURL(Astro.url.pathname);
-console.log(pageLang);
 ---
 
 <footer>
-	<div class='container'>
+	<div class="container">
 		<div>
 			<i>
-				<UIString key={"footer.developed"} />: <TranslatedLink to='/contacts/'> Sergey Yarkov </TranslatedLink>
+				<UIString key={"footer.developed"} />: <TranslatedLink to="/contacts/"> Sergey Yarkov </TranslatedLink>
 				&copy; {new Date().getFullYear()}
 			</i>
 		</div>
 		<div>
-			<a href=`/${pageLang}/rss.xml` target='_blank'><UIString key={"footer.rssFeed"} /></a>
+			<a href=`/${pageLang}/rss.xml` target="_blank"><UIString key={"footer.rssFeed"} /></a>
 			<span>
-				<Icon name='rss' width='20' height='20' />
+				<Icon name="rss" width="20" height="20" />
 			</span>
 		</div>
 	</div>
 </footer>
 
-<style lang='scss'>
+<style lang="scss">
 	footer {
 		font-weight: 500;
 		margin-top: 5rem;
diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
index b65fd44..8322b48 100644
--- a/src/i18n/utils.ts
+++ b/src/i18n/utils.ts
@@ -17,8 +17,17 @@ export function getLanguageFromURL(pathname: string): LanguageKeys {
 	return DEFAULT_LANGUAGE;
 }
 
+// Call only from ./src/[lang]/page.astro
+export function isPageLangSupported(Astro: Readonly<AstroGlobal>) {
+	const params = Astro.params as { lang: string };
+	if (SUPPORTED_LANGUAGES.includes(params.lang as LanguageKeys)) return true;
+	return false;
+} 
+
 export function removeLangFromURL(pathname: string): string {
-	return pathname.split("/").slice(2).join("/");
+	const splittedPath = pathname.split("/");
+	if (splittedPath.length >= 3) return "/" + splittedPath.slice(2).join("/");
+	return pathname;
 }
 
 function transformExports<T>(modules: Record<string, { default: T }>) {
diff --git a/src/layouts/default.astro b/src/layouts/default.astro
index 3024641..908f34a 100644
--- a/src/layouts/default.astro
+++ b/src/layouts/default.astro
@@ -14,10 +14,7 @@ const { title, description, lang = DEFAULT_LANGUAGE, noIndex = false } = Astro.p
 ---
 
 <html lang={lang}>
-	<BaseHead
-		title={title ? `${title} | ${SITE_METADATA.title}` : SITE_METADATA.title}
-		description={description}
-	>
+	<BaseHead title={title ? `${title} | ${SITE_METADATA.title}` : SITE_METADATA.title} description={description}>
 		{noIndex && <meta name="robots" content="noindex" />}
 	</BaseHead>
 	<BaseLayout>
diff --git a/src/pages/404.astro b/src/pages/404.astro
index cc4b835..951fe35 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -1,5 +1,5 @@
 ---
-import NotFoundPage from "@templates/NotFound.astro";
+import NotFoundTemplate from "@templates/NotFound.astro";
 ---
 
-<NotFoundPage />
+<NotFoundTemplate />
diff --git a/src/pages/[lang]/about.astro b/src/pages/[lang]/about.astro
index 9e0f97b..aac4fe1 100644
--- a/src/pages/[lang]/about.astro
+++ b/src/pages/[lang]/about.astro
@@ -1,5 +1,8 @@
 ---
 import AboutTemplate from "@templates/About.astro";
+import { isPageLangSupported } from "@i18n/utils";
+
+if (!isPageLangSupported(Astro)) return Astro.redirect("/404");
 ---
 
 <AboutTemplate />
diff --git a/src/pages/[lang]/articles.astro b/src/pages/[lang]/articles.astro
index e713a14..876c223 100644
--- a/src/pages/[lang]/articles.astro
+++ b/src/pages/[lang]/articles.astro
@@ -1,5 +1,8 @@
 ---
 import ArticlesTemplate from "@templates/Articles.astro";
+import { isPageLangSupported } from "@i18n/utils";
+
+if (!isPageLangSupported(Astro)) return Astro.redirect("/404");
 ---
 
 <ArticlesTemplate />
diff --git a/src/pages/[lang]/contacts.astro b/src/pages/[lang]/contacts.astro
index 0164138..1428155 100644
--- a/src/pages/[lang]/contacts.astro
+++ b/src/pages/[lang]/contacts.astro
@@ -1,5 +1,8 @@
 ---
 import ContactsTemplate from "@templates/Contacts.astro";
+import { isPageLangSupported } from "@i18n/utils";
+
+if (!isPageLangSupported(Astro)) return Astro.redirect("/404");
 ---
 
 <ContactsTemplate />
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index f48e590..7910d61 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -1,5 +1,8 @@
 ---
 import HomeTemplate from "@templates/Home.astro";
+import { isPageLangSupported } from "@i18n/utils";
+
+if (!isPageLangSupported(Astro)) return Astro.redirect("/404");
 ---
 
 <HomeTemplate />
diff --git a/src/pages/[lang]/projects.astro b/src/pages/[lang]/projects.astro
index ca2bb14..c83f3c2 100644
--- a/src/pages/[lang]/projects.astro
+++ b/src/pages/[lang]/projects.astro
@@ -1,5 +1,8 @@
 ---
 import ProjectsTemplate from "@templates/Projects.astro";
+import { isPageLangSupported } from "@i18n/utils";
+
+if (!isPageLangSupported(Astro)) return Astro.redirect("/404");
 ---
 
 <ProjectsTemplate />
diff --git a/src/pages/about.astro b/src/pages/about.astro
index 4b921bc..9e0f97b 100644
--- a/src/pages/about.astro
+++ b/src/pages/about.astro
@@ -1,5 +1,5 @@
 ---
-import AboutPage from "@templates/About.astro";
+import AboutTemplate from "@templates/About.astro";
 ---
 
-<AboutPage />
+<AboutTemplate />
diff --git a/src/pages/articles.astro b/src/pages/articles.astro
index aac2e47..e713a14 100644
--- a/src/pages/articles.astro
+++ b/src/pages/articles.astro
@@ -1,5 +1,5 @@
 ---
-import ArticlesPage from "@templates/Articles.astro";
+import ArticlesTemplate from "@templates/Articles.astro";
 ---
 
-<ArticlesPage />
+<ArticlesTemplate />
diff --git a/src/pages/[blog]/[...url].astro b/src/pages/blog/[...url].astro
similarity index 80%
rename from src/pages/[blog]/[...url].astro
rename to src/pages/blog/[...url].astro
index 2d6c9de..5a20ca1 100644
--- a/src/pages/[blog]/[...url].astro
+++ b/src/pages/blog/[...url].astro
@@ -2,7 +2,8 @@
 import ArticleLayout from "@root/layouts/article.astro";
 import { getArticleTranslationsBySlug, incArticleTranslationViews } from "@/src/queries";
 
-const { url } = Astro.params as { blog: string; url: string };
+// Example of an URL: https://website.com/blog/01-01-2025/my-article/
+const { url } = Astro.params as { url: string };
 const slug = url.split("/").at(-1);
 
 if (!slug) return Astro.redirect("/404");
diff --git a/src/pages/contacts.astro b/src/pages/contacts.astro
index 6708324..0164138 100644
--- a/src/pages/contacts.astro
+++ b/src/pages/contacts.astro
@@ -1,5 +1,5 @@
 ---
-import ContactsPage from "@root/templates/Contacts.astro";
+import ContactsTemplate from "@templates/Contacts.astro";
 ---
 
-<ContactsPage />
+<ContactsTemplate />
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 10d755e..f48e590 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import Home from "@root/templates/Home.astro";
+import HomeTemplate from "@templates/Home.astro";
 ---
 
-<Home />
+<HomeTemplate />
diff --git a/src/pages/projects.astro b/src/pages/projects.astro
index 073028c..ca2bb14 100644
--- a/src/pages/projects.astro
+++ b/src/pages/projects.astro
@@ -1,5 +1,5 @@
 ---
-import ProjectsPage from "@root/templates/Projects.astro";
+import ProjectsTemplate from "@templates/Projects.astro";
 ---
 
-<ProjectsPage />
+<ProjectsTemplate />
diff --git a/src/templates/Home.astro b/src/templates/Home.astro
index ecb8fd0..b238daf 100644
--- a/src/templates/Home.astro
+++ b/src/templates/Home.astro
@@ -22,8 +22,8 @@ const t = useTranslation(Astro);
 			<p><UIString key={"splash.description"} /></p>
 		</SplashHeading>
 		<SplashLinks>
-			<SplashLink icon='information' href='/about/'><UIString key={"splash.about"} /></SplashLink>
-			<SplashLink icon='email_filled' href='/contacts/'>
+			<SplashLink icon="information" href="/about/"><UIString key={"splash.about"} /></SplashLink>
+			<SplashLink icon="email_filled" href="/contacts/">
 				<UIString key={"splash.contact"} />
 			</SplashLink>
 		</SplashLinks>