diff --git a/example/src/MyComponent.jsx b/example/src/MyComponent.jsx
index 3bfab4ddcd..2b91c20d77 100644
--- a/example/src/MyComponent.jsx
+++ b/example/src/MyComponent.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Button, Form, Icon, Bubble } from '@edx/paragon'; // eslint-disable-line
+import { Button, Form, Icon, Bubble, Skeleton } from '@edx/paragon'; // eslint-disable-line
 import { FavoriteBorder } from '@edx/paragon/icons'; // eslint-disable-line
 
 const MyComponent = () => {
@@ -27,6 +27,7 @@ const MyComponent = () => {
         </Form.Group>
         <Button onClick={handleClick}>Submit</Button>
       </Form>
+      <Skeleton />
     </div>
   );
 };
diff --git a/package-lock.json b/package-lock.json
index 36474224c2..244d01ad0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39254,6 +39254,7 @@
         "rehype-slug": "^4.0.1",
         "sass": "^1.53.0",
         "sass-loader": "12.6.0",
+        "slugify": "^1.6.5",
         "uuid": "^9.0.0"
       },
       "devDependencies": {
diff --git a/www/.env.development b/www/.env.development
index d036c5d85b..68b75c7e78 100644
--- a/www/.env.development
+++ b/www/.env.development
@@ -1,2 +1,2 @@
 SEGMENT_KEY=''
-FEATURE_ENABLE_AXE='true'
+FEATURE_ENABLE_AXE=''
diff --git a/www/package.json b/www/package.json
index 6648636c99..dcc24ca2da 100644
--- a/www/package.json
+++ b/www/package.json
@@ -38,7 +38,8 @@
     "rehype-slug": "^4.0.1",
     "sass": "^1.53.0",
     "sass-loader": "12.6.0",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.0",
+    "slugify": "^1.6.5"
   },
   "keywords": [
     "paragon",
diff --git a/www/src/components/AutoToc.tsx b/www/src/components/AutoToc.tsx
new file mode 100644
index 0000000000..cb95c3919e
--- /dev/null
+++ b/www/src/components/AutoToc.tsx
@@ -0,0 +1,132 @@
+import React, { useEffect, useRef, useState } from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { Sticky } from '~paragon-react';
+import slugify from 'slugify';
+
+interface IItems {
+  url?: string,
+  title?: string,
+  items?: Array<IItems>,
+}
+
+export interface IAutoToc {
+  className?: string,
+  tab?: string,
+  addAnchors?: boolean,
+}
+
+function createAnchor(slug: string): HTMLAnchorElement {
+  const anchor = document.createElement('a');
+  anchor.ariaHidden = 'true';
+  anchor.tabIndex = -1;
+  anchor.href = `#${slug}`;
+  const span = document.createElement('span');
+  span.className = 'pgn-doc__anchor';
+  span.innerText = '#';
+  anchor.appendChild(span);
+  return anchor;
+}
+
+function getNestedHeadingsData(headingsArray: NodeListOf<HTMLHeadElement>): IItems {
+  const result: IItems = { items: [] };
+  let parentHeadingLevel = 2;
+  headingsArray.forEach(heading => {
+    const headingLevel = parseInt(heading.tagName.slice(-1), 10);
+    const headingData = {
+      url: `#${heading.id}`,
+      title: heading.firstChild!.textContent!,
+      items: [],
+    };
+    if (!result.items!.length || headingLevel <= parentHeadingLevel) {
+      parentHeadingLevel = headingLevel;
+      result.items!.push(headingData);
+    } else {
+      const headingDepth = headingLevel - parentHeadingLevel;
+      let target = result.items![result.items!.length - 1];
+      for (let i = 1; i < headingDepth; i++) {
+        if (target?.items!.length) {
+          target = target.items[target.items.length - 1];
+        }
+      }
+      target.items!.push(headingData);
+    }
+  });
+  return result;
+}
+
+function AutoToc({ className, tab = '', addAnchors = true }: IAutoToc) {
+  const [active, setActive] = useState('');
+  const [headingsData, setHeadingsData] = useState<IItems>({ items: [] });
+  const observer = useRef<IntersectionObserver>();
+
+  useEffect(() => {
+    const handleObserver = (entries: IntersectionObserverEntry[]) => {
+      if (entries[0].intersectionRatio >= 0.5) {
+        setActive(entries[0].target.id);
+      }
+    };
+
+    observer.current = new IntersectionObserver(handleObserver, { rootMargin: '-50px 0px -80% 0px', threshold: 0.5 });
+    const elements = document.querySelectorAll<HTMLHeadElement>('main h2, main h3, main h4, main h5, main h6');
+    if (addAnchors) {
+      elements.forEach(el => {
+        if (el.textContent) {
+          el.classList.add('pgn-doc__heading');
+          const slug = slugify(el.textContent, { lower: true });
+          el.id = slug;
+          const anchor = createAnchor(slug);
+          el.appendChild(anchor);
+        }
+      });
+    }
+    const headings = getNestedHeadingsData(elements);
+    setHeadingsData(headings);
+    elements.forEach((elem) => observer.current?.observe(elem));
+
+    return () => observer.current?.disconnect();
+  }, [tab, addAnchors]);
+
+  const generateTree = (headings: { items?: Array<IItems> }) => (headings?.items?.length
+    ? (
+      <ul className="pgn-doc__toc-list">
+        {headings.items.map(heading => (
+          <li key={heading.url}>
+            <a
+              href={heading.url}
+              className={classNames({ active: `#${active}` === heading.url })}
+            >
+              {heading.title}
+            </a>
+            {!!heading.items && generateTree(heading)}
+          </li>
+        ))}
+      </ul>
+    ) : null);
+
+  const tocTree = generateTree(headingsData);
+
+  return (
+    <Sticky
+      offset={6}
+      className={classNames('pgn-doc__toc', className)}
+    >
+      <p className="pgn-doc__toc-header">Contents</p>
+      {tocTree}
+    </Sticky>
+  );
+}
+
+AutoToc.propTypes = {
+  className: PropTypes.string,
+  tab: PropTypes.string,
+  addAnchors: PropTypes.bool,
+};
+
+AutoToc.defaultProps = {
+  className: undefined,
+  tab: undefined,
+  addAnchors: undefined,
+};
+
+export default AutoToc;
diff --git a/www/src/components/IconsTable.scss b/www/src/components/IconsTable.scss
index f5fe6064ba..498e08121c 100644
--- a/www/src/components/IconsTable.scss
+++ b/www/src/components/IconsTable.scss
@@ -54,7 +54,7 @@
   flex-direction: column;
   align-items: center;
 
-  h3 {
+  p {
     margin-bottom: 0;
     padding: 0 .25rem;
   }
diff --git a/www/src/components/IconsTable.tsx b/www/src/components/IconsTable.tsx
index 3d53f83350..a3f6a2a8c7 100644
--- a/www/src/components/IconsTable.tsx
+++ b/www/src/components/IconsTable.tsx
@@ -133,7 +133,7 @@ function IconsTable({ iconNames }) {
             className="pgn-doc__icons-table__preview-title"
             onClick={() => copyToClipboard(currentIcon)}
           >
-            <h3 className="rounded">{currentIcon}</h3>
+            <p className="rounded h3">{currentIcon}</p>
             <Icon
               key="ContentCopy"
               src={IconComponents.ContentCopy}
diff --git a/www/src/components/PageLayout.tsx b/www/src/components/PageLayout.tsx
index 3b5cf02ffe..06ec4d65df 100644
--- a/www/src/components/PageLayout.tsx
+++ b/www/src/components/PageLayout.tsx
@@ -25,6 +25,7 @@ import Settings from './Settings';
 import Toc from './Toc';
 import { SettingsContext } from '../context/SettingsContext';
 import LeaveFeedback from './LeaveFeedback';
+import AutoToc from './AutoToc';
 
 if (process.env.NODE_ENV === 'development') {
   /* eslint-disable-next-line global-require */
@@ -37,6 +38,8 @@ export interface ILayout {
   hideFooterComponentMenu: boolean,
   isMdx: boolean,
   tocData: Array<number>,
+  tab?: string,
+  isAutoToc?: boolean,
 }
 
 function Layout({
@@ -45,6 +48,8 @@ function Layout({
   hideFooterComponentMenu,
   isMdx,
   tocData,
+  isAutoToc,
+  tab,
 }: ILayout) {
   const isMobile = useMediaQuery({ maxWidth: breakpoints.extraLarge.minWidth });
   const { settings } = useContext(SettingsContext);
@@ -89,8 +94,9 @@ function Layout({
             <Col
               xl={2}
               lg={3}
-              as={Toc}
+              as={isAutoToc ? AutoToc : Toc}
               data={tocData}
+              tab={tab}
               className="d-none d-lg-block"
             />
           </Row>
@@ -169,6 +175,7 @@ Layout.propTypes = {
   showMinimizedTitle: PropTypes.bool,
   hideFooterComponentMenu: PropTypes.bool,
   isMdx: PropTypes.bool,
+  tab: PropTypes.string,
 };
 
 Layout.defaultProps = {
@@ -176,6 +183,8 @@ Layout.defaultProps = {
   showMinimizedTitle: false,
   hideFooterComponentMenu: false,
   isMdx: false,
+  tab: undefined,
+  isAutoToc: false,
 };
 
 export default Layout;
diff --git a/www/src/pages/foundations/colors.tsx b/www/src/pages/foundations/colors.tsx
index dcb15659a8..dac5493007 100644
--- a/www/src/pages/foundations/colors.tsx
+++ b/www/src/pages/foundations/colors.tsx
@@ -1,12 +1,13 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { graphql } from 'gatsby';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { Container } from '~paragon-react';
 import Color from 'color';
+import { Container } from '~paragon-react';
 import SEO from '../../components/SEO';
 import MeasuredItem from '../../components/MeasuredItem';
 import Layout from '../../components/PageLayout';
+import { SettingsContext } from '../../context/SettingsContext';
 
 const utilityClasses = {
   bg: (color: string, level: number) => (level ? `bg-${color}-${level}` : `bg-${color}`),
@@ -102,7 +103,7 @@ const renderColorRamp = (themeName: string, unusedLevels: number[]) => (
     key={`${themeName}`}
     style={{ flexBasis: '24%', marginRight: '1%', marginBottom: '2rem' }}
   >
-    <h2 className="h5">{themeName}</h2>
+    <p className="h5">{themeName}</p>
     {levels.map(level => (
       <Swatch
         key={`$${themeName}-${level}`}
@@ -124,13 +125,14 @@ export interface IColorsPage {
 
 // eslint-disable-next-line react/prop-types
 export default function ColorsPage({ data }: IColorsPage) {
+  const { settings } = useContext(SettingsContext);
   parseColors(data.allCssUtilityClasses.nodes); // eslint-disable-line react/prop-types
 
   return (
-    <Layout>
-      <Container size="md" className="py-5">
-        {/* eslint-disable-next-line react/jsx-pascal-case */}
-        <SEO title="Colors" />
+    <Layout isAutoToc>
+      {/* eslint-disable-next-line react/jsx-pascal-case */}
+      <SEO title="Colors" />
+      <Container size={settings.containerWidth} className="py-5">
         <h1>Colors</h1>
         <div className="d-flex flex-wrap">
           {colors
@@ -143,7 +145,7 @@ export default function ColorsPage({ data }: IColorsPage) {
               marginBottom: '2rem',
             }}
           >
-            <h2 className="h5">accents</h2>
+            <p className="h5">accents</p>
 
             <Swatch name="$accent-a" colorClassName="bg-accent-a" />
             <Swatch name="$accent-b" colorClassName="bg-accent-b" />
@@ -351,9 +353,9 @@ export default function ColorsPage({ data }: IColorsPage) {
           backgrounds.
         </p>
         <div className="d-flex rounded overflow-hidden mb-3">
-          <h4 className="mb-0 w-100">Lighter Text</h4>
-          <h4 className="mb-0 w-100">Regular Text</h4>
-          <h4 className="mb-0 w-100">Darker Text</h4>
+          <p className="mb-0 w-100 h4">Lighter Text</p>
+          <p className="mb-0 w-100 h4">Regular Text</p>
+          <p className="mb-0 w-100 h4">Darker Text</p>
         </div>
         <div className="d-flex">
           {[500, 700, 900].map(level => (
@@ -381,13 +383,13 @@ export default function ColorsPage({ data }: IColorsPage) {
         <div>
           <div className="d-flex rounded overflow-hidden mb-3">
             <div className="w-100">
-              <h4 className="mb-0">Default State</h4>
+              <p className="mb-0 h4">Default State</p>
             </div>
             <div className="w-100">
-              <h4 className="mb-0">Hover State</h4>
+              <p className="mb-0 h4">Hover State</p>
             </div>
             <div className="w-100">
-              <h4 className="mb-0">Active State</h4>
+              <p className="mb-0 h4">Active State</p>
             </div>
           </div>
           {colors.map(({ themeName }) => {
diff --git a/www/src/pages/foundations/elevation.jsx b/www/src/pages/foundations/elevation.jsx
index e61aafcc3d..52dac1b816 100644
--- a/www/src/pages/foundations/elevation.jsx
+++ b/www/src/pages/foundations/elevation.jsx
@@ -1,9 +1,9 @@
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import PropTypes from 'prop-types';
 import {
+  Container,
   Button,
   Form,
-  Container,
   Input,
   Toast,
   Icon,
@@ -12,6 +12,7 @@ import {
 import { Close, WbSunny, DoDisturb } from '~paragon-icons';
 import SEO from '../../components/SEO';
 import Layout from '../../components/PageLayout';
+import { SettingsContext } from '../../context/SettingsContext';
 
 const boxShadowSides = ['down', 'up', 'right', 'left', 'centered'];
 const boxShadowLevels = [1, 2, 3, 4, 5];
@@ -268,23 +269,25 @@ function BoxShadowGenerator() {
 }
 
 export default function ElevationPage() {
+  const { settings } = useContext(SettingsContext);
+
   const levelTitle = boxShadowLevels.map(level => (
-    <h3 key={level} className="pgn-doc__box-shadow-level-title">
+    <p key={level} className="pgn-doc__box-shadow-level-title h3">
       Level {level}
-    </h3>
+    </p>
   ));
 
   const sideTitle = boxShadowSides.map(side => (
-    <h3 key={side} className="pgn-doc__box-shadow-side-title">
+    <p key={side} className="pgn-doc__box-shadow-side-title h3">
       {side.charAt(0).toUpperCase() + side.substring(1)}
-    </h3>
+    </p>
   ));
 
   return (
-    <Layout>
-      <Container className="py-5" size="md">
-        {/* eslint-disable-next-line react/jsx-pascal-case */}
-        <SEO title="Elevation" />
+    <Layout isAutoToc>
+      {/* eslint-disable-next-line react/jsx-pascal-case */}
+      <SEO title="Elevation" />
+      <Container size={settings.containerWidth} className="py-5">
         <h1 className="mb-3">Elevation & Shadow</h1>
         <p className="mb-5">
           You can quickly add a <code>box-shadow</code> with the Clickable Box-Shadow Grid.
diff --git a/www/src/pages/foundations/responsive.jsx b/www/src/pages/foundations/responsive.jsx
index 44ff50b7d1..4e97c975cc 100644
--- a/www/src/pages/foundations/responsive.jsx
+++ b/www/src/pages/foundations/responsive.jsx
@@ -1,12 +1,13 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import {
-  DataTable, Container, breakpoints, OverlayTrigger, Tooltip, Icon,
+  DataTable, breakpoints, OverlayTrigger, Tooltip, Icon, Container,
 } from '~paragon-react';
 import { QuestionMark } from '~paragon-icons';
 import SEO from '../../components/SEO';
 import Layout from '../../components/PageLayout';
 import CodeBlock from '../../components/CodeBlock';
+import { SettingsContext } from '../../context/SettingsContext';
 
 const BREAKPOINT_DESCRIPTIONS = {
   extraSmall: { name: 'Extra small', identifier: 'xs' },
@@ -49,6 +50,7 @@ function MaxWidthCell({ row }) {
 }
 
 function Responsive() {
+  const { settings } = useContext(SettingsContext);
   const breakpointsData = Object.keys(breakpoints).map(breakpoint => {
     const { minWidth, maxWidth } = breakpoints[breakpoint];
     const breakpointData = getBreakpointDescription(breakpoint);
@@ -58,10 +60,10 @@ function Responsive() {
   });
 
   return (
-    <Layout>
-      <Container size="md" className="py-5">
-        {/* eslint-disable-next-line react/jsx-pascal-case */}
-        <SEO title="Responsive" />
+    <Layout isAutoToc>
+      {/* eslint-disable-next-line react/jsx-pascal-case */}
+      <SEO title="Responsive" />
+      <Container size={settings.containerWidth} className="py-5">
         <h1>Responsive</h1>
         <h2>Available breakpoints</h2>
         <p>
diff --git a/www/src/pages/foundations/spacing.tsx b/www/src/pages/foundations/spacing.tsx
index 8b0d4ce4b0..be2a639df1 100644
--- a/www/src/pages/foundations/spacing.tsx
+++ b/www/src/pages/foundations/spacing.tsx
@@ -1,10 +1,11 @@
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { Form, Container, DataTable } from '~paragon-react';
+import { Form, DataTable, Container } from '~paragon-react';
 import SEO from '../../components/SEO';
 import Layout from '../../components/PageLayout';
 import MeasuredItem from '../../components/MeasuredItem';
+import { SettingsContext } from '../../context/SettingsContext';
 
 const directions = [
   { key: '', name: 'all' },
@@ -83,6 +84,7 @@ SpaceBlock.defaultProps = {
 };
 
 export default function SpacingPage() {
+  const { settings } = useContext(SettingsContext);
   const [size, setSize] = useState<number>(3);
   const [direction, setDirection] = useState<string>('r');
 
@@ -94,10 +96,10 @@ export default function SpacingPage() {
   }));
 
   return (
-    <Layout>
-      <Container size="md" className="py-5">
-        {/* eslint-disable-next-line react/jsx-pascal-case */}
-        <SEO title="Spacing" />
+    <Layout isAutoToc>
+      {/* eslint-disable-next-line react/jsx-pascal-case */}
+      <SEO title="Spacing" />
+      <Container size={settings.containerWidth} className="py-5">
         <h1>Spacing</h1>
         <h2>Spacing according to pixels</h2>
         <DataTable
@@ -120,7 +122,7 @@ export default function SpacingPage() {
         </p>
         <div className="border p-4">
           <div className="d-flex flex-column align-items-center">
-            <h4>Direction</h4>
+            <p className="h4">Direction</p>
             <div className="d-flex flex-wrap mt-2">
               {directions.map(({ key, name }) => (
                 <Form.Radio
diff --git a/www/src/pages/foundations/typography.tsx b/www/src/pages/foundations/typography.tsx
index 1d08536202..816260798f 100644
--- a/www/src/pages/foundations/typography.tsx
+++ b/www/src/pages/foundations/typography.tsx
@@ -1,9 +1,10 @@
 /* eslint-disable jsx-a11y/anchor-is-valid */
-import React from 'react';
+import React, { useContext } from 'react';
 import { Container } from '~paragon-react';
 import SEO from '../../components/SEO';
 import MeasuredItem from '../../components/MeasuredItem';
 import Layout from '../../components/PageLayout';
+import { SettingsContext } from '../../context/SettingsContext';
 
 export type WeightLabelsTypes = {
   [key: string]: string,
@@ -42,11 +43,13 @@ const measuredTypeProps = {
 };
 
 export default function TypographyPage() {
+  const { settings } = useContext(SettingsContext);
+
   return (
-    <Layout>
-      <Container size="xl" className="py-5">
-        {/* eslint-disable-next-line react/jsx-pascal-case */}
-        <SEO title="Typography" />
+    <Layout isAutoToc>
+      {/* eslint-disable-next-line react/jsx-pascal-case */}
+      <SEO title="Typography" />
+      <Container size={settings.containerWidth} className="py-5">
         <h1>Typography</h1>
         <table className="w-100 table pgn-doc__status-table">
           <tbody>
diff --git a/www/src/pages/insights.tsx b/www/src/pages/insights.tsx
index 3799aa28a0..44128bd1b6 100644
--- a/www/src/pages/insights.tsx
+++ b/www/src/pages/insights.tsx
@@ -2,9 +2,9 @@ import React, { useContext } from 'react';
 import { navigate } from 'gatsby';
 import PropTypes from 'prop-types';
 import {
+  Container,
   Tabs,
   Tab,
-  Container,
 } from '~paragon-react';
 import SEO from '../components/SEO';
 import Layout from '../components/PageLayout';
@@ -21,6 +21,7 @@ import dependentProjectsAnalysis from '../../../dependent-usage.json'; // eslint
 import { INSIGHTS_TABS, INSIGHTS_PAGES } from '../config';
 import componentsUsage from '../utils/componentsUsage';
 import { IInsightsContext } from '../types/types';
+import { SettingsContext } from '../context/SettingsContext';
 
 const {
   lastModified: analysisLastUpdated,
@@ -34,6 +35,7 @@ interface TabsDataType {
 }
 
 export default function InsightsPage({ pageContext: { tab } }: { pageContext: { tab: string } }) {
+  const { settings } = useContext(SettingsContext);
   const { paragonTypes = {}, isParagonIcon = () => false } = useContext(InsightsContext) as IInsightsContext;
   const {
     components, hooks, utils, icons,
@@ -59,10 +61,10 @@ export default function InsightsPage({ pageContext: { tab } }: { pageContext: {
     }
   };
   return (
-    <Layout>
-      <Container size="md" className="py-5">
-        {/* eslint-disable-next-line react/jsx-pascal-case */}
-        <SEO title="Usage Insights" />
+    <Layout isAutoToc tab={tab}>
+      {/* eslint-disable-next-line react/jsx-pascal-case */}
+      <SEO title="Usage Insights" />
+      <Container size={settings.containerWidth} className="py-5">
         <header className="mb-5">
           <h1>Usage Insights</h1>
           <p>Last updated: {new Date(analysisLastUpdated).toLocaleDateString()}</p>
@@ -74,32 +76,32 @@ export default function InsightsPage({ pageContext: { tab } }: { pageContext: {
         >
           <Tab eventKey={INSIGHTS_TABS.SUMMARY} title="Summary">
             {tab === INSIGHTS_TABS.SUMMARY && (
-              <SummaryUsage />
+            <SummaryUsage />
             )}
           </Tab>
           <Tab eventKey={INSIGHTS_TABS.PROJECTS} title="Projects">
             {tab === INSIGHTS_TABS.PROJECTS && (
-              <ProjectsUsage />
+            <ProjectsUsage />
             )}
           </Tab>
           <Tab eventKey={INSIGHTS_TABS.COMPONENTS} title="Components">
             {tab === INSIGHTS_TABS.COMPONENTS && (
-              <ComponentsUsage data={components} />
+            <ComponentsUsage data={components} />
             )}
           </Tab>
           <Tab eventKey={INSIGHTS_TABS.HOOKS} title="Hooks">
             {tab === INSIGHTS_TABS.HOOKS && (
-              <HooksUsage data={hooks} />
+            <HooksUsage data={hooks} />
             )}
           </Tab>
           <Tab eventKey={INSIGHTS_TABS.UTILS} title="Utils">
             {tab === INSIGHTS_TABS.UTILS && (
-              <UtilsUsage data={utils} />
+            <UtilsUsage data={utils} />
             )}
           </Tab>
           <Tab eventKey={INSIGHTS_TABS.ICONS} title="Icons">
             {tab === INSIGHTS_TABS.ICONS && (
-              <IconsUsage data={icons} />
+            <IconsUsage data={icons} />
             )}
           </Tab>
         </Tabs>
diff --git a/www/src/pages/status.tsx b/www/src/pages/status.tsx
index 860cf144d7..07710b57cf 100644
--- a/www/src/pages/status.tsx
+++ b/www/src/pages/status.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { StaticQuery, graphql } from 'gatsby';
 import { Table, Container } from '~paragon-react';
 import { ComponentStatus } from '../components/doc-elements';
 import SEO from '../components/SEO';
 import Layout from '../components/PageLayout';
+import { SettingsContext } from '../context/SettingsContext';
 
 export interface IComponents {
   frontmatter?: string,
@@ -11,11 +12,13 @@ export interface IComponents {
 }
 
 export default function StatusPage() {
+  const { settings } = useContext(SettingsContext);
+
   return (
-    <Layout>
-      <Container size="md" className="py-5">
-        {/* eslint-disable-next-line react/jsx-pascal-case */}
-        <SEO title="Status" />
+    <Layout isAutoToc>
+      {/* eslint-disable-next-line react/jsx-pascal-case */}
+      <SEO title="Status" />
+      <Container size={settings.containerWidth} className="py-5">
         <h1>Library Status</h1>
 
         <h3>Components Status</h3>
diff --git a/www/src/templates/default-mdx-page-template.tsx b/www/src/templates/default-mdx-page-template.tsx
index c6739e5af0..7742495ce4 100644
--- a/www/src/templates/default-mdx-page-template.tsx
+++ b/www/src/templates/default-mdx-page-template.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { MDXProvider } from '@mdx-js/react';
 import { Link } from 'gatsby';
@@ -7,6 +7,7 @@ import CodeBlock from '../components/CodeBlock';
 import Layout from '../components/PageLayout';
 import SEO from '../components/SEO';
 import LinkedHeading from '../components/LinkedHeading';
+import { SettingsContext } from '../context/SettingsContext';
 
 const shortcodes = {
   h1: (props: HTMLHeadingElement) => <LinkedHeading h="1" {...props} />,
@@ -32,11 +33,13 @@ export interface IPageTemplateType {
 }
 
 export default function PageTemplate({ children, pageContext }: IPageTemplateType) {
+  const { settings } = useContext(SettingsContext);
+
   return (
-    <Layout>
+    <Layout isAutoToc>
       {/* eslint-disable-next-line react/jsx-pascal-case */}
       <SEO title={pageContext?.frontmatter?.title} />
-      <Container size="md" className="py-5">
+      <Container size={settings.containerWidth} className="py-5">
         <MDXProvider components={shortcodes}>{children}</MDXProvider>
       </Container>
     </Layout>