diff --git a/public/logo/HomepageLogo.png b/public/logo/HomepageLogo.png
new file mode 100644
index 0000000..6cb728d
Binary files /dev/null and b/public/logo/HomepageLogo.png differ
diff --git a/src/app/(main)/projects/page.tsx b/src/app/(main)/projects/page.tsx
index 7a7ba3a..a117fa2 100644
--- a/src/app/(main)/projects/page.tsx
+++ b/src/app/(main)/projects/page.tsx
@@ -2,6 +2,7 @@
 // import ProjectSearch from "@/components/ProjectSearch";
 // import { getServerI18n } from "@/i18n";
 
+import {I18nProvider} from "@/i18n";
 import { preloadProjects } from "../../../app/api/projects";
 import ProjectSearch from "../../../components/ProjectSearch";
 import { getServerI18n } from "../../../i18n";
@@ -42,9 +43,11 @@ const Projects: React.FC = async () => {
           {t("Create Project")}
         </Button>
       </Stack>
+      <I18nProvider namespaces={["project"]}>
       <Suspense fallback={<ProjectSearch.Loading />}>
         <ProjectSearch />
       </Suspense>
+      </I18nProvider>
     </>
   );
 };
diff --git a/src/app/(main)/settings/items/page.tsx b/src/app/(main)/settings/items/page.tsx
index 627b34d..97ea0a8 100644
--- a/src/app/(main)/settings/items/page.tsx
+++ b/src/app/(main)/settings/items/page.tsx
@@ -8,6 +8,7 @@ import Typography from "@mui/material/Typography";
 import { Metadata } from "next";
 import Link from "next/link";
 import { Suspense } from "react";
+import { I18nProvider } from "@/i18n";
 
 export const metadata: Metadata = {
   title: "Product",
@@ -15,7 +16,7 @@ export const metadata: Metadata = {
 
 const productSetting: React.FC = async () => {
   const project = TypeEnum.PRODUCT;
-  const { t } = await getServerI18n(project);
+  const { t } = await getServerI18n("project");
   //   preloadClaims();
 
   return (
@@ -38,9 +39,13 @@ const productSetting: React.FC = async () => {
           {t("Create product")}
         </Button> */}
       </Stack>
-      <Suspense fallback={<ItemsSearch.Loading />}>
-        <ItemsSearch />
-      </Suspense>
+      
+      <I18nProvider namespaces={["project", "common", "items"]}>
+        <Suspense fallback={<ItemsSearch.Loading />}>
+          <ItemsSearch />
+        </Suspense>
+      </I18nProvider>
+
     </>
   );
 };
diff --git a/src/components/LoginPage/LoginPage.tsx b/src/components/LoginPage/LoginPage.tsx
index 59fce6e..356d0fb 100644
--- a/src/components/LoginPage/LoginPage.tsx
+++ b/src/components/LoginPage/LoginPage.tsx
@@ -4,10 +4,22 @@ import LoginForm from "./LoginForm";
 import Logo from "../Logo";
 import { Box } from "@mui/material";
 
+
 const LoginPage = () => {
   return (
     <Grid container height="100vh">
-      <Grid item sm sx={{ backgroundColor: "neutral.900" }}></Grid>
+      <Grid item sm sx={{ backgroundColor: "#c5e58b"}}>
+        <Box sx={{
+        backgroundImage: "url('logo/HomepageLogo.png')",
+        backgroundRepeat: "no-repeat",
+        backgroundSize: "75% 40%",
+        width: "100%",
+        height: "100%",
+        backgroundPosition: "center",
+
+        }}>
+        </Box>
+      </Grid>
       <Grid item xs={12} sm={8} lg={5}>
         <Box
           sx={{
diff --git a/src/i18n/zh/common.json b/src/i18n/zh/common.json
index 7b8250f..d006477 100644
--- a/src/i18n/zh/common.json
+++ b/src/i18n/zh/common.json
@@ -21,6 +21,7 @@
     "Scheduling": "排程",
     "Settings": "設定",
     "User": "用戶",
+    "user": "用戶",
     "User Group": "用戶群組",
     "Items": "物料",
     "Demand Forecast Setting": "需求預測設定",
diff --git a/src/i18n/zh/user.json b/src/i18n/zh/user.json
index c7ff70d..22c76a3 100644
--- a/src/i18n/zh/user.json
+++ b/src/i18n/zh/user.json
@@ -22,5 +22,7 @@
     "authority": "權限",
     "description": "描述",
     "Search by Authority or description or position.": "搜尋權限、描述或職位。",
-    "Remove": "移除"
+    "Remove": "移除",
+    "User": "用戶",
+    "user": "用戶"
 }
\ No newline at end of file