diff --git a/src/components/Tooltip/Tooltip.js b/src/components/Tooltip/Tooltip.js
index aff1c02..241ee44 100644
--- a/src/components/Tooltip/Tooltip.js
+++ b/src/components/Tooltip/Tooltip.js
@@ -4,7 +4,7 @@ import propTypes from "prop-types";
 import styled from "styled-components";
 import { shadow } from "../common";
 
-const Tip = styled.div`
+const Tip = styled.span`
   position: absolute;
   bottom: -4px;
   left: 50%;
diff --git a/website/.firebase/hosting.YnVpbGQ.cache b/website/.firebase/hosting.YnVpbGQ.cache
index d168c27..5aaf832 100644
--- a/website/.firebase/hosting.YnVpbGQ.cache
+++ b/website/.firebase/hosting.YnVpbGQ.cache
@@ -1,45 +1,45 @@
-asset-manifest.json,1555278844750,e55389b957ff6f5cfe131c2259d545b5c32e343eda07e39fe0d8fa074cec3196
-index.html,1555278844747,6788750ddba87fd552c5639bc471a7f4a7083cf768e4418c98db64f0210da366
+asset-manifest.json,1555282071600,3c167a462a995c408a55a50d7c326c648db56aaeb710d6d2cb2c1cddde44ced0
 favicon.ico,1555237639187,578c58c0fc2c41423d193d8db7e728bf5a4de910a7d0988e906f1cd97901aa16
-precache-manifest.b236f3ec1cb54e4a19212934ed2c3e6a.js,1555278844748,bdcbcfd8d4fd9ec4663d08138b712c7b829ce09b63b3e10011e271a3c3d72461
-service-worker.js,1555278844749,4e99c7454bb67c25d8e8e912d57b6be47005f2c7bc46d13436b62854463be45e
+index.html,1555282071600,dcb8cc08528d469d227975db5ab2e9fb8f35510b6fe0ac49be99e9c218bd294a
 manifest.json,1555239358398,e28a007e24c804b708a5ecce199a500bb28edb3cf2e4148320235c6027385f46
-icons/android-icon-36x36.png,1555238012721,318966fb9e87e7b96b47aefcd7130df8df8bad3c9c78f3df72c7dd63656232d3
+precache-manifest.a1109ce153588ccaccbb35921e93967c.js,1555282071600,dcfed4f4d6e6969dc4e6dbf2c50df8ea61595df087abad2c0568b6c3ccfe3648
+service-worker.js,1555282071600,285c410e21de264f3a8ac16ec79a1b86039aa0bc22ecdf94a13e01d62c394f50
 icons/android-icon-144x144.png,1555238012198,4078a4317edfc5948c5f411265c32d007f366843c7c231ce98a6f9e7be4e0c85
 icons/android-icon-192x192.png,1555238012222,6306774dbd793438625496395dc3346d3426c038de3e6d0dd13c74ea2d98da4b
+icons/android-icon-36x36.png,1555238012721,318966fb9e87e7b96b47aefcd7130df8df8bad3c9c78f3df72c7dd63656232d3
 icons/android-icon-48x48.png,1555238012743,83e1899de04bf373a86991899b8780701e36b2a2fd44c9b8e99b83898b91152a
 icons/android-icon-72x72.png,1555238012765,32c3f10bc9c713615c6f9487063aebf0f50628d1fc8a13933a690d07127f03c0
 icons/android-icon-96x96.png,1555238012176,a9b8b8f96703b9980657d8c40555d0a033008b683cba9a9d81675e7d28895d62
 icons/apple-icon-114x114.png,1555238012365,3fdb4668098f302145390a3fdbbc87278b9fd6888e7a8d26efcc9c5303be21d2
 icons/apple-icon-120x120.png,1555238012388,ada9a1a36b041f0e6971f3a6ab1c374847db08e86542e9d0ef2267c84d2f2426
-icons/apple-icon-152x152.png,1555238012433,7b7fa768d87203a03625fbc1cbf41acb357fd502b929427708f4f08b96c489d0
 icons/apple-icon-144x144.png,1555238012410,4078a4317edfc5948c5f411265c32d007f366843c7c231ce98a6f9e7be4e0c85
-icons/apple-icon-180x180.png,1555238012454,5ebdeb97f12aecf42a8fd4bb2f467012bf2b8347dafd28526beea704232ab760
+icons/apple-icon-152x152.png,1555238012433,7b7fa768d87203a03625fbc1cbf41acb357fd502b929427708f4f08b96c489d0
 icons/apple-icon-57x57.png,1555238012276,f572463c66aa33e48655e290c2ad8badf2938cea34f8d9b4fb3dfb15bda87c0a
-icons/apple-icon-72x72.png,1555238012320,32c3f10bc9c713615c6f9487063aebf0f50628d1fc8a13933a690d07127f03c0
+icons/apple-icon-180x180.png,1555238012454,5ebdeb97f12aecf42a8fd4bb2f467012bf2b8347dafd28526beea704232ab760
 icons/apple-icon-60x60.png,1555238012297,5697f5e07795cb53cda76bc44154b98feb72930d7a73a94aa7ff77e30b73bb4a
-icons/browserconfig.xml,1555238012503,cd6445d8fe791d1cae6328c3eee28a97d3e7e1bf501c62d8f2108f5087e7d730
+icons/apple-icon-72x72.png,1555238012320,32c3f10bc9c713615c6f9487063aebf0f50628d1fc8a13933a690d07127f03c0
 icons/apple-icon-76x76.png,1555238012345,999c6dc06be4b721dd6b8601f274057b2b3d4569ce4340d82894752bb2747f0d
-icons/apple-icon-precomposed.png,1555238012478,884b6bf3c1955b5709102453dce4decb056e1dca214807c153b73fbb6404d9c3
+icons/browserconfig.xml,1555238012503,cd6445d8fe791d1cae6328c3eee28a97d3e7e1bf501c62d8f2108f5087e7d730
 icons/favicon-16x16.png,1555238012551,6cf899d3f9ac7c1c625ae5d6a38160e8c12bf4d24f4c08b0ca6fd42e4ce711ca
-icons/apple-icon.png,1555238012250,884b6bf3c1955b5709102453dce4decb056e1dca214807c153b73fbb6404d9c3
-icons/favicon.ico,1555238012529,578c58c0fc2c41423d193d8db7e728bf5a4de910a7d0988e906f1cd97901aa16
-icons/favicon-96x96.png,1555238012597,a9b8b8f96703b9980657d8c40555d0a033008b683cba9a9d81675e7d28895d62
+icons/apple-icon-precomposed.png,1555238012478,884b6bf3c1955b5709102453dce4decb056e1dca214807c153b73fbb6404d9c3
 icons/favicon-32x32.png,1555238012573,d70b9289011606b74353193e5955502c75d55a9c11bad9c651335c2cd23911d3
+icons/favicon.ico,1555238012529,578c58c0fc2c41423d193d8db7e728bf5a4de910a7d0988e906f1cd97901aa16
 icons/manifest.json,1555238012613,46e7f5e409f1e10cb0007bcdd51eb6031ff1bd4a61d07513a4d2b80f6cc5381f
-icons/ms-icon-150x150.png,1555238012678,00ffb1c58552884d487ed9790a86f469c42906a50bfa2e45588878a7d77efc60
+icons/apple-icon.png,1555238012250,884b6bf3c1955b5709102453dce4decb056e1dca214807c153b73fbb6404d9c3
+icons/favicon-96x96.png,1555238012597,a9b8b8f96703b9980657d8c40555d0a033008b683cba9a9d81675e7d28895d62
 icons/ms-icon-144x144.png,1555238012657,4078a4317edfc5948c5f411265c32d007f366843c7c231ce98a6f9e7be4e0c85
+icons/ms-icon-150x150.png,1555238012678,00ffb1c58552884d487ed9790a86f469c42906a50bfa2e45588878a7d77efc60
 icons/ms-icon-70x70.png,1555238012635,7e23746649e4326f473f23e0ea66794c5f9209d766380ac8a3c6bf921b334bfc
-static/js/runtime~main.a8a9905a.js,1555278844766,27518aed75eb917ee7575e8c911b596e850b5265b9e5694a7681cba901419f4d
-static/js/runtime~main.a8a9905a.js.map,1555278844787,d13b46ae2acf0d2863e1c6449a51f64702fa5b464c475c0ec20d6e8de9970ef9
+static/js/runtime~main.a8a9905a.js,1555282071620,27518aed75eb917ee7575e8c911b596e850b5265b9e5694a7681cba901419f4d
+static/js/runtime~main.a8a9905a.js.map,1555282071620,d13b46ae2acf0d2863e1c6449a51f64702fa5b464c475c0ec20d6e8de9970ef9
 icons/ms-icon-310x310.png,1555238012699,c89cfc60ea8c556129741ae8b21c41779aea92c7f442b72435d90798ce58a3a6
-static/js/main.c70e103e.chunk.js,1555278844786,23eb20a629af9b307be5eba43f7ed1a55fa09cc989a95d2c204802f4dc8ac960
-static/media/hourglass.7a7a26ab.gif,1555278844785,ea6c34002b85113db18c7da9da550ec21d45eabc5b4a39ea7d5247e00354c901
-static/media/clouds.91f8d202.jpg,1555278844790,4542fd48f703e66b011549ea475de84a85286569730321eccfa446c55cbe57f7
-static/js/main.c70e103e.chunk.js.map,1555278844787,a75f63faf875301d64a50ef0648e131588c56a6802f87eaa62f4fb8a9d51f9b9
-static/js/2.657cbafe.chunk.js,1555278844786,c12239b0816a3d3288e7198c2bfdba0b393a175034454b72f40811a0a43bd16a
-static/media/plastic.1edc8f20.jpg,1555278844789,d4d4ebf948c44d13ff7c528bfcbc73ea84a05a86763284bd7338b29571801bfc
+static/js/main.b5eaae2c.chunk.js,1555282071619,214e0fd12249befefe76439c7b2da5f1b0b39c0cc05e859057e2ee0e943cfdd0
+static/media/hourglass.7a7a26ab.gif,1555282071620,ea6c34002b85113db18c7da9da550ec21d45eabc5b4a39ea7d5247e00354c901
+static/media/clouds.91f8d202.jpg,1555282071620,4542fd48f703e66b011549ea475de84a85286569730321eccfa446c55cbe57f7
+static/js/main.b5eaae2c.chunk.js.map,1555282071620,e84cfebb337d4aea41aa0b998b9d791639f25d7fd99275ce4f5ee9df77560ebe
+static/js/2.657cbafe.chunk.js,1555282071620,c12239b0816a3d3288e7198c2bfdba0b393a175034454b72f40811a0a43bd16a
+static/media/plastic.1edc8f20.jpg,1555282071620,d4d4ebf948c44d13ff7c528bfcbc73ea84a05a86763284bd7338b29571801bfc
 ogImage.png,1555241914970,8d9d61b7c0bb45b94cf2cd1f4e4b305a312f2181680e7f7273c8f78d6a50a262
-static/media/heroCD2.185ab30f.png,1555278844759,3d9f5097d19ec63cb662a414eb1285c2d40d64334547d1d30344b1cdf05f853c
-static/media/celebration2.70183189.gif,1555278844773,263bbebf3449b88c87c0c0af9c340edca38286e86ebded5755fad471ca8c17ed
-static/js/2.657cbafe.chunk.js.map,1555278844788,7a7cefbae8587852b866d3788cddd7aa85f8a7daa697fe201cc2ef89dabe8bc1
+static/media/heroCD2.185ab30f.png,1555282071619,3d9f5097d19ec63cb662a414eb1285c2d40d64334547d1d30344b1cdf05f853c
+static/media/celebration2.a9fe229f.gif,1555282071620,c39db092fd6d5130727635307cfc11a47aee5b23a3d17dec817489a824c2808a
+static/js/2.657cbafe.chunk.js.map,1555282071621,7a7cefbae8587852b866d3788cddd7aa85f8a7daa697fe201cc2ef89dabe8bc1
diff --git a/website/public/icons/android-icon-512x512.png b/website/public/icons/android-icon-512x512.png
new file mode 100644
index 0000000..07762f2
Binary files /dev/null and b/website/public/icons/android-icon-512x512.png differ
diff --git a/website/public/manifest.json b/website/public/manifest.json
index 134b120..a64b149 100644
--- a/website/public/manifest.json
+++ b/website/public/manifest.json
@@ -38,6 +38,12 @@
       "sizes": "192x192",
       "type": "image/png",
       "density": "4.0"
+    },
+    {
+      "src": "icons/android-icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "density": "4.0"
     }
   ],
   "start_url": ".",
diff --git a/website/src/App.js b/website/src/App.js
index 5488e3a..4d1ed22 100644
--- a/website/src/App.js
+++ b/website/src/App.js
@@ -39,7 +39,7 @@ class App extends Component {
           <Main>
             <ReactFullpage
               licenseKey="C6FC49F4-8D154646-97D49C8C-8B9E9DD8"
-              anchors={["", "wait", "secondPage", "thirdPage"]}
+              anchors={["", "finally", "launched"]}
               verticalCentered={false}
               render={({ state, fullpageApi }) => {
                 return (
diff --git a/website/src/assets/images/celebration2.gif b/website/src/assets/images/celebration2.gif
index 72adf2f..c483257 100644
Binary files a/website/src/assets/images/celebration2.gif and b/website/src/assets/images/celebration2.gif differ
diff --git a/website/src/assets/images/optimized/celebration.webp b/website/src/assets/images/optimized/celebration.webp
new file mode 100644
index 0000000..481261d
Binary files /dev/null and b/website/src/assets/images/optimized/celebration.webp differ
diff --git a/website/src/assets/images/optimized/celebration2.gif b/website/src/assets/images/optimized/celebration2.gif
deleted file mode 100644
index 595f616..0000000
Binary files a/website/src/assets/images/optimized/celebration2.gif and /dev/null differ
diff --git a/website/src/assets/images/optimized/clouds.jpg b/website/src/assets/images/optimized/clouds.jpg
deleted file mode 100644
index c1216c3..0000000
Binary files a/website/src/assets/images/optimized/clouds.jpg and /dev/null differ
diff --git a/website/src/assets/images/optimized/clouds.webp b/website/src/assets/images/optimized/clouds.webp
new file mode 100644
index 0000000..ec75c47
Binary files /dev/null and b/website/src/assets/images/optimized/clouds.webp differ
diff --git a/website/src/assets/images/optimized/heroCD2.png b/website/src/assets/images/optimized/heroCD2.png
deleted file mode 100644
index 412e613..0000000
Binary files a/website/src/assets/images/optimized/heroCD2.png and /dev/null differ
diff --git a/website/src/assets/images/optimized/heroCD2.webp b/website/src/assets/images/optimized/heroCD2.webp
new file mode 100644
index 0000000..efefebf
Binary files /dev/null and b/website/src/assets/images/optimized/heroCD2.webp differ
diff --git a/website/src/assets/images/optimized/hourglass.webp b/website/src/assets/images/optimized/hourglass.webp
new file mode 100644
index 0000000..1e4aa86
Binary files /dev/null and b/website/src/assets/images/optimized/hourglass.webp differ
diff --git a/website/src/assets/images/optimized/plastic.webp b/website/src/assets/images/optimized/plastic.webp
new file mode 100644
index 0000000..a7a0487
Binary files /dev/null and b/website/src/assets/images/optimized/plastic.webp differ
diff --git a/website/src/components/Code.js b/website/src/components/Code.js
index f3a7eeb..fc9b417 100644
--- a/website/src/components/Code.js
+++ b/website/src/components/Code.js
@@ -1,6 +1,9 @@
 import styled from "styled-components";
 
-export default styled.code`
+export default styled.p`
+  display: inline-block;
+  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
+    monospace;
   font-size: 1.4em;
   white-space: nowrap;
 `;
diff --git a/website/src/index.css b/website/src/index.css
deleted file mode 100644
index 82ce24e..0000000
--- a/website/src/index.css
+++ /dev/null
@@ -1,13 +0,0 @@
-html,
-body {
-  margin: 0;
-  height: 100%;
-}
-body {
-  padding: 0;
-  margin: 0;
-}
-
-#root {
-  height: 100%;
-}
diff --git a/website/src/index.js b/website/src/index.js
index c1684e8..db7162a 100644
--- a/website/src/index.js
+++ b/website/src/index.js
@@ -8,4 +8,4 @@ ReactDOM.render(<App />, document.getElementById("root"));
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.
 // Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();
+serviceWorker.register();
diff --git a/website/src/views/Finally.js b/website/src/views/Finally.js
index b9f2adf..3d0bef1 100644
--- a/website/src/views/Finally.js
+++ b/website/src/views/Finally.js
@@ -1,8 +1,8 @@
 import React from "react";
 import styled from "styled-components";
 
-import Celebration from "../assets/images/optimized/celebration2.gif";
-import Hourglass from "../assets/images/optimized/hourglass.gif";
+import Celebration from "../assets/images/optimized/celebration.webp";
+import Hourglass from "../assets/images/optimized/hourglass.webp";
 import LogoIcon from "../assets/images/optimized/logo.png";
 
 import { Button } from "../lib";
@@ -78,7 +78,7 @@ export default function Finally(props) {
     <Wrapper>
       <StyledCenter>
         <StyledCode>
-          The <HourglassIcon src={Hourglass} /> is over.
+          The <HourglassIcon src={Hourglass} alt="Hourglass" /> is over.
           <br />
         </StyledCode>
         <CelebrationImage
diff --git a/website/src/views/Hero.js b/website/src/views/Hero.js
index b3a099c..a010f68 100644
--- a/website/src/views/Hero.js
+++ b/website/src/views/Hero.js
@@ -1,10 +1,10 @@
 import React from "react";
 import styled from "styled-components";
 
-import HeroCD from "../assets/images/heroCD2.png";
-import Plastic from "../assets/images/plastic.jpg";
-import Clouds from "../assets/images/clouds.jpg";
-import Grow from "../assets/images/growEmoji.png";
+import HeroCD from "../assets/images/optimized/heroCD2.webp";
+import Plastic from "../assets/images/optimized/plastic.webp";
+import Clouds from "../assets/images/optimized/clouds.webp";
+import Grow from "../assets/images/optimized/growEmoji.png";
 
 import Code from "../components/Code";
 
@@ -102,7 +102,7 @@ export default function Hero() {
     <Wrapper>
       <Centered>
         <BoxWrapper>
-          <HeroImage src={HeroCD} />
+          <HeroImage src={HeroCD} alt="Scratched CD with React95 logo" />
         </BoxWrapper>
         <Links>
           <Code>
@@ -115,7 +115,7 @@ export default function Hero() {
             .
           </Code>
           <br />
-          <Code>
+          <Code as="p">
             Then, see{" "}
             <Anchor href="https://arturbien.github.io/React95/">
               storybook