diff --git a/data/projects.yml b/data/projects.yml
index 5e74879..34deb7c 100644
--- a/data/projects.yml
+++ b/data/projects.yml
@@ -5,7 +5,7 @@
   slug: "/oceanprotocol/"
   img: "../src/images/portfolio-oceanprotocol-01.png"
   description: >
-    Since 2017 I'm leading the UI design & development of all Ocean Protocol web properties. Additionally, I conceptualize, execute and iterate on the creative and visual direction of the Ocean Protocol brand.
+    Since 2017 I'm leading the UI design & development of Ocean Protocol, iterating on a components-based UI design system spanning all of Ocean Protocol's web properties. Additionally, I conceptualize, execute and iterate on the creative and visual direction of the Ocean Protocol brand.
 
     The main website is a single-page JavaScript application built with React, pulling its data from JSON files and various micro services. All design & development is embedded in a continous deployment process via GitHub & Travis.
 
@@ -50,6 +50,7 @@
   - Travis
   - AWS S3
   - Cloudflare
+  - 3Scale
 
   links:
   - title: Link
@@ -64,7 +65,7 @@
 
   title: Berlin Innovation Ventures
   slug: "/biv/"
-  img: "../src/images/portfolio-biv.png"
+  img: "../src/images/portfolio-biv-01.png"
   description: >
     I designed & developed the website and a basic branding for the new
     Berlin-based VC firm Berlin Innovation Ventures. The main website is a static
@@ -86,7 +87,7 @@
 
   title: 9984 >> Summit 2017
   slug: "/9984/"
-  img: "../src/images/portfolio-9984.png"
+  img: "../src/images/portfolio-9984-01.png"
   links:
   - title: Link
     url: https://2017.9984.io
@@ -117,7 +118,7 @@
   slug: "/bigchaindb/"
   img: "../src/images/portfolio-bigchaindb-01.png"
   description: >
-    Since 2016 I'm leading the UI design & development of all BigchainDB web properties. I created the initial BigchainDB brand and further conceptualize, execute and iterate on the creative and visual direction of BigchainDB.
+    Since 2016 I'm leading the UI design & development of all BigchainDB web properties. I created the initial BigchainDB brand and further conceptualize, execute and iterate on the creative and visual direction of BigchainDB. This includes creating and iterating on a components-based UI design system for all of BigchainDB's web properties.
 
     The main website is a static site built with Jekyll and a custom Gulp-based build pipeline in front of it, pulling data from various external sources and microservices. All design & development is embedded in a continous deployment process via GitHub & Travis.
 
@@ -189,7 +190,7 @@
 
   title: ShareTheMeal
   slug: "/sharethemeal/"
-  img: "../src/images/portfolio-sharethemeal.png"
+  img: "../src/images/portfolio-sharethemeal-01.png"
   description: >
     ShareTheMeal is an app from the United Nations World Food Programme (WFP) that enables people to "share their meals" with children in need. In 2015 I was consulting, co-designing and leading the front-end development of the ShareTheMeal website and various parts of the ShareTheMeal apps for iOS & Android.
 
@@ -251,9 +252,9 @@
 
   title: Mr. Reader
   slug: "/mrreader/"
-  img: "../src/images/portfolio-mrreader.png"
+  img: "../src/images/portfolio-mrreader-01.png"
   description: >
-    I designed the app icon, a custom theme, and various promotion materials for Mr. Reader, a powerful RSS feed reader for iPad.
+    In 2012 I designed the app icon, a custom theme, and various promotion materials for Mr. Reader, a powerful RSS feed reader for iPad.
   techstack:
   - Photoshop
 
@@ -261,7 +262,7 @@
 
   title: iPixelPad
   slug: "/ipixelpad/"
-  img: "../src/images/portfolio-ipixelpad.png"
+  img: "../src/images/portfolio-ipixelpad-01.png"
   description: >
     So, what to do when everyone seem to release iPad icons but fail to
     include some crisp small size icons? Pushing the pixels for yourself of course.
@@ -280,7 +281,7 @@
 
   title: Out Of Whale Oil
   slug: "/outofwhaleoil/"
-  img: "../src/images/portfolio-outofwhaleoil-01.png"
+  img: "../src/images/portfolio-outofwhaleoil-01.jpg"
   description: >
     Tribute wallpaper pack inspired by the Futurama movie _Into The Wild
     Green Yonder_. Released as a goodie
@@ -323,7 +324,7 @@
 
   title: Coffee Cup
   slug: "/coffeecup/"
-  img: "../src/images/portfolio-coffeecup.png"
+  img: "../src/images/portfolio-coffeecup-01.png"
   description: >
     Desktop icons showing the fuel of most designers. Released as a goodie
     on [kremalicious.com](https://kremalicious.com/coffee-cup-icon/).
diff --git a/src/components/molecules/ProjectNav.jsx b/src/components/molecules/ProjectNav.jsx
index 60d7223..35882c8 100644
--- a/src/components/molecules/ProjectNav.jsx
+++ b/src/components/molecules/ProjectNav.jsx
@@ -24,11 +24,11 @@ const ProjectNav = ({ previous, next }) => (
     <Link
       className="project__nav__index"
       title="Back to projects"
-      to={'/#projects'}
+      to={'/'}
     >
       <Index className="icon" />
     </Link>
-    {next && (
+    {next ? (
       <div className="project__nav__item">
         <Link className="project__nav__link next" to={next.slug}>
           <Img
@@ -39,6 +39,13 @@ const ProjectNav = ({ previous, next }) => (
           <h1 className="project__nav__title">{next.title}</h1>
         </Link>
       </div>
+    ) : (
+        <div className="project__nav__item project__nav__item--end">
+          <div className="project__nav__end">
+            <h3>This is the end</h3>
+            <p>I would rather not show you my websites from 1999.</p>
+          </div>
+        </div>
     )}
   </nav>
 )
diff --git a/src/components/molecules/ProjectNav.scss b/src/components/molecules/ProjectNav.scss
index ef16458..ac432f4 100644
--- a/src/components/molecules/ProjectNav.scss
+++ b/src/components/molecules/ProjectNav.scss
@@ -95,3 +95,25 @@
         margin-right: auto;
     }
 }
+
+.project__nav__item--end {
+    pointer-events: none;
+    display: flex;
+    align-items: center;
+}
+
+.project__nav__end {
+    padding-right: $spacer;
+    text-align: left;
+
+    h3 {
+        font-size: $font-size-h3;
+        margin-bottom: $spacer / 4;
+        color: $brand-grey-light;
+    }
+
+    p {
+        margin: 0;
+        color: $brand-grey-light;
+    }
+}
diff --git a/src/images/portfolio-9984.png b/src/images/portfolio-9984-01.png
similarity index 100%
rename from src/images/portfolio-9984.png
rename to src/images/portfolio-9984-01.png
diff --git a/src/images/portfolio-bigchaindb-02.jpg b/src/images/portfolio-bigchaindb-02.jpg
new file mode 100644
index 0000000..627033a
Binary files /dev/null and b/src/images/portfolio-bigchaindb-02.jpg differ
diff --git a/src/images/portfolio-bigchaindb-02.png b/src/images/portfolio-bigchaindb-02.png
deleted file mode 100644
index 25e489f..0000000
Binary files a/src/images/portfolio-bigchaindb-02.png and /dev/null differ
diff --git a/src/images/portfolio-bigchaindb-05.png b/src/images/portfolio-bigchaindb-05.png
index 841a1b5..b8ada98 100644
Binary files a/src/images/portfolio-bigchaindb-05.png and b/src/images/portfolio-bigchaindb-05.png differ
diff --git a/src/images/portfolio-biv.png b/src/images/portfolio-biv-01.png
similarity index 100%
rename from src/images/portfolio-biv.png
rename to src/images/portfolio-biv-01.png
diff --git a/src/images/portfolio-coffeecup.png b/src/images/portfolio-coffeecup-01.png
similarity index 100%
rename from src/images/portfolio-coffeecup.png
rename to src/images/portfolio-coffeecup-01.png
diff --git a/src/images/portfolio-exquisitedroid.png b/src/images/portfolio-exquisitedroid.png
deleted file mode 100644
index ab78b97..0000000
Binary files a/src/images/portfolio-exquisitedroid.png and /dev/null differ
diff --git a/src/images/portfolio-ipixelpad.png b/src/images/portfolio-ipixelpad-01.png
similarity index 100%
rename from src/images/portfolio-ipixelpad.png
rename to src/images/portfolio-ipixelpad-01.png
diff --git a/src/images/portfolio-mrreader.png b/src/images/portfolio-mrreader-01.png
similarity index 100%
rename from src/images/portfolio-mrreader.png
rename to src/images/portfolio-mrreader-01.png
diff --git a/src/images/portfolio-mrreader-02.jpg b/src/images/portfolio-mrreader-02.jpg
new file mode 100644
index 0000000..00ae156
Binary files /dev/null and b/src/images/portfolio-mrreader-02.jpg differ
diff --git a/src/images/portfolio-mrreader-03.png b/src/images/portfolio-mrreader-03.png
new file mode 100644
index 0000000..f25d001
Binary files /dev/null and b/src/images/portfolio-mrreader-03.png differ
diff --git a/src/images/portfolio-outofwhaleoil-01.jpg b/src/images/portfolio-outofwhaleoil-01.jpg
new file mode 100644
index 0000000..a7c91ad
Binary files /dev/null and b/src/images/portfolio-outofwhaleoil-01.jpg differ
diff --git a/src/images/portfolio-outofwhaleoil-01.png b/src/images/portfolio-outofwhaleoil-01.png
deleted file mode 100644
index 2475291..0000000
Binary files a/src/images/portfolio-outofwhaleoil-01.png and /dev/null differ
diff --git a/src/images/portfolio-outofwhaleoil-02.jpg b/src/images/portfolio-outofwhaleoil-02.jpg
new file mode 100644
index 0000000..b627f5d
Binary files /dev/null and b/src/images/portfolio-outofwhaleoil-02.jpg differ
diff --git a/src/images/portfolio-outofwhaleoil-02.png b/src/images/portfolio-outofwhaleoil-02.png
deleted file mode 100644
index 5a2d476..0000000
Binary files a/src/images/portfolio-outofwhaleoil-02.png and /dev/null differ
diff --git a/src/images/portfolio-outofwhaleoil-03.jpg b/src/images/portfolio-outofwhaleoil-03.jpg
new file mode 100644
index 0000000..c1eb1bb
Binary files /dev/null and b/src/images/portfolio-outofwhaleoil-03.jpg differ
diff --git a/src/images/portfolio-outofwhaleoil-03.png b/src/images/portfolio-outofwhaleoil-03.png
deleted file mode 100644
index 03c7d92..0000000
Binary files a/src/images/portfolio-outofwhaleoil-03.png and /dev/null differ
diff --git a/src/images/portfolio-sharethemeal.png b/src/images/portfolio-sharethemeal-01.png
similarity index 100%
rename from src/images/portfolio-sharethemeal.png
rename to src/images/portfolio-sharethemeal-01.png
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 14f8016..635fa69 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -9,7 +9,7 @@ const Home = ({ data }) => {
   const projects = data.allProjectsYaml.edges
 
   return (
-    <FullWidth id="projects" className="projects">
+    <FullWidth className="projects">
       {projects.map(({ node }) => {
         const { slug, title, img } = node