diff --git a/package-lock.json b/package-lock.json
index 36d93e41..da2800ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "@example/starter",
-  "version": "0.0.1",
+  "name": "accessible-astro-starter",
+  "version": "1.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 036e625f..7e309c64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "accessible-astro-starter",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "scripts": {
     "start": "astro dev",
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 7ce2d5f7..275c4872 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -1,4 +1,4 @@
-<footer role="contentinfo">
+<footer>
   <section class="space-16 color-neutral">
     <div class="container">
       <p>&copy; Footer Copyright</p>
diff --git a/src/components/Header.astro b/src/components/Header.astro
index 502c0eb2..732d9cc8 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -2,7 +2,7 @@
 import Navigation from '../components/Navigation.astro'
 import SkipLinks from '../components/SkipLinks.astro'
 ---
-<header role="banner">
+<header>
   <SkipLinks client:load />
   <section class="space-16 color-neutral">
     <div class="container">
diff --git a/src/components/SkipLinks.astro b/src/components/SkipLinks.astro
index cd2f7817..b6aa8c84 100644
--- a/src/components/SkipLinks.astro
+++ b/src/components/SkipLinks.astro
@@ -2,7 +2,9 @@
 	<div class="container">
     <nav class="skip-links" role="navigation" aria-label="Skiplinks">
       <ul>
-        <li><a href="#main-navigation" data-skip-link>Skip to main menu</a></li>
+
+        <!-- NOTE: add this when you have content or hyperlinks to skip before you main menu!
+        <li><a href="#main-navigation" data-skip-link>Skip to main menu</a></li> -->
         <li><a href="#main-content" data-skip-link>Skip to main content</a></li>
       </ul>
     </nav>
@@ -26,11 +28,12 @@
         event.preventDefault()
         const target = event.target.getAttribute('href')
 
+        // NOTE: add this when you have content or hyperlinks to skip before you main menu!
         // set focus to first menu item for skip link to main navigation
-        if (target === '#main-navigation') {
-          const navigation = document.querySelector('#main-navigation')
-          navigation.querySelector('a').focus()
-        }
+        // if (target === '#main-navigation') {
+        //   const navigation = document.querySelector('#main-navigation')
+        //   navigation.querySelector('a').focus()
+        // }
 
         // set focus to first h1 for skip link to main content
         if (target === '#main-content') {
diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro
index da6de5fa..894e086e 100644
--- a/src/layouts/DefaultLayout.astro
+++ b/src/layouts/DefaultLayout.astro
@@ -38,7 +38,7 @@ let subtitle = 'Accessible Astro Starter'
     <Header />
 
     <!-- main -->
-    <main id="main-content" role="main">
+    <main id="main-content">
 
       <slot />
 
diff --git a/src/pages/index.astro b/src/pages/index.astro
index be39804f..6ef7d698 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -14,9 +14,18 @@ import DarkMode from '../components/DarkMode.astro'
       <h2 class="space-16 bottom">Grid example</h2>
     </div>
     <div class="container" data-auto-grid="3">
-      <p><strong>Column 1 | Cell 1</strong> - Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem accusantium placeat eius officiis veniam totam. Earum eos et voluptate dolorem. <strong><a href="#">Tab to me!</a></strong></p>
-      <p><strong>Column 2 | Cell 2</strong> - Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem accusantium placeat eius officiis veniam totam. Earum eos et voluptate dolorem.</p>
-      <p><strong>Column 3 | Cell 3</strong> - Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem accusantium placeat eius officiis veniam totam. Earum eos et voluptate dolorem.</p>
+      <div class="box">
+        <h3>Column 1</h3>
+        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem accusantium placeat eius officiis veniam totam. Earum eos et voluptate dolorem. <strong><a href="#">Tab to me!</a></strong></p>
+      </div>
+      <div class="box">
+        <h3>Column 2</h3>
+        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem accusantium placeat eius officiis veniam totam. Earum eos et voluptate dolorem.</p>
+      </div>
+      <div class="box">
+        <h3>Column 3</h3>
+        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem accusantium placeat eius officiis veniam totam. Earum eos et voluptate dolorem.</p>
+      </div>
     </div>
   </section>
   <section class="space-32">