diff --git a/gatsby-browser.js b/gatsby-browser.js
index dbc9866..2acf0ab 100644
--- a/gatsby-browser.js
+++ b/gatsby-browser.js
@@ -31,7 +31,7 @@ export const shouldUpdateScroll = ({ routerProps: { location } }) => {
 
 export const wrapPageElement = ({ element, props }) => {
   const { location: { pathname } } = props
-  pathname.includes('/article/amp') ? props.amp = true : props.amp = false
+  pathname.includes('/amp/') ? props.amp = true : props.amp = false
 
   return <Layout {...props}>{element}</Layout>
 }
diff --git a/gatsby-config.js b/gatsby-config.js
index e937bf1..db94f92 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -145,11 +145,12 @@ module.exports = {
       resolve: `gatsby-plugin-amp`,
       options: {
         canonicalBaseUrl: 'https://devthread.ru/',
-        components: ['amp-sidebar', 'amp-accordion'],
+        components: ['amp-sidebar', 'amp-accordion', 'amp-form'],
         excludedPaths: ['/404*', '/'],
         pathIdentifier: '/amp/',
         relAmpHtmlPattern: '{{canonicalBaseUrl}}{{pathname}}{{pathIdentifier}}',
-        useAmpClientIdApi: true,
+        relCanonicalPattern: '{{canonicalBaseUrl}}{{pathname}}/',
+        useAmpClientIdApi: false,
       },
     },
     {
diff --git a/gatsby-node.esm.js b/gatsby-node.esm.js
index 31dec88..f3c203c 100644
--- a/gatsby-node.esm.js
+++ b/gatsby-node.esm.js
@@ -55,7 +55,7 @@ exports.createPages = async ({ actions, graphql }) => {
     })
     
     createPage({
-      path: `article/amp/${node.frontmatter.slug}/`,
+      path: `article/${node.frontmatter.slug}/amp/`,
       component: articleTemplateAMP,
       context: {
         slug: node.frontmatter.slug,
diff --git a/gatsby-ssr.js b/gatsby-ssr.js
index 5f16b4a..8ba0fdb 100644
--- a/gatsby-ssr.js
+++ b/gatsby-ssr.js
@@ -45,7 +45,7 @@ export const onRenderBody = ({ setPreBodyComponents }) => {
 
 export const wrapPageElement = ({ element, props }) => {
   const { location: { pathname } } = props
-  pathname.includes('/article/amp') ? props.amp = true : props.amp = false
+  pathname.includes('/amp/') ? props.amp = true : props.amp = false
 
   return <Layout {...props}>{element}</Layout>
 }
diff --git a/src/components/SEO/SEO.js b/src/components/SEO/SEO.js
index fa4a826..663b007 100644
--- a/src/components/SEO/SEO.js
+++ b/src/components/SEO/SEO.js
@@ -12,7 +12,8 @@ const SEO = ({
   image,
   type,
   canonical,
-  url
+  url,
+  amp
 }) => {
   const { pathname } = useLocation()
   const { siteMetadata } = useSiteMetadataQuery()
@@ -49,7 +50,7 @@ const SEO = ({
       {seo.description && (
         <meta property="og:description" content={seo.description} />
       )}
-      <link rel="canonical" href={seo.canonical} />
+      {!amp ? <link rel="canonical" href={seo.canonical} /> : null}
       <link
         rel="apple-touch-icon"
         sizes="180x180"
@@ -70,7 +71,7 @@ const SEO = ({
       <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#191919" />
       <meta name="msapplication-TileColor" content="#ffffff" />
       <meta name="theme-color" content="#ffffff" />
-      <script type="application/ld+json">
+      {!amp ? <script type="application/ld+json">
         {JSON.stringify({
           "@context": "http://schema.org",
           "@type": "Organization",
@@ -78,7 +79,7 @@ const SEO = ({
           url: siteMetadata.siteUrl,
           sameAs: [siteMetadata.social.twitter],
         })}
-      </script>
+      </script> : null}
     </Helmet>
   )
 }
diff --git a/src/lib/amp.js b/src/lib/amp.js
index 1b30b92..ea6da1c 100644
--- a/src/lib/amp.js
+++ b/src/lib/amp.js
@@ -54,6 +54,7 @@ const HeaderAMP = () => {
             }
             amp-sidebar .amp-sidebar__social {
               display: flex;
+              margin-top: 30px;
             }
             amp-sidebar .amp-sidebar__social a {
               font-size: 0;
@@ -80,7 +81,7 @@ const HeaderAMP = () => {
             <LogoIcon />
             <a href='/'>devthread.ru</a>
           </div>
-          <button on='tap:sidebar-header' aria-label="menu" className="header-content__button mobile">
+          <button tabindex="0" on='tap:sidebar-header' aria-label="menu" className="header-content__button mobile">
             <span />
             <span />
             <span />
@@ -89,7 +90,7 @@ const HeaderAMP = () => {
       </header>
       <amp-sidebar id="sidebar-header" layout="nodisplay" side="left">
         <nav>
-          <div role='button' on='tap:sidebar-header.toggle' aria-label="menu" className='amp-sidebar__toggleBtn'>
+          <div role='button' tabindex="0" on='tap:sidebar-header.toggle' aria-label="menu" className='amp-sidebar__toggleBtn'>
             ✕
           </div>
           <span>{title}</span>
diff --git a/src/templates/article.amp.js b/src/templates/article.amp.js
index 64dbd93..54cbe6c 100644
--- a/src/templates/article.amp.js
+++ b/src/templates/article.amp.js
@@ -26,6 +26,7 @@ const articleTemplateAmp = ({
         type="article"
         url={`${siteUrl}/article/${frontmatter.slug}/`}
         canonical={`${siteUrl}/article/${frontmatter.slug}/`}
+        amp={true}
       />
       <Main>
         <Grid fluid style={{ maxWidth: 800 }}>