diff --git a/cms/src/app.postcss b/cms/src/app.postcss
index fac5e17..82c17c5 100644
--- a/cms/src/app.postcss
+++ b/cms/src/app.postcss
@@ -104,10 +104,10 @@
       filter: brightness(0.98);
     }
     .fit2{
-      display: block;
+        display: block;
         height: 100%;
         width: 100%;
-      object-fit: cover;
+        object-fit: cover;
         object-position: top;
     }
 
diff --git a/cms/src/lib/components/Header.svelte b/cms/src/lib/components/Header.svelte
index a5de37e..d4047a6 100644
--- a/cms/src/lib/components/Header.svelte
+++ b/cms/src/lib/components/Header.svelte
@@ -17,17 +17,17 @@
 	>
 	<div class="flex-1">
 	<div class="justify-start flex">
-		<div class="content-center grid">
-		<div class="avatar">
-			<div class="w-10 rounded-full">
-			<img src={logo_url?logo_url:'/images/logo.png'} alt="logo">
+		<div class="content-center grid" >
+			<div class="avatar">
+				<div class="w-10 rounded-full">
+				<a href="{home}"><img src={logo_url?logo_url:'/images/logo.png'} alt="logo"></a>
+				</div>
 			</div>
-		</div>
-		</div>
-		<div class="content-center grid pl-4">
-			{title}
-		<div class="textline2">{supervised}</div>
-		</div>
+			</div>
+			<a class="content-center grid pl-4"  href="{home}">
+				{title}
+				<div class="textline2">{supervised}</div>
+			</a>
 	</div>
 	</div>
 	<div class="flex-none  gap-2">
@@ -40,14 +40,14 @@
 		<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
 			<ul tabindex="0" style="width: 150px;" class="menu menu-compact dropdown-content mt-3 right-0 p-2 shadow bg-base-100 rounded-box w-52">
 				<li ><a class="hover:text-gray-500 active:bg-white" href="/">หน้าหลัก</a></li>
-				<li><a class="hover:text-gray-500 active:bg-white" href="/qualifying">การสอบคัดเลือก</a></li>
+				<li><a class="hover:text-gray-500 active:bg-white" href="/qualifying">การคัดเลือก</a></li>
 				<li><a class="hover:text-gray-500 active:bg-white" href="/competitive">การสอบแข่งขัน</a></li>
 				<li><a class="hover:text-gray-500 active:bg-white" href="/about">เกี่ยวกับเรา</a></li>
 			</ul>
 		</div>
 		<div class="tabs hidden lg:flex w-full"><!-- tab-active -->
 			<a href="{home}" class="{$page.url.pathname == home? 'tab text-gray-700': 'tab '}">หน้าแรก</a>
-			<a href="{qualifying}" class="{$page.url.pathname == qualifying? 'tab text-gray-700': 'tab '}">การสอบคัดเลือก</a>
+			<a href="{qualifying}" class="{$page.url.pathname == qualifying? 'tab text-gray-700': 'tab '}">การคัดเลือก</a>
 			<a href="{competitive}"  class="{$page.url.pathname == competitive? 'tab text-gray-700': 'tab '}">การสอบแข่งขัน</a>
 			<a href="{about}"  class="{$page.url.pathname == about? 'tab text-gray-700': 'tab '}">เกี่ยวกับเรา</a>
 		</div>
diff --git a/cms/src/routes/+page.server.ts b/cms/src/routes/+page.server.ts
index 9946872..0cc486e 100644
--- a/cms/src/routes/+page.server.ts
+++ b/cms/src/routes/+page.server.ts
@@ -43,7 +43,7 @@ export const load: PageServerLoad = async ({fetch}) => {
 		}
 		return exams	
 	}
-	const qualify_exams = loadExam(env.API_QUALIFYING_URL +"/qualifying?limit=3",'ไม่สามารถอ่านรายการสอบคัดเลือกได้')
+	const qualify_exams = loadExam(env.API_QUALIFYING_URL +"/qualifying?limit=3",'ไม่สามารถอ่านรายการคัดเลือกได้')
 	const competitive_exams = loadExam(env.API_COMPETITIVE_URL+"/competitive?limit=3",'ไม่สามารถอ่านรายการสอบแข่งขันได้')
 
 	return {title,subtitle,content,image, qualify_exams,competitive_exams };
diff --git a/cms/src/routes/+page.svelte b/cms/src/routes/+page.svelte
index 532c11a..f540e35 100644
--- a/cms/src/routes/+page.svelte
+++ b/cms/src/routes/+page.svelte
@@ -22,7 +22,7 @@
                       href="/qualifying"
                       class=" text-white font-bold px-6 py-4 rounded outline-none focus:outline-none mr-1 mb-1 bg-red-400 active:bg-red-500 uppercase text-sm shadow hover:shadow-lg ease-linear transition-all duration-150"
                     >
-                      การสอบคัดเลือก
+                      การคัดเลือก
                     </a>
                     <a
                       href="/competitive"
diff --git a/cms/src/routes/qualifying/+page.svelte b/cms/src/routes/qualifying/+page.svelte
index 9e9b657..99eaee8 100644
--- a/cms/src/routes/qualifying/+page.svelte
+++ b/cms/src/routes/qualifying/+page.svelte
@@ -7,7 +7,7 @@
 
 <section>
     <div class="p-one parallax-inner">
-      <h2>การสอบคัดเลือก</h2>
+      <h2>การคัดเลือก</h2>
     </div>
 </section>
 <section class="pb-40 relative bg-blueGray-100">
@@ -23,7 +23,7 @@
 					</a>
 				  </li> 
 				  <li>
-					<span class="breadTaxt">การสอบคัดเลือก</span>
+					<span class="breadTaxt">การคัดเลือก</span>
 				  </li>
 				</ul>
 			</div>
@@ -44,7 +44,7 @@
 				<div class="rounded-t mb-0 p-3 border-0 ">
 					<div class="flex flex-wrap items-center justify-between">
 						<h3 class="text-lg text-blueGray-700 font-semibold">
-							รายการสอบคัดเลือก
+							รายการคัดเลือก
 						</h3>
 						<div class="text-xs font-light">จำนวน {exams.length} รายการ</div>
 					</div>
diff --git a/cms/src/routes/qualifying/[id]/+page.svelte b/cms/src/routes/qualifying/[id]/+page.svelte
index 083ccb2..6e94685 100644
--- a/cms/src/routes/qualifying/[id]/+page.svelte
+++ b/cms/src/routes/qualifying/[id]/+page.svelte
@@ -12,7 +12,7 @@
 </script>
 <section>
     <div class="p-one parallax-inner">
-      <h2>การสอบคัดเลือก</h2>
+      <h2>การคัดเลือก</h2>
     </div>
 </section>
 <section class="pb-40 relative bg-blueGray-100">