diff --git a/src/AddButton/__snapshots__/AddButton.test.tsx.snap b/src/AddButton/__snapshots__/AddButton.test.tsx.snap
deleted file mode 100644
index df1b1c1..0000000
--- a/src/AddButton/__snapshots__/AddButton.test.tsx.snap
+++ /dev/null
@@ -1,12 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders correctly 1`] = `
-<AddButton
-  classes={
-    Object {
-      "button": "AddButton-button-1",
-    }
-  }
-  onClick={[Function]}
-/>
-`;
diff --git a/src/AddButton/__snapshots__/index.test.tsx.snap b/src/AddButton/__snapshots__/index.test.tsx.snap
new file mode 100644
index 0000000..f974069
--- /dev/null
+++ b/src/AddButton/__snapshots__/index.test.tsx.snap
@@ -0,0 +1,12 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders correctly 1`] = `
+<WithStyles(ForwardRef(Fab))
+  aria-label="add"
+  className="makeStyles-button-1"
+  color="secondary"
+  onClick={[Function]}
+>
+  <AddIcon />
+</WithStyles(ForwardRef(Fab))>
+`;
diff --git a/src/AppContainer/__snapshots__/AppContainer.test.tsx.snap b/src/AppContainer/__snapshots__/index.test.tsx.snap
similarity index 100%
rename from src/AppContainer/__snapshots__/AppContainer.test.tsx.snap
rename to src/AppContainer/__snapshots__/index.test.tsx.snap
diff --git a/src/Base/__snapshots__/Base.test.tsx.snap b/src/Base/__snapshots__/index.test.tsx.snap
similarity index 92%
rename from src/Base/__snapshots__/Base.test.tsx.snap
rename to src/Base/__snapshots__/index.test.tsx.snap
index 6d63ed2..31225d4 100644
--- a/src/Base/__snapshots__/Base.test.tsx.snap
+++ b/src/Base/__snapshots__/index.test.tsx.snap
@@ -41,6 +41,11 @@ exports[`Base renders correctly 1`] = `
             "type": "link",
             "url": "/dialog",
           },
+          Object {
+            "title": "Tabs",
+            "type": "link",
+            "url": "/tabs",
+          },
         ],
         "title": "Components",
         "type": "label",
@@ -113,6 +118,11 @@ exports[`Base renders correctly without header 1`] = `
             "type": "link",
             "url": "/dialog",
           },
+          Object {
+            "title": "Tabs",
+            "type": "link",
+            "url": "/tabs",
+          },
         ],
         "title": "Components",
         "type": "label",
@@ -185,6 +195,11 @@ exports[`Base renders with drawer open 1`] = `
             "type": "link",
             "url": "/dialog",
           },
+          Object {
+            "title": "Tabs",
+            "type": "link",
+            "url": "/tabs",
+          },
         ],
         "title": "Components",
         "type": "label",
diff --git a/src/Confirm/__snapshots__/Confirm.test.tsx.snap b/src/Confirm/__snapshots__/index.test.tsx.snap
similarity index 100%
rename from src/Confirm/__snapshots__/Confirm.test.tsx.snap
rename to src/Confirm/__snapshots__/index.test.tsx.snap
diff --git a/src/Drawer/__snapshots__/Drawer.test.tsx.snap b/src/Drawer/__snapshots__/Drawer.test.tsx.snap
deleted file mode 100644
index 704f8c6..0000000
--- a/src/Drawer/__snapshots__/Drawer.test.tsx.snap
+++ /dev/null
@@ -1,41 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders correctly 1`] = `
-<Drawer
-  classes={
-    Object {
-      "drawerHeader": "Drawer-drawerHeader-2",
-      "drawerPaper": "Drawer-drawerPaper-1",
-    }
-  }
-  data={
-    Array [
-      Object {
-        "title": "Dashboard",
-        "type": "link",
-        "url": "/",
-      },
-      Object {
-        "isDisabled": true,
-        "title": "New portfolio",
-        "type": "link",
-        "url": "/portfolio",
-      },
-      Object {
-        "type": "divider",
-      },
-      Object {
-        "icon": <React.Fragment>
-          <Memo(BugReportIcon) />
-        </React.Fragment>,
-        "title": "Report a bug",
-        "type": "link",
-        "url": "/bug",
-      },
-    ]
-  }
-  isOpen={true}
-  onClose={[Function]}
-  redirectTo={[Function]}
-/>
-`;
diff --git a/src/Form/__tests__/__snapshots__/Form.test.tsx.snap b/src/Form/__tests__/__snapshots__/Form.test.tsx.snap
index 23245ef..6ce8c86 100644
--- a/src/Form/__tests__/__snapshots__/Form.test.tsx.snap
+++ b/src/Form/__tests__/__snapshots__/Form.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`renders correctly 1`] = `
       "entries": Array [
         Object {
           "hash": "",
-          "key": "lonc7p",
+          "key": "2rl5qm",
           "pathname": "/",
           "search": "",
           "state": undefined,
@@ -25,7 +25,7 @@ exports[`renders correctly 1`] = `
       "listen": [Function],
       "location": Object {
         "hash": "",
-        "key": "lonc7p",
+        "key": "2rl5qm",
         "pathname": "/",
         "search": "",
         "state": undefined,
@@ -276,7 +276,7 @@ exports[`renders correctly with content 1`] = `
       "entries": Array [
         Object {
           "hash": "",
-          "key": "sujqef",
+          "key": "ecqalr",
           "pathname": "/",
           "search": "",
           "state": undefined,
@@ -290,7 +290,7 @@ exports[`renders correctly with content 1`] = `
       "listen": [Function],
       "location": Object {
         "hash": "",
-        "key": "sujqef",
+        "key": "ecqalr",
         "pathname": "/",
         "search": "",
         "state": undefined,
diff --git a/src/Header/__snapshots__/Header.test.tsx.snap b/src/Header/__snapshots__/index.test.tsx.snap
similarity index 100%
rename from src/Header/__snapshots__/Header.test.tsx.snap
rename to src/Header/__snapshots__/index.test.tsx.snap
diff --git a/src/Menu/__snapshots__/Menu.test.tsx.snap b/src/Menu/__snapshots__/index.test.tsx.snap
similarity index 100%
rename from src/Menu/__snapshots__/Menu.test.tsx.snap
rename to src/Menu/__snapshots__/index.test.tsx.snap
diff --git a/src/Tabs/__snapshots__/Tabs.test.tsx.snap b/src/Tabs/__snapshots__/index.test.tsx.snap
similarity index 100%
rename from src/Tabs/__snapshots__/Tabs.test.tsx.snap
rename to src/Tabs/__snapshots__/index.test.tsx.snap
diff --git a/src/__visual__/Layout.tsx b/src/__visual__/Layout.tsx
index f8a4abd..72bce4f 100644
--- a/src/__visual__/Layout.tsx
+++ b/src/__visual__/Layout.tsx
@@ -28,7 +28,7 @@ const Layout: FunctionComponent = ({ children }) => {
 
   return (
     <Base
-      title="This is Backoffice"
+      title="Backoffice"
       menuData={menuData}
       isHeaderFixed
       history={history}