diff --git a/client/public/logo.svg b/client/public/logo.svg
new file mode 100644
index 000000000..1bc0f1164
--- /dev/null
+++ b/client/public/logo.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  id="etuajo-oikeus"
+  width="450"
+  height="450">
+    <path d="M 0,225 L 225,0 L 450,225 L 225,450" fill="#000000" />
+    <path d="M 225,431.25 L 18.75,225 L 225,18.75 L 431.25,225" fill="#ffffff" />
+    <path d="M 56.25,225 L 225,56.25 L 393.75,225 L 225,393.75" fill="#000000" />
+    <path d="M 225,386.25 L 63.75,225 L 225,63.75 L 386.25,225" fill="#ffd90f" />
+</svg>
diff --git a/client/public/logo1024.png b/client/public/logo1024.png
new file mode 100644
index 000000000..ad7634169
Binary files /dev/null and b/client/public/logo1024.png differ
diff --git a/client/public/logo240.png b/client/public/logo240.png
new file mode 100644
index 000000000..07fffbeee
Binary files /dev/null and b/client/public/logo240.png differ
diff --git a/client/public/logo600.png b/client/public/logo600.png
new file mode 100644
index 000000000..912e6e2ce
Binary files /dev/null and b/client/public/logo600.png differ
diff --git a/client/public/manifest.json b/client/public/manifest.json
index 080d6c77a..c524aa296 100644
--- a/client/public/manifest.json
+++ b/client/public/manifest.json
@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "Bodyshop",
+  "name": "Bodyshop Management System",
   "icons": [
     {
       "src": "favicon.ico",
diff --git a/client/src/App/App.js b/client/src/App/App.js
index bf8b7b9dc..701677aae 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { Switch, Route } from "react-router";
+import { Switch, Route, Redirect } from "react-router";
 import { ApolloProvider } from "react-apollo";
 import { HttpLink } from "apollo-link-http";
 import ApolloClient from "apollo-client";
@@ -11,11 +11,11 @@ import { gql } from "apollo-boost";
 import "./App.css";
 
 //Component Imports
-import SignIn from "../components/sign-in-form/sign-in-form.component";
 import LandingPage from "../pages/landing/landing.page";
 import Manage from "../pages/manage/manage.page";
 
 import PrivateRoute from "../utils/private-route";
+import SignInContainer from "../pages/sign-in/sign-in.container";
 
 const graphqlEndpoint = process.env.REACT_APP_GRAPHQL_ENDPOINT;
 
@@ -49,7 +49,13 @@ export default function App({ authState }) {
     <ApolloProvider client={client}>
       <Switch>
         <Route exact path="/" component={LandingPage} />
-        <Route exact path="/signin" component={SignIn} />
+        <Route
+          exact
+          path="/signin"
+          render={() =>
+            authState ? <Redirect to="/manage" /> : <SignInContainer />
+          }
+        />
         <PrivateRoute isAuthorized={isIn} path="/manage" component={Manage} />
       </Switch>
     </ApolloProvider>
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index f5d6f2639..07b39e639 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -23,7 +23,7 @@ class Header extends Component {
         {navItems.map(navItem => (
           <Menu.Item key={navItem.title}>
             <Link to={navItem.path}>
-              <Icon type={navItem.icontype} />
+              {navItem.icontype ? <Icon type={navItem.icontype} /> : null}
               {navItem.title}
             </Link>
           </Menu.Item>
diff --git a/client/src/components/header/header.container.jsx b/client/src/components/header/header.container.jsx
index dac8e0608..1e4dbbd76 100644
--- a/client/src/components/header/header.container.jsx
+++ b/client/src/components/header/header.container.jsx
@@ -27,6 +27,7 @@ const HeaderContainer = ({ landingHeader }) => {
               if (loading) return <Spin />;
               if (error) return <Alert message={error.message} />;
               const parsedNavItems = JSON.parse(data.masterdata_by_pk.value);
+              console.log("::1", landingHeader);
               return (
                 <Header
                   selectedNavItem={selectedNavItem}
diff --git a/client/src/components/manage-shop/manage-shop.component.jsx b/client/src/components/manage-shop/manage-shop.component.jsx
index a4a488f9f..63d22fb7d 100644
--- a/client/src/components/manage-shop/manage-shop.component.jsx
+++ b/client/src/components/manage-shop/manage-shop.component.jsx
@@ -1,9 +1,10 @@
 import React from "react";
+import HeaderContainer from "../header/header.container";
 
 export default function ManageShop() {
   return (
     <div>
-     
+     <HeaderContainer />
       This is the manage shop component.
     </div>
   );
diff --git a/client/src/components/manage-shop/manage-shop.container.jsx b/client/src/components/manage-shop/manage-shop.container.jsx
index 879b4ded1..318bf814c 100644
--- a/client/src/components/manage-shop/manage-shop.container.jsx
+++ b/client/src/components/manage-shop/manage-shop.container.jsx
@@ -1,27 +1,7 @@
 import React from "react";
-import { Query } from "react-apollo";
-import { gql } from "apollo-boost";
 
-import { Alert } from "antd";
-import Spin from '../loading-spinner/loading-spinner.component'
 import ManageShop from "./manage-shop.component";
 
-const GET_NAV_ITEMS = gql`
-  query nav_items {
-    masterdata_by_pk(key: "NAV_ITEMS") {
-      value
-    }
-  }
-`;
-
-const ManageShopContainer = () => (
-  <Query query={GET_NAV_ITEMS}>
-    {({ loading, error, data }) => {
-      if (loading) return <Spin />;
-      if (error) return <Alert message={error.message} />;
-      return <ManageShop />;
-    }}
-  </Query>
-);
+const ManageShopContainer = () => <ManageShop />;
 
 export default ManageShopContainer;
diff --git a/client/src/graphql/metadata.queries.js b/client/src/graphql/metadata.queries.js
index 703ec91ad..12cefb86c 100644
--- a/client/src/graphql/metadata.queries.js
+++ b/client/src/graphql/metadata.queries.js
@@ -23,7 +23,10 @@ export const GET_SELECTED_NAV_ITEM = gql`
 
 export const GET_CURRENT_USER = gql`
   query GetCurrentUser {
-    currentUser @client
+    currentUser @client {
+      email
+      displayName
+    }
   }
 `;
 
diff --git a/client/src/pages/sign-in/sign-in.container.jsx b/client/src/pages/sign-in/sign-in.container.jsx
new file mode 100644
index 000000000..77adbb00f
--- /dev/null
+++ b/client/src/pages/sign-in/sign-in.container.jsx
@@ -0,0 +1,25 @@
+import React from "react";
+import { Query } from "react-apollo";
+
+import { Alert } from "antd";
+
+import Spin from "../../components/loading-spinner/loading-spinner.component";
+// import Skeleton from "../loading-skeleton/loading-skeleton.component";
+
+import { GET_CURRENT_USER } from "../../graphql/metadata.queries";
+import SignInPage from "./sign-in.page";
+
+const SignInContainer = () => {
+  return (
+    <Query query={GET_CURRENT_USER}>
+      {({ loading, error, data: { currentUser } }) => {
+        if (loading) return <Spin />;
+        if (error) return <Alert message={error.message} />;
+
+        return <SignInPage signedIn={currentUser.email ? true : false} />;
+      }}
+    </Query>
+  );
+};
+
+export default SignInContainer;
diff --git a/client/src/pages/sign-in/sign-in.page.jsx b/client/src/pages/sign-in/sign-in.page.jsx
index 0dc7c27dd..a58e0b408 100644
--- a/client/src/pages/sign-in/sign-in.page.jsx
+++ b/client/src/pages/sign-in/sign-in.page.jsx
@@ -1,13 +1,14 @@
 import React from "react";
-import signInComponent from "../../components/sign-in-form/sign-in-form.component";
+import SignInComponent from "../../components/sign-in-form/sign-in-form.component";
 
 import { Redirect } from "react-router-dom";
 
 
-export default function SignInPage() {
+export default ({signedIn}) => {
+  console.log(signedIn)
   return (
     <div>
-      <signInComponent />
+      <SignInComponent />
     </div>
   );
-}
+};