diff --git a/docs/app/Components/ComponentDoc/ComponentExample.js b/docs/app/Components/ComponentDoc/ComponentExample.js
index 261e84fa59..f3766aba18 100644
--- a/docs/app/Components/ComponentDoc/ComponentExample.js
+++ b/docs/app/Components/ComponentDoc/ComponentExample.js
@@ -11,6 +11,7 @@ import { exampleContext, repoURL } from 'docs/app/utils'
 import { Divider, Grid, Icon, Header, Menu, Popup } from 'src'
 import Editor from 'docs/app/Components/Editor/Editor'
 import { scrollToAnchor } from 'docs/app/utils'
+import ComponentVersion from './ComponentVersion'
 
 const babelConfig = {
   presets: ['es2015', 'react', 'stage-1'],
@@ -67,6 +68,10 @@ class ComponentExample extends Component {
     location: PropTypes.object.isRequired,
     match: PropTypes.object.isRequired,
     title: PropTypes.node,
+    version: PropTypes.oneOfType([
+      PropTypes.arrayOf(PropTypes.string),
+      PropTypes.string,
+    ]),
   }
 
   componentWillMount() {
@@ -388,7 +393,7 @@ class ComponentExample extends Component {
   }
 
   render() {
-    const { children, description, title } = this.props
+    const { children, description, title, version } = this.props
     const { copiedDirectLink, exampleElement, showCode, showHTML } = this.state
     const exampleStyle = {}
 
@@ -397,41 +402,50 @@ class ComponentExample extends Component {
     }
 
     return (
-      <Grid className='docs-example' style={exampleStyle} divided={showCode} columns='1' id={this.anchorName}>
-        <Grid.Column style={headerColumnStyle}>
-          {title && <Header as='h3' className='no-anchor' style={titleStyle} content={title} />}
-          {description && <p>{description}</p>}
-          <Menu compact text icon size='small' color='green' className='docs-example-menu'>
-            <ToolTip content={copiedDirectLink ? ' Copied Link!' : 'Direct link'}>
-              <Menu.Item href={`#${this.anchorName}`} onClick={this.handleDirectLinkClick}>
-                <Icon size='large' color='grey' name='linkify' fitted />
-              </Menu.Item>
-            </ToolTip>
-            <ToolTip content='Full Screen'>
-              <Menu.Item href={`/maximize/${this.anchorName}`} target='_blank'>
-                <Icon size='large' color='grey' name='window maximize' fitted />
-              </Menu.Item>
-            </ToolTip>
-            <ToolTip content='Show HTML'>
-              <Menu.Item active={showHTML} onClick={this.handleShowHTMLClick}>
-                <Icon size='large' color={showHTML ? 'green' : 'grey'} name='html5' fitted />
-              </Menu.Item>
-            </ToolTip>
-            <ToolTip content='Edit Code'>
-              <Menu.Item active={showCode} onClick={this.handleShowCodeClick}>
-                <Icon size='large' name='code' fitted />
-              </Menu.Item>
-            </ToolTip>
-          </Menu>
-        </Grid.Column>
-        {children && (
-          <Grid.Column style={childrenStyle}>
-            {children}
+      <Grid className='docs-example' divided={showCode} id={this.anchorName} style={exampleStyle}>
+        <Grid.Row>
+          <Grid.Column style={headerColumnStyle} width={12}>
+            {title && <Header as='h3' className='no-anchor' style={titleStyle} content={title} />}
+            {description && <p>{description}</p>}
           </Grid.Column>
-        )}
-        <Grid.Column className={`rendered-example ${this.getKebabExamplePath()}`}>
-          {exampleElement}
-        </Grid.Column>
+          <Grid.Column textAlign='right' width={4}>
+            <Menu compact text icon size='small' color='green' className='docs-example-menu'>
+              <ToolTip content={copiedDirectLink ? ' Copied Link!' : 'Direct link'}>
+                <Menu.Item href={`#${this.anchorName}`} onClick={this.handleDirectLinkClick}>
+                  <Icon size='large' color='grey' name='linkify' fitted />
+                </Menu.Item>
+              </ToolTip>
+              <ToolTip content='Full Screen'>
+                <Menu.Item href={`/maximize/${this.anchorName}`} target='_blank'>
+                  <Icon size='large' color='grey' name='window maximize' fitted />
+                </Menu.Item>
+              </ToolTip>
+              <ToolTip content='Show HTML'>
+                <Menu.Item active={showHTML} onClick={this.handleShowHTMLClick}>
+                  <Icon size='large' color={showHTML ? 'green' : 'grey'} name='html5' fitted />
+                </Menu.Item>
+              </ToolTip>
+              <ToolTip content='Edit Code'>
+                <Menu.Item active={showCode} onClick={this.handleShowCodeClick}>
+                  <Icon size='large' name='code' fitted />
+                </Menu.Item>
+              </ToolTip>
+            </Menu>
+
+            {version && <ComponentVersion version={version} />}
+          </Grid.Column>
+        </Grid.Row>
+
+        <Grid.Row columns={1}>
+          {children && <Grid.Column style={childrenStyle}>{children}</Grid.Column>}
+        </Grid.Row>
+
+        <Grid.Row columns={1}>
+          <Grid.Column className={`rendered-example ${this.getKebabExamplePath()}`}>
+            {exampleElement}
+          </Grid.Column>
+        </Grid.Row>
+
         {this.renderJSX()}
         {this.renderHTML()}
       </Grid>
diff --git a/docs/app/Components/ComponentDoc/ComponentVersion.js b/docs/app/Components/ComponentDoc/ComponentVersion.js
new file mode 100644
index 0000000000..356229d01d
--- /dev/null
+++ b/docs/app/Components/ComponentDoc/ComponentVersion.js
@@ -0,0 +1,31 @@
+import PropTypes from 'prop-types'
+import React, { PureComponent } from 'react'
+
+import { Label } from 'src'
+
+export default class ComponentVersion extends PureComponent {
+  static propTypes = {
+    version: PropTypes.oneOfType([
+      PropTypes.arrayOf(PropTypes.string),
+      PropTypes.string,
+    ]),
+  }
+
+  computeVersions = () => {
+    const { version } = this.props
+
+    if (typeof version === 'string') return [version, null]
+    return version
+  }
+
+  render() {
+    const [SUIR, SUI] = this.computeVersions()
+
+    return (
+      <div>
+        {<Label as='a' color='teal' content={SUIR} size='tiny' title={`Available from Semantic UI React ${SUIR}`} />}
+        {SUI && <Label as='a' color='teal' content={SUI} size='tiny' title={`Available from Semantic UI ${SUI}`} />}
+      </div>
+    )
+  }
+}
diff --git a/docs/app/Components/ComponentDoc/ShorthandExample.js b/docs/app/Components/ComponentDoc/ShorthandExample.js
new file mode 100644
index 0000000000..1b67f9921a
--- /dev/null
+++ b/docs/app/Components/ComponentDoc/ShorthandExample.js
@@ -0,0 +1,16 @@
+import PropTypes from 'prop-types'
+import React from 'react'
+
+import ComponentExample from './ComponentExample'
+
+const ShorthandExample = ({ description, ...rest }) => <ComponentExample {...rest} description={description} />
+
+ShorthandExample.propTypes = {
+  description: PropTypes.node,
+}
+
+ShorthandExample.defaultProps = {
+  description: 'You can do the same using shorthands.',
+}
+
+export default ShorthandExample
diff --git a/docs/app/index.ejs b/docs/app/index.ejs
index 6a4fe7b527..a6b51ddb44 100644
--- a/docs/app/index.ejs
+++ b/docs/app/index.ejs
@@ -163,9 +163,6 @@
 
     .docs-example-menu {
       transition: opacity 200ms;
-      position: absolute;
-      top: 1rem;
-      right: 1rem;
       opacity: 0;
     }