diff --git a/package.json b/package.json
index bfa1f498..e8c35741 100644
--- a/package.json
+++ b/package.json
@@ -129,12 +129,12 @@
     "eventemitter3": "^3.0.0",
     "json-pointer": "^0.6.0",
     "json-schema-ref-parser": "^5.0.0",
-    "lunr": "^2.2.0",
+    "lunr": "^2.2.1",
     "mark.js": "^8.11.1",
     "marked": "^0.3.19",
     "mobx": "^4.1.0",
     "mobx-react": "^5.0.0",
-    "openapi-sampler": "1.0.0-beta.10",
+    "openapi-sampler": "1.0.0-beta.11",
     "perfect-scrollbar": "^1.3.0",
     "polished": "^1.9.2",
     "prismjs": "^1.12.2",
diff --git a/src/common-elements/tabs.ts b/src/common-elements/tabs.ts
index cf9409e5..6499c9ac 100644
--- a/src/common-elements/tabs.ts
+++ b/src/common-elements/tabs.ts
@@ -8,24 +8,28 @@ export const Tabs = styled(ReactTabs)`
     list-style: none;
     padding: 0;
     margin: 0;
-    display: flex;
-    flex-wrap: wrap;
+    margin: 0 -5px;
 
     > li {
       padding: 5px 10px;
       display: inline-block;
-      flex: 1;
+
       background-color: rgba(0, 0, 0, 0.2);
       border-bottom: 1px solid rgba(0, 0, 0, 0.5);
       cursor: pointer;
       text-align: center;
       outline: none;
       color: #ccc;
+      margin: 5px;
+      border: 1px solid #181f22;
+      border-radius: 5px;
+      min-width: 60px;
+      font-size: 0.9em;
+      font-weight: bold;
 
       &.react-tabs__tab--selected {
-        color: #fff;
-        background: rgba(0, 0, 0, 0.5);
-        border-bottom: 1px solid ${props => props.theme.schemaView.linesColor};
+        color: ${props => props.theme.colors.text};
+        background: #e2e2e2;
       }
 
       &:only-child {
@@ -64,21 +68,23 @@ export const SmallTabs = Tabs.extend`
   > ul {
     display: block;
     > li {
-      padding: 0;
-      margin-right: 20px;
-      font-size: 12px;
-      padding: 2px 0;
+      padding: 2px 5px;
+      min-width: auto;
+      margin: 0 15px 0 0;
+      font-size: 13px;
+      font-weight: normal;
       border-bottom: 1px dashed;
       color: #787b7d;
-      backgrond: none;
+      border-radius: 0;
+      background: none;
 
       &:last-child {
         margin-right: 0;
       }
 
       &.react-tabs__tab--selected {
-        backgrond: none;
         color: #babcbf;
+        background: none;
       }
     }
   }
diff --git a/yarn.lock b/yarn.lock
index 4469e36e..704ecf4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6209,9 +6209,9 @@ lru-cache@^4.0.1, lru-cache@^4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lunr@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.2.0.tgz#ab66b8853e8f420cd018d9b474a650537d78a86f"
+lunr@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.2.1.tgz#62c62947bf83619450e94abf26061f1ce3baaa47"
 
 macaddress@^0.2.8:
   version "0.2.8"
@@ -6976,9 +6976,9 @@ ono@^4.0.3:
   dependencies:
     format-util "^1.0.3"
 
-openapi-sampler@1.0.0-beta.10:
-  version "1.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/openapi-sampler/-/openapi-sampler-1.0.0-beta.10.tgz#8f437529a2da92bfaa43966308d6446e4748ac29"
+openapi-sampler@1.0.0-beta.11:
+  version "1.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/openapi-sampler/-/openapi-sampler-1.0.0-beta.11.tgz#1c155f484e1164c96513a3f4540e12119210153f"
   dependencies:
     json-pointer "^0.6.0"