diff --git a/src/components/nav-item.js b/src/components/nav-item.js
index 660a0cf..2ccb4a4 100644
--- a/src/components/nav-item.js
+++ b/src/components/nav-item.js
@@ -1,6 +1,5 @@
 import React from "react";
 import styled from "@emotion/styled";
-import { css } from "@emotion/react";
 import NavLink from "./nav-link";
 
 const SubList = styled.ul`
@@ -36,16 +35,28 @@ const ListItem = styled.li`
   }
 `;
 
-export default function NavItem({ children, subNav, index, open, ...other }) {
+export default function NavItem({
+  children,
+  subNav,
+  index,
+  open,
+  location,
+  to,
+  ...other
+}) {
   const hasChildren = subNav && subNav.length > 0;
   return (
     <ListItem open={open} index={index}>
-      <NavLink {...other}>{children}</NavLink>
+      <NavLink to={to} {...other}>
+        {children}
+      </NavLink>
       {hasChildren && (
         <SubList>
           {subNav.map((link, i) => (
             <ListItem key={i} index={i} open={open}>
-              <NavLink to={link.to}>{link.title}</NavLink>
+              <NavLink location={location} to={link.to}>
+                {link.title}
+              </NavLink>
             </ListItem>
           ))}
         </SubList>
diff --git a/src/components/nav-link.js b/src/components/nav-link.js
index 3a89865..16915d7 100644
--- a/src/components/nav-link.js
+++ b/src/components/nav-link.js
@@ -20,10 +20,13 @@ const Link = styled(GatsbyLink)`
     margin: 0 var(--spacing-x-xs);
     padding: 9px 0;
     border-bottom: 2px solid
-      ${props => (props.active ? `var(--color-white)` : `transparent`)};
+      ${props =>
+        props.active || props.partiallyActive
+          ? `var(--color-white)`
+          : `transparent`};
   }
 `;
 
-export default function NavLink({ children, to }) {
-  return <Link to={to}>{children}</Link>;
+export default function NavLink({ children, ...other }) {
+  return <Link {...other}>{children}</Link>;
 }
diff --git a/src/components/nav.js b/src/components/nav.js
index 4e0e829..62b5a23 100644
--- a/src/components/nav.js
+++ b/src/components/nav.js
@@ -104,7 +104,7 @@ const List = styled.ul`
   }
 `;
 
-export default function Nav({ data, open, setOpen }) {
+export default function Nav({ location, data, open, setOpen }) {
   const handleButtonClick = () => setOpen(!open);
   return (
     <Container open={open}>
@@ -124,6 +124,11 @@ export default function Nav({ data, open, setOpen }) {
                 index={i}
                 subNav={link.subNav}
                 to={link.to}
+                location={location}
+                active={location === link.to}
+                partiallyActive={
+                  link.subNav && location && location.indexOf(link.to) === 0
+                }
                 open={open}
               >
                 {link.title}
diff --git a/src/layout.js b/src/layout.js
index 12def51..a8a1559 100644
--- a/src/layout.js
+++ b/src/layout.js
@@ -83,7 +83,7 @@ const GlobalStyles = css`
   }
 `;
 
-export default function Layout({ children }) {
+export default function Layout({ location, children }) {
   const data = useStaticQuery(graphql`
     query HeaderQuery {
       site {
@@ -131,7 +131,12 @@ export default function Layout({ children }) {
         {children}
         <Footer />
       </main>
-      <Nav data={navData} open={navOpen} setOpen={setNavOpen} />
+      <Nav
+        location={location}
+        data={navData}
+        open={navOpen}
+        setOpen={setNavOpen}
+      />
     </>
   );
 }
diff --git a/src/pages/about.js b/src/pages/about.js
index be3b9e1..ab91993 100644
--- a/src/pages/about.js
+++ b/src/pages/about.js
@@ -5,7 +5,7 @@ import { Header, Heading, Section, Text } from "../components";
 
 export default function Index({ data }) {
   return (
-    <Layout>
+    <Layout location="/about">
       <Header
         image={data.headerImage.childImageSharp.fluid}
         position="bottom right"
diff --git a/src/pages/contact.js b/src/pages/contact.js
index bb983c6..a8fc774 100644
--- a/src/pages/contact.js
+++ b/src/pages/contact.js
@@ -49,7 +49,7 @@ export default function Index({ data }) {
       .catch(error => console.log(error));
   };
   return (
-    <Layout>
+    <Layout location="/contact">
       <Header
         image={data.headerImage.childImageSharp.fluid}
         position="bottom right"
diff --git a/src/pages/index.js b/src/pages/index.js
index 56264b5..1aba46a 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -14,7 +14,7 @@ import {
 
 export default function Index({ data }) {
   return (
-    <Layout>
+    <Layout location="/">
       <Header image={data.headerImage.childImageSharp.fluid}>
         <HeaderLogo transition={true} />
       </Header>
diff --git a/src/pages/services/bathrooms.js b/src/pages/services/bathrooms.js
index e33a036..fa53ff1 100644
--- a/src/pages/services/bathrooms.js
+++ b/src/pages/services/bathrooms.js
@@ -5,7 +5,7 @@ import { Header } from "../../components";
 
 export default function Index({ data }) {
   return (
-    <Layout>
+    <Layout location="/services/bathrooms">
       <Header image={data.headerImage.childImageSharp.fluid}>
         <h1>Bathrooms</h1>
       </Header>
diff --git a/src/pages/services/index.js b/src/pages/services/index.js
index dc3cdf6..e274968 100644
--- a/src/pages/services/index.js
+++ b/src/pages/services/index.js
@@ -5,7 +5,7 @@ import { Header } from "../../components";
 
 export default function Index({ data }) {
   return (
-    <Layout>
+    <Layout location="/services">
       <Header image={data.headerImage.childImageSharp.fluid}>
         <h1>Services</h1>
       </Header>