diff --git a/docs/contact.md b/docs/contact.md
deleted file mode 100644
index e3672f20e78..00000000000
--- a/docs/contact.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: markdown
-title: Contact
-permalink: contact
----
-
-Sourcegraph is how developers search code. Need to reach a real human being on our team?
-
-## Help using Sourcegraph
-
-<a class="intercom-toggle" href="#" onclick="window.Intercom('show')">Start chatting with us now</a>, file issues on our [public issue tracker](https://github.com/sourcegraph/sourcegraph/issues), or send an email to <a href="mailto:support@sourcegraph.com">support@sourcegraph.com</a> with as much information as possible.
-
-- List the steps you took, what you expected, and what you saw.
-- Include links and screenshots, if relevant.
-
-Reporting a security vulnerability? See our <a href="/security">responsible disclosure policy</a>.
-
-## Around the web
-
-- Twitter: <a href="https://twitter.com/srcgraph" target="_blank">@srcgraph</a>
-- GitHub: <a target="_blank" href="https://github.com/sourcegraph">github.com/sourcegraph</a>
-- LinkedIn: <a target="_blank" href="https://www.linkedin.com/company/sourcegraph">Sourcegraph LinkedIn page</a>
-
-## Plans, pricing, sales
-
-For enterprise accounts or any questions about getting Sourcegraph for your private code, <a href="/contact/sales">submit our contact form</a>, or email us at <a href="mailto:sales@sourcegraph.com">sales@sourcegraph.com</a>.
-
-## In the real world
-
-Sourcegraph<br/>
-142 Minna St, 2nd Floor<br/>
-San Francisco, CA 94105 (USA)
-
-<a target="_blank" href="https://www.google.com/maps/place/Sourcegraph/@37.7878302,-122.4013944,17z/data=!3m1!4b1!4m5!3m4!1s0x80858062cd4c9f97:0xf3a9d5164f1d61ec!8m2!3d37.7878302!4d-122.3992004">View on Google Maps</a>
diff --git a/website/src/components/Footer.tsx b/website/src/components/Footer.tsx
index 2dfb1df4b10..61e31c0e06d 100644
--- a/website/src/components/Footer.tsx
+++ b/website/src/components/Footer.tsx
@@ -5,98 +5,101 @@ import TwitterIcon from 'mdi-react/TwitterIcon'
 import * as React from 'react'
 import { PRODUCT_FEATURES, PRODUCT_USE_CASES } from './ProductPopover'
 
-export const Footer: React.FunctionComponent<any> = () => (
+export const Footer: React.FunctionComponent<{ minimal?: boolean }> = ({ minimal }) => (
     <footer className="footer pt-6 pb-2">
         <div className="footer__container container">
-            <div className="row footer__nav-sections">
-                <div className="col-12 col-lg-3 mb-5">
-                    <Link to="/">
-                        <img className="footer__logo" src="/sourcegraph/logo--light.svg" />
-                    </Link>
-                    <ul className="nav footer__social mt-1">
-                        <li className="nav-item">
-                            <a href="https://github.com/sourcegraph" target="_blank">
-                                <GitHubCircleIcon />
-                            </a>
-                        </li>
-                        <li className="nav-item">
-                            <a href="https://twitter.com/srcgraph" target="_blank">
-                                <TwitterIcon />
-                            </a>
-                        </li>
-                        <li className="nav-item">
-                            <a href="https://www.linkedin.com/company/4803356/" target="_blank">
-                                <LinkedinIcon />
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-                <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
-                    <h3 className="footer__nav-header">Why Sourcegraph?</h3>
-                    <ul className="nav flex-column">
-                        <li className="nav-item">
-                            <Link to="/product">Product</Link>
-                        </li>
-                        {/*<li className="nav-item">
+            {!minimal && (
+                <div className="row footer__nav-sections">
+                    <div className="col-12 col-lg-3 mb-5">
+                        <Link to="/">
+                            <img className="footer__logo" src="/sourcegraph/logo--light.svg" />
+                        </Link>
+                        <ul className="nav footer__social mt-1">
+                            <li className="nav-item">
+                                <a href="https://github.com/sourcegraph" target="_blank">
+                                    <GitHubCircleIcon />
+                                </a>
+                            </li>
+                            <li className="nav-item">
+                                <a href="https://twitter.com/srcgraph" target="_blank">
+                                    <TwitterIcon />
+                                </a>
+                            </li>
+                            <li className="nav-item">
+                                <a href="https://www.linkedin.com/company/4803356/" target="_blank">
+                                    <LinkedinIcon />
+                                </a>
+                            </li>
+                        </ul>
+                        )}
+                    </div>
+                    <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
+                        <h3 className="footer__nav-header">Why Sourcegraph?</h3>
+                        <ul className="nav flex-column">
+                            <li className="nav-item">
+                                <Link to="/product">Product</Link>
+                            </li>
+                            {/*<li className="nav-item">
                             <Link to="/solutions">Use cases</Link>
 </li> TODO(sqs)*/}
-                        <li className="nav-item">
-                            <Link to="/product">What is a developer platform?</Link>
-                        </li>
-                        <li className="nav-item">
-                            <Link to="/pricing">Pricing</Link>
-                        </li>
-                    </ul>
-                </div>
-                <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
-                    <h3 className="footer__nav-header">Features &amp; use cases</h3>
-                    <ul className="nav flex-column">
-                        {PRODUCT_FEATURES.map(({ text, to }, i) => (
-                            <li key={i} className="nav-item">
-                                <Link to={to}>{text}</Link>
+                            <li className="nav-item">
+                                <Link to="/product">What is a developer platform?</Link>
                             </li>
-                        ))}
-                        {PRODUCT_USE_CASES.map(({ text, to }, i) => (
-                            <li key={i} className="nav-item">
-                                <Link to={to}>{text}</Link>
+                            <li className="nav-item">
+                                <Link to="/pricing">Pricing</Link>
                             </li>
-                        ))}
-                    </ul>
-                </div>
-                <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
-                    <h3 className="footer__nav-header">Resources</h3>
-                    <ul className="nav flex-column">
-                        <li className="nav-item">
-                            <a href="https://docs.sourcegraph.com">Documentation</a>
-                        </li>
-                        <li className="nav-item">
-                            <a href="https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/CHANGELOG.md">
-                                Changelog
-                            </a>
-                        </li>
-                        <li className="nav-item">
-                            <Link to="/blog">Blog</Link>
-                        </li>
-                    </ul>
-                </div>
-                <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
-                    <h3 className="footer__nav-header">Company</h3>
-                    <ul className="nav flex-column">
-                        <li className="nav-item">
-                            <Link to="/plan">Master plan</Link>
-                        </li>
-                        <li className="nav-item">
-                            <Link to="/about">About</Link>
-                        </li>
-                        <li className="nav-item">
-                            <Link to="/contact">Contact</Link>
-                        </li>
-                        <li className="nav-item">
-                            <Link to="/jobs">Careers</Link>
-                        </li>
-                    </ul>
+                        </ul>
+                    </div>
+                    <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
+                        <h3 className="footer__nav-header">Features &amp; use cases</h3>
+                        <ul className="nav flex-column">
+                            {PRODUCT_FEATURES.map(({ text, to }, i) => (
+                                <li key={i} className="nav-item">
+                                    <Link to={to}>{text}</Link>
+                                </li>
+                            ))}
+                            {PRODUCT_USE_CASES.map(({ text, to }, i) => (
+                                <li key={i} className="nav-item">
+                                    <Link to={to}>{text}</Link>
+                                </li>
+                            ))}
+                        </ul>
+                    </div>
+                    <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
+                        <h3 className="footer__nav-header">Resources</h3>
+                        <ul className="nav flex-column">
+                            <li className="nav-item">
+                                <a href="https://docs.sourcegraph.com">Documentation</a>
+                            </li>
+                            <li className="nav-item">
+                                <a href="https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/CHANGELOG.md">
+                                    Changelog
+                                </a>
+                            </li>
+                            <li className="nav-item">
+                                <Link to="/blog">Blog</Link>
+                            </li>
+                        </ul>
+                    </div>
+                    <div className="col-sm-6 col-md-3 col-lg-2 mb-3">
+                        <h3 className="footer__nav-header">Company</h3>
+                        <ul className="nav flex-column">
+                            <li className="nav-item">
+                                <Link to="/plan">Master plan</Link>
+                            </li>
+                            <li className="nav-item">
+                                <Link to="/about">About</Link>
+                            </li>
+                            <li className="nav-item">
+                                <Link to="/contact">Contact</Link>
+                            </li>
+                            <li className="nav-item">
+                                <Link to="/jobs">Careers</Link>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
-            </div>
+            )}
             <div className="footer__postscript d-flex justify-content-between pt-4 pb-2 small">
                 <ul className="nav">
                     <li className="nav-item text-muted mr-3">Copyright &copy; 2019 Sourcegraph</li>
diff --git a/website/src/components/Header.tsx b/website/src/components/Header.tsx
index af4b6b6d7ff..585d822a405 100644
--- a/website/src/components/Header.tsx
+++ b/website/src/components/Header.tsx
@@ -6,6 +6,7 @@ import { ProductPopoverButton } from './ProductPopover'
 interface HeaderProps {
     isHome?: boolean
     isProductPage?: boolean
+    minimal?: boolean
 }
 
 export default class Header extends React.Component<HeaderProps, any> {
@@ -31,88 +32,110 @@ export default class Header extends React.Component<HeaderProps, any> {
                     <Link className="navbar-brand" to="/">
                         <img src="/sourcegraph/logo--light.svg" alt="Sourcegraph logo" />
                     </Link>
-                    <button
-                        className="navbar-toggler"
-                        data-toggle="collapse"
-                        data-target="#navcol-1"
-                        onClick={this.toggle}
-                    >
-                        <span className="sr-only">Toggle navigation</span>
-                        <span className="navbar-toggler-icon" />
-                    </button>
-                    <div
-                        className={`collapse navbar-collapse justify-content-end ${this.state.isOpen ? 'show' : ''}`}
-                        id="navcol-1"
-                    >
-                        <ul className="nav navbar-nav">
-                            <li className="header__nav-item nav-item d-none d-lg-block" role="presentation">
-                                <Link
-                                    className="header__nav-link nav-link"
-                                    to="/developer-platform"
-                                    activeClassName="header__nav-link-active"
-                                >
-                                    What is a developer platform?
-                                </Link>
-                            </li>
-                            <li
-                                className="header__nav-item nav-item"
-                                role="presentation"
-                                onClick={() => eventLogger.trackProductClicked('header')}
+                    {!this.props.minimal && (
+                        <>
+                            <button
+                                className="navbar-toggler"
+                                data-toggle="collapse"
+                                data-target="#navcol-1"
+                                onClick={this.toggle}
                             >
-                                <ProductPopoverButton className="header__nav-link nav-link" />
-                            </li>
-                            <li className="header__nav-item nav-item" role="presentation" onClick={this.pricingClicked}>
-                                <Link
-                                    className="header__nav-link nav-link"
-                                    to="/pricing"
-                                    activeClassName="header__nav-link-active"
-                                >
-                                    Pricing
-                                </Link>
-                            </li>
-                            <li className="header__nav-item nav-item" role="presentation" onClick={this.docsClicked}>
-                                <a className="header__nav-link nav-link" href="https://docs.sourcegraph.com">
-                                    Docs
-                                </a>
-                            </li>
-                            <li className="header__nav-item nav-item" role="presentation" onClick={this.aboutClicked}>
-                                <Link
-                                    className="header__nav-link nav-link"
-                                    to="/about"
-                                    activeClassName="header__nav-link-active"
-                                >
-                                    Company
-                                </Link>
-                            </li>
-                            <li className="header__nav-item nav-item" role="presentation" onClick={this.blogClicked}>
-                                <Link
-                                    className="header__nav-link nav-link"
-                                    to="/blog"
-                                    activeClassName="header__nav-link-active"
-                                >
-                                    Blog
-                                </Link>
-                            </li>
-                            <li className="header__nav-item nav-item" role="presentation">
-                                <a
-                                    className="header__nav-link nav-link"
-                                    href="https://sourcegraph.com/sign-in"
-                                    title="For public code only on Sourcegraph.com"
-                                >
-                                    Sign in
-                                </a>
-                            </li>
-                            <li className="header__nav-item nav-item" role="presentation">
-                                <a
-                                    className="header__nav-link nav-link"
-                                    href="https://sourcegraph.com/sign-up"
-                                    title="For public code only on Sourcegraph.com"
-                                >
-                                    Sign up
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
+                                <span className="sr-only">Toggle navigation</span>
+                                <span className="navbar-toggler-icon" />
+                            </button>
+                            <div
+                                className={`collapse navbar-collapse justify-content-end ${
+                                    this.state.isOpen ? 'show' : ''
+                                }`}
+                                id="navcol-1"
+                            >
+                                <ul className="nav navbar-nav">
+                                    <li className="header__nav-item nav-item d-none d-lg-block" role="presentation">
+                                        <Link
+                                            className="header__nav-link nav-link"
+                                            to="/developer-platform"
+                                            activeClassName="header__nav-link-active"
+                                        >
+                                            What is a developer platform?
+                                        </Link>
+                                    </li>
+                                    <li
+                                        className="header__nav-item nav-item"
+                                        role="presentation"
+                                        onClick={() => eventLogger.trackProductClicked('header')}
+                                    >
+                                        <ProductPopoverButton className="header__nav-link nav-link" />
+                                    </li>
+                                    <li
+                                        className="header__nav-item nav-item"
+                                        role="presentation"
+                                        onClick={this.pricingClicked}
+                                    >
+                                        <Link
+                                            className="header__nav-link nav-link"
+                                            to="/pricing"
+                                            activeClassName="header__nav-link-active"
+                                        >
+                                            Pricing
+                                        </Link>
+                                    </li>
+                                    <li
+                                        className="header__nav-item nav-item"
+                                        role="presentation"
+                                        onClick={this.docsClicked}
+                                    >
+                                        <a className="header__nav-link nav-link" href="https://docs.sourcegraph.com">
+                                            Docs
+                                        </a>
+                                    </li>
+                                    <li
+                                        className="header__nav-item nav-item"
+                                        role="presentation"
+                                        onClick={this.aboutClicked}
+                                    >
+                                        <Link
+                                            className="header__nav-link nav-link"
+                                            to="/about"
+                                            activeClassName="header__nav-link-active"
+                                        >
+                                            Company
+                                        </Link>
+                                    </li>
+                                    <li
+                                        className="header__nav-item nav-item"
+                                        role="presentation"
+                                        onClick={this.blogClicked}
+                                    >
+                                        <Link
+                                            className="header__nav-link nav-link"
+                                            to="/blog"
+                                            activeClassName="header__nav-link-active"
+                                        >
+                                            Blog
+                                        </Link>
+                                    </li>
+                                    <li className="header__nav-item nav-item" role="presentation">
+                                        <a
+                                            className="header__nav-link nav-link"
+                                            href="https://sourcegraph.com/sign-in"
+                                            title="For public code only on Sourcegraph.com"
+                                        >
+                                            Sign in
+                                        </a>
+                                    </li>
+                                    <li className="header__nav-item nav-item" role="presentation">
+                                        <a
+                                            className="header__nav-link nav-link"
+                                            href="https://sourcegraph.com/sign-up"
+                                            title="For public code only on Sourcegraph.com"
+                                        >
+                                            Sign up
+                                        </a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </>
+                    )}
                 </div>
             </nav>
         )
diff --git a/website/src/components/Layout.tsx b/website/src/components/Layout.tsx
index d763cecf6fc..97768559ac0 100644
--- a/website/src/components/Layout.tsx
+++ b/website/src/components/Layout.tsx
@@ -9,6 +9,7 @@ interface LayoutProps {
         pathname: string
     }
     children: React.ReactNode
+    minimal?: boolean
 }
 
 export default class Layout extends React.PureComponent<LayoutProps> {
@@ -40,9 +41,9 @@ export default class Layout extends React.PureComponent<LayoutProps> {
 
                     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet" />
                 </Helmet>
-                <Header isHome={isHome} isProductPage={isProductPage} />
+                <Header isHome={isHome} isProductPage={isProductPage} minimal={this.props.minimal} />
                 <section className="d-flex flex-column fill-height">{this.props.children}</section>
-                <Footer />
+                <Footer minimal={this.props.minimal} />
             </div>
         )
     }
diff --git a/website/src/components/PricingPlan.tsx b/website/src/components/PricingPlan.tsx
index 7ba22401e1f..d199884192a 100644
--- a/website/src/components/PricingPlan.tsx
+++ b/website/src/components/PricingPlan.tsx
@@ -14,6 +14,7 @@ interface Props {
     priceInterval?: string | React.ReactFragment
     priceCaption?: string | React.ReactFragment
     features: PricingPlanFeature[]
+    plusEverythingIn?: string
     buttonLabel: string
     buttonOnClick?: () => void
     buttonHref: string
@@ -36,11 +37,12 @@ export const PricingPlan: React.FunctionComponent<Props> = ({
     ),
     priceCaption,
     features,
+    plusEverythingIn,
     buttonLabel,
     buttonOnClick,
     buttonHref,
 }) => (
-    <div className={`card pricing__card ${className}`}>
+    <div className={`card border-0 pricing__card ${className}`}>
         <h1 className="card-title border-bottom py-2">{name}</h1>
         <div className="card-body py-1 pricing-plan__description text-center flex-grow-0">{description}</div>
         <div className="card-body pt-2 d-flex flex-column align-items-center flex-grow-0">
@@ -74,6 +76,11 @@ export const PricingPlan: React.FunctionComponent<Props> = ({
                     {name}
                 </a>
             ))}
+            {plusEverythingIn && (
+                <div className="list-group-item border-0 text-muted font-italic pt-1">
+                    Plus everything in {plusEverythingIn}
+                </div>
+            )}
         </div>
     </div>
 )
diff --git a/website/src/css/components/actions/GetSourcegraphNowActions.tsx b/website/src/css/components/actions/GetSourcegraphNowActions.tsx
index ab9959cff95..69fe4e1bbed 100644
--- a/website/src/css/components/actions/GetSourcegraphNowActions.tsx
+++ b/website/src/css/components/actions/GetSourcegraphNowActions.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { ContactPresalesSupportAction } from './ContactPresalesSupportAction'
-import { GetStartedAction } from './GetStartedAction'
+import { RequestDemoAction } from './RequestDemoAction'
 import { ViewDeveloperDocumentationAction } from './ViewDeveloperDocumentationAction'
 
 export const GetSourcegraphNowActions: React.FunctionComponent<any> = () => (
@@ -12,10 +12,9 @@ export const GetSourcegraphNowActions: React.FunctionComponent<any> = () => (
                 boxShadow: 'rgba(255,255,255,0.3) 0 0 30px 20px',
             }}
         >
-            <GetStartedAction className="mt-4" />
-            {/*<ContactPresalesSupportAction className="text-light mt-2" />*/}
-            {/* TODO(sqs): add back when form works */}
-            <ViewDeveloperDocumentationAction className="text-light mt-3 mb-3" />
+            <RequestDemoAction className="mt-4" />
+            <ContactPresalesSupportAction className="text-light mt-3" />
+            <ViewDeveloperDocumentationAction className="text-light mt-2 mb-3" />
         </div>
     </div>
 )
diff --git a/website/src/css/components/actions/GetStartedAction.tsx b/website/src/css/components/actions/GetStartedAction.tsx
deleted file mode 100644
index 0c304b57225..00000000000
--- a/website/src/css/components/actions/GetStartedAction.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Link } from 'gatsby'
-import React from 'react'
-import { SubmitEmailForm } from './SubmitEmailForm'
-
-// TODO(sqs): remove d-none when this works
-export const GetStartedAction: React.FunctionComponent<{ className?: string }> = ({ className = '' }) => (
-    <Link className={`btn btn-primary ${className}`} to="/contact/sales">
-        Get started
-    </Link>
-    // <SubmitEmailForm buttonText="Get started" className={`${className} d-none`} />
-)
diff --git a/website/src/css/components/actions/RequestADemoAction.tsx b/website/src/css/components/actions/RequestADemoAction.tsx
deleted file mode 100644
index 7445ff8f72a..00000000000
--- a/website/src/css/components/actions/RequestADemoAction.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react'
-import { SubmitEmailForm } from './SubmitEmailForm'
-
-export const RequestADemoAction: React.FunctionComponent<{ className?: string }> = ({ className = '' }) => (
-    <SubmitEmailForm buttonText="Request a demo" className={className} />
-)
diff --git a/website/src/css/components/actions/RequestDemoAction.tsx b/website/src/css/components/actions/RequestDemoAction.tsx
new file mode 100644
index 00000000000..45b746080ac
--- /dev/null
+++ b/website/src/css/components/actions/RequestDemoAction.tsx
@@ -0,0 +1,6 @@
+import React from 'react'
+import { SubmitEmailForm } from './SubmitEmailForm'
+
+export const RequestDemoAction: React.FunctionComponent<{ className?: string }> = ({ className = '' }) => (
+    <SubmitEmailForm formAction="/contact/request-demo" buttonText="Request a demo" className={className} />
+)
diff --git a/website/src/css/components/actions/SubmitEmailForm.tsx b/website/src/css/components/actions/SubmitEmailForm.tsx
index 0967de69e62..760260d184f 100644
--- a/website/src/css/components/actions/SubmitEmailForm.tsx
+++ b/website/src/css/components/actions/SubmitEmailForm.tsx
@@ -1,11 +1,22 @@
 import React from 'react'
 
-export const SubmitEmailForm: React.FunctionComponent<{ buttonText: string; className?: string }> = ({
-    buttonText,
-    className = '',
-}) => (
-    <form className={`form form-inline ${className}`}>
-        <input className="form-control mr-md-2 mb-2" type="text" placeholder="Enter work email" size={27} />
+export const SubmitEmailForm: React.FunctionComponent<{
+    formAction: string
+    buttonText: string
+    className?: string
+}> = ({ formAction, buttonText, className = '' }) => (
+    <form className={`form form-inline ${className}`} action={formAction} method="get">
+        <input
+            className="form-control mr-md-2 mb-2"
+            type="email"
+            name="email"
+            placeholder="Enter work email"
+            size={27}
+            autoCapitalize="off"
+            autoCorrect="off"
+            spellCheck={false}
+            autoComplete="email"
+        />
         <button type="submit" role="button" className="btn btn-primary mb-2">
             {buttonText}
         </button>
diff --git a/website/src/css/styles.scss b/website/src/css/styles.scss
index 14552772970..4aadb2bb70d 100644
--- a/website/src/css/styles.scss
+++ b/website/src/css/styles.scss
@@ -110,6 +110,8 @@ $input-placeholder-color: $gray-600;
 $input-focus-border-color: darken($component-active-bg, 25%);
 $input-focus-box-shadow: none;
 
+$list-group-action-hover-color: $link-hover-color;
+
 $popover-arrow-width: 0;
 $popover-arrow-color: transparent;
 $popover-arrow-outer-color: transparent;
@@ -124,6 +126,7 @@ $popover-max-width: 400px;
 @import 'node_modules/bootstrap/scss/transitions';
 @import 'node_modules/bootstrap/scss/nav';
 @import 'node_modules/bootstrap/scss/navbar';
+@import 'node_modules/bootstrap/scss/card';
 @import 'node_modules/bootstrap/scss/media';
 @import 'node_modules/bootstrap/scss/list-group';
 @import 'node_modules/bootstrap/scss/popover';
@@ -163,6 +166,35 @@ body {
     box-shadow: rgba(0, 0, 0, 0.1) 0 0 9px 3px;
 }
 
+// Formats an icon so that it appears inline in the text
+// with height matching the text
+.icon-inline {
+    // SVGs already include padding to account for text baseline,
+    // so align with the bottom of the text
+    vertical-align: bottom;
+    display: inline-flex;
+    align-items: center;
+}
+svg.icon-inline,
+img.icon-inline,
+.icon-inline svg,
+.icon-inline img {
+    // TODO find a better way to scale icons that is not proportional to the font size
+    // 14px font size -> 20px icon size
+    // stylelint-disable-next-line declaration-property-unit-whitelist
+    width: (20em / 14);
+    // stylelint-disable-next-line declaration-property-unit-whitelist
+    height: (20em / 14);
+    // Match color of the text
+    fill: currentColor;
+}
+
+.container-lg {
+    max-width: var(--breakpoint-lg);
+    margin-left: auto;
+    margin-right: auto;
+}
+
 @import 'circular-font';
 @import 'components/ProductPopover';
 @import 'components/content/ContentPage';
diff --git a/website/src/pages/contact/index.tsx b/website/src/pages/contact/index.tsx
new file mode 100644
index 00000000000..f9b82d4f748
--- /dev/null
+++ b/website/src/pages/contact/index.tsx
@@ -0,0 +1,129 @@
+import { Link } from 'gatsby'
+import EmailIcon from 'mdi-react/EmailIcon'
+import GithubCircleIcon from 'mdi-react/GithubCircleIcon'
+import LinkedinBoxIcon from 'mdi-react/LinkedinBoxIcon'
+import MapMarkerIcon from 'mdi-react/MapMarkerIcon'
+import TwitterIcon from 'mdi-react/TwitterIcon'
+import React from 'react'
+import { ContentPage } from '../../components/content/ContentPage'
+import { ContentSection } from '../../components/content/ContentSection'
+import Layout from '../../components/Layout'
+
+export default ((props: any) => (
+    <Layout location={props.location}>
+        <ContentPage title="Contact Sourcegraph" description="Contact a real human being on our team.">
+            <ContentSection color="white" className="py-6">
+                <div className="row">
+                    <div className="col-md-6 mb-4 pb-1">
+                        <div className="card">
+                            <h5 className="card-header">Product support</h5>
+                            <div className="card-body">
+                                <p className="card-text">For help using Sourcegraph:</p>
+                            </div>
+                            <div className="list-group list-group-flush">
+                                <a
+                                    className="list-group-item list-group-item-action"
+                                    href="https://github.com/sourcegraph/sourcegraph/issues"
+                                    target="_blank"
+                                >
+                                    <GithubCircleIcon /> File a public issue
+                                </a>
+                                <a
+                                    className="list-group-item list-group-item-action"
+                                    href="mailto:support@sourcegraph.com"
+                                    target="_blank"
+                                >
+                                    <EmailIcon /> Email support@sourcegraph.com
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                    <div className="col-md-6 mb-4 pb-1">
+                        <div className="card">
+                            <h5 className="card-header">Sales</h5>
+                            <div className="card-body">
+                                <p className="card-text">For information about products and purchasing:</p>
+                                <Link className="btn btn-outline-primary stretched-link" to="/contact/sales">
+                                    Contact sales
+                                </Link>
+                            </div>
+                        </div>
+                    </div>
+                    <div className="col-md-6 mb-4 pb-1">
+                        <div className="card">
+                            <h5 className="card-header">Jobs</h5>
+                            <div className="card-body">
+                                <p className="card-text">For information about joining our team:</p>
+                                <Link className="btn btn-outline-primary stretched-link" to="/contact/sales">
+                                    See career opportunities
+                                </Link>
+                            </div>
+                        </div>
+                    </div>
+                    <div className="col-md-6 mb-4 pb-1">
+                        <div className="card">
+                            <h5 className="card-header">Everything else</h5>
+                            <div className="list-group list-group-flush">
+                                <a
+                                    className="list-group-item list-group-item-action"
+                                    href="mailto:hi@sourcegraph.com"
+                                    target="_blank"
+                                >
+                                    <EmailIcon /> hi@sourcegraph.com
+                                </a>
+                                <a
+                                    className="list-group-item list-group-item-action"
+                                    href="https://twitter.com/srcgraph"
+                                    target="_blank"
+                                >
+                                    <TwitterIcon /> @srcgraph
+                                </a>
+                                <a
+                                    className="list-group-item list-group-item-action"
+                                    target="_blank"
+                                    href="https://github.com/sourcegraph"
+                                >
+                                    <GithubCircleIcon /> github.com/sourcegraph
+                                </a>
+                                <a
+                                    className="list-group-item list-group-item-action"
+                                    target="_blank"
+                                    href="https://www.linkedin.com/company/sourcegraph"
+                                >
+                                    <LinkedinBoxIcon /> Sourcegraph on LinkedIn
+                                </a>
+                                <div className="list-group-item d-flex p-relative">
+                                    <MapMarkerIcon className="mr-1" />
+                                    <div>
+                                        Sourcegraph
+                                        <br />
+                                        142 Minna St, 2nd Floor
+                                        <br />
+                                        San Francisco, CA 94105 (USA)
+                                        <br />
+                                        <small>
+                                            <a target="_blank" href="https://goo.gl/maps/LqTFnekUjRb9N12q6">
+                                                View on Google Maps
+                                            </a>
+                                        </small>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </ContentSection>
+        </ContentPage>
+    </Layout>
+)) as React.FunctionComponent<any>
+
+/*
+## Around the web
+
+## Plans, pricing, sales
+
+For enterprise accounts or any questions about getting Sourcegraph for your private code, <a href="/contact/sales">submit our contact form</a>, or email us at <a href="mailto:sales@sourcegraph.com">sales@sourcegraph.com</a>.
+
+## In the real world
+
+*/
diff --git a/website/src/pages/contact/request-demo.tsx b/website/src/pages/contact/request-demo.tsx
new file mode 100644
index 00000000000..61a600c218c
--- /dev/null
+++ b/website/src/pages/contact/request-demo.tsx
@@ -0,0 +1,37 @@
+import React, { useLayoutEffect } from 'react'
+import Layout from '../../components/Layout'
+import { CustomerLogosSection } from '../../components/product/CustomerLogosSection'
+import { createHubSpotForm } from './sales'
+
+export default ((props: any) => {
+    useLayoutEffect(() => {
+        createHubSpotForm({
+            portalId: '2762526',
+            formId: '310000a0-2b6b-4da2-89e9-2be930a8a298',
+            targetId: 'hubspotRequestDemoForm',
+        })
+    }, [])
+    return (
+        <Layout location={props.location} minimal={true}>
+            <script charSet="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js" />
+            <div className="bg-white text-dark">
+                <div className="container-lg py-6 px-5">
+                    <div className="row flex-wrap-reverse">
+                        <div className="col-md-6">
+                            <h1 className="display-4">Request a demo</h1>
+                            <h3 className="font-weight-light text-sans-serif">
+                                We'll reach out to discuss a product demo and trial.
+                            </h3>
+                            <div className="form mt-5">
+                                <div id="hubspotRequestDemoForm" className="d-flex justify-center" />
+                            </div>
+                        </div>
+                        <div className="col-md-6">
+                            <CustomerLogosSection className="mt-3 mb-6" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </Layout>
+    )
+}) as React.FunctionComponent<any>
diff --git a/website/src/pages/contact/sales.tsx b/website/src/pages/contact/sales.tsx
index ed2a9e28e7d..775bd66343f 100644
--- a/website/src/pages/contact/sales.tsx
+++ b/website/src/pages/contact/sales.tsx
@@ -1,79 +1,60 @@
-import { Link } from 'gatsby'
-import * as React from 'react'
+import React, { useLayoutEffect } from 'react'
 import Layout from '../../components/Layout'
+import { CustomerLogosSection } from '../../components/product/CustomerLogosSection'
 import { eventLogger } from '../../EventLogger'
 
-export default class Trial extends React.Component<any, any> {
-    public componentDidMount(): void {
-        const script = document.createElement('script')
-        script.src = '//js.hsforms.net/forms/v2.js'
-        const hubspot = document.getElementById('hubspotTrialForm')
-        hubspot.appendChild(script)
-        script.addEventListener('load', () => {
-            ;(window as any).hbspt.forms.create({
-                portalId: '2762526',
-                formId: '6170d9b0-fa5b-4240-9f47-f3a3aa9557c9',
-                target: '#hubspotTrialForm',
-                onFormSubmit: (e: Event) => {
-                    eventLogger.trackContactUsFormSubmitted()
-                },
-            })
+interface HubSpotForm {
+    portalId: string
+    formId: string
+    targetId: string
+    onFormSubmit?: () => void
+}
+
+export function createHubSpotForm({ portalId, formId, targetId, onFormSubmit }: HubSpotForm): void {
+    const script = document.createElement('script')
+    script.src = '//js.hsforms.net/forms/v2.js'
+    const hubspot = document.getElementById(targetId)
+    hubspot!.appendChild(script)
+    script.addEventListener('load', () => {
+        ;(window as any).hbspt.forms.create({
+            portalId,
+            formId,
+            target: `#${targetId}`,
+            onFormSubmit,
         })
-    }
+    })
+}
 
-    public render(): JSX.Element | null {
-        return (
-            <Layout location={this.props.location}>
-                <div className="bg-white text-dark pt-6">
-                    <div className="jumbotron text-right dark-7">
-                        <div className="row">
-                            <div className="sales py-0 d-flex flex-grow flex-column flex-lg-row align-items-center justify-content-around">
-                                <div>
-                                    <h1 className="text-center">Try Sourcegraph Unlimited free for 30 days</h1>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <section className="d-flex justify-content-around flex-column flex-lg-row sales">
-                        <div className="panel-area mr-lg-5 mt-0 mb-2">
-                            <div className="d-flex flex-column panel">
-                                <h3>Your team will love Sourcegraph Unlimited</h3>
-                                <p>The best way to search and browse all of your organization's code, with:</p>
-                                <ul className="list pl0">
-                                    <li className="mb-2">
-                                        <div className="">High-scale cluster deployment</div>
-                                    </li>
-                                    <li className="mb-2">Repository-level user permissions</li>
-                                    <li className="mb-2">Advanced logging</li>
-                                    <li className="mb-2">External database support</li>
-                                    <li className="mb-2">Premium support</li>
-                                    <li>Private Sourcegraph extension registry</li>
-                                </ul>
-                                <div className="panel__help">
-                                    <strong>Need help?</strong>
-                                    <p>
-                                        Contact us at{' '}
-                                        <a href="mailto:support@sourcegraph.com">support@sourcegraph.com</a>, or file
-                                        issues on our{' '}
-                                        <a href="https://github.com/sourcegraph/sourcegraph/issues">
-                                            public issue tracker
-                                        </a>
-                                        .
-                                    </p>
-                                </div>
+export default ((props: any) => {
+    useLayoutEffect(() => {
+        createHubSpotForm({
+            portalId: '2762526',
+            formId: '6170d9b0-fa5b-4240-9f47-f3a3aa9557c9',
+            targetId: 'hubspotContactForm',
+            onFormSubmit: () => eventLogger.trackContactUsFormSubmitted(),
+        })
+    }, [])
+    return (
+        <Layout location={props.location} minimal={true}>
+            <script charSet="utf-8" type="text/javascript" src="//js.hsforms.net/forms/v2.js" />
+            <div className="bg-white text-dark">
+                <div className="container-lg py-6 px-5">
+                    <div className="row flex-wrap-reverse">
+                        <div className="col-md-6">
+                            <h1 className="display-4">Contact product specialist</h1>
+                            <h3 className="font-weight-light text-sans-serif">
+                                Let us know how we can help. We'll follow up soon.
+                            </h3>
+                            <div className="form mt-5">
+                                <div id="hubspotContactForm" className="d-flex justify-center" />
                             </div>
                         </div>
-                        <div className="form-area">
-                            <div>
-                                <h1>Register for your free trial</h1>
-                            </div>
-                            <div className="form">
-                                <div id="hubspotTrialForm" className="d-flex justify-center" />
-                            </div>
+                        <div className="col-md-6">
+                            <CustomerLogosSection className="mt-3 mb-6" />
                         </div>
-                    </section>
+                    </div>
                 </div>
-            </Layout>
-        )
-    }
-}
+            </div>
+        </Layout>
+    )
+}) as React.FunctionComponent<any>
diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx
index a2013883a32..1d3900da11a 100644
--- a/website/src/pages/index.tsx
+++ b/website/src/pages/index.tsx
@@ -11,7 +11,7 @@ import { ProductFeaturesAndUseCases } from '../components/product/ProductFeature
 import { Testimonials } from '../components/Testimonials'
 import { ContactPresalesSupportAction } from '../css/components/actions/ContactPresalesSupportAction'
 import { GetSourcegraphNowActions } from '../css/components/actions/GetSourcegraphNowActions'
-import { GetStartedAction } from '../css/components/actions/GetStartedAction'
+import { RequestDemoAction } from '../css/components/actions/RequestDemoAction'
 import { ViewDeveloperDocumentationAction } from '../css/components/actions/ViewDeveloperDocumentationAction'
 
 export default ((props: any) => (
@@ -50,8 +50,9 @@ export default ((props: any) => (
                             <strong>Sourcegraph</strong> provides this standard developer&nbsp;platform to every
                             company, helping startups and large&nbsp;enterprises ship better software faster.
                         </p>
-                        <GetStartedAction className="mt-5" />
-                        <ViewDeveloperDocumentationAction className="text-light mt-3" />
+                        <RequestDemoAction className="mt-5" />
+                        <ContactPresalesSupportAction className="text-light mt-3" />
+                        <ViewDeveloperDocumentationAction className="text-light mt-2" />
                     </div>
                     <div className="col-lg-6 d-none">
                         <img src="/product-diagram-0.svg" style={{ width: 'inherit' }} />
diff --git a/website/src/pages/pricing.tsx b/website/src/pages/pricing.tsx
index 8a9e1ade69d..5fb1239624f 100644
--- a/website/src/pages/pricing.tsx
+++ b/website/src/pages/pricing.tsx
@@ -1,3 +1,4 @@
+import { Link } from 'gatsby'
 import * as React from 'react'
 import Helmet from 'react-helmet'
 import { ContentSection } from '../components/content/ContentSection'
@@ -79,6 +80,7 @@ export default ((props: any) => (
                                     { name: 'Cloud-managed option', id: 'deployment' },
                                     { name: 'Priority support', id: 'support' },
                                 ]}
+                                plusEverythingIn="Core"
                                 buttonLabel="Buy now"
                                 buttonHref="http://sourcegraph.com/subscriptions/new"
                             />
@@ -113,8 +115,9 @@ export default ((props: any) => (
                                     },
                                     { name: 'Audit logs', id: 'admin', future: true },
                                 ]}
+                                plusEverythingIn="Enterprise"
                                 buttonLabel="Buy now"
-                                buttonHref="/contact/sales"
+                                buttonHref="http://sourcegraph.com/subscriptions/new"
                             />
                         </div>
                     </div>
@@ -122,9 +125,15 @@ export default ((props: any) => (
             </div>
             <ContentSection color="purple" className="hero-section text-center py-5">
                 <h2>Try Sourcegraph Unlimited risk-free for 30 days</h2>
-                <a className="btn btn-lg btn-outline-light mt-3" href="/contact/sales">
+                <Link className="btn btn-lg btn-outline-light mt-3 font-weight-normal" to="/contact/request-demo">
                     Free trial
-                </a>
+                </Link>
+            </ContentSection>
+            <ContentSection color="primary" className="hero-section text-center py-5">
+                <h2>Questions?</h2>
+                <Link className="btn btn-lg btn-outline-light mt-3 font-weight-normal" to="/contact/sales">
+                    Contact sales
+                </Link>
             </ContentSection>
             <div className="pricing-page__compare container-fluid py-6">
                 <h2 className="text-center display-4 mb-6">Compare plans</h2>
diff --git a/website/src/pages/product/code-alerts-automation.tsx b/website/src/pages/product/code-alerts-automation.tsx
index 26b4f49d2ca..4cd5ae07cc8 100644
--- a/website/src/pages/product/code-alerts-automation.tsx
+++ b/website/src/pages/product/code-alerts-automation.tsx
@@ -13,8 +13,8 @@ import { IntegratesWithSection } from '../../components/product/IntegratesWithSe
 import { OpenSourcePrivacyFeatureItem } from '../../components/product/OpenSourcePrivacyFeatureItem'
 import { ContactPresalesSupportAction } from '../../css/components/actions/ContactPresalesSupportAction'
 import { GetSourcegraphNowActions } from '../../css/components/actions/GetSourcegraphNowActions'
+import { RequestDemoAction } from '../../css/components/actions/RequestDemoAction'
 import { ViewDeveloperDocumentationAction } from '../../css/components/actions/ViewDeveloperDocumentationAction'
-import { GetStartedAction } from '../../css/components/actions/GetStartedAction'
 
 export default ((props: any) => (
     <Layout location={props.location}>
@@ -23,14 +23,20 @@ export default ((props: any) => (
             description="Continuously monitor all changes to all repositories for risky or important changes. Get instant email, Slack, or webhook notifications for every hit."
             mainActions={
                 <div className="d-flex flex-column align-items-center">
-                    <GetStartedAction className="mt-4" />
+                    <RequestDemoAction className="mt-3" />
+                    <ContactPresalesSupportAction className="mt-3 text-light" />
                     <ViewDeveloperDocumentationAction
-                        className="text-light my-3"
+                        className="text-light mt-2"
                         url="https://docs.sourcegraph.com/user/search/saved_searches"
                     >
                         Documentation
                     </ViewDeveloperDocumentationAction>
-                    {/*<ContactPresalesSupportAction className="text-light" /> TODO(sqs) */}
+                    <ViewDeveloperDocumentationAction
+                        className="text-light mt-2"
+                        url="https://docs.sourcegraph.com/#quickstart"
+                    >
+                        Install
+                    </ViewDeveloperDocumentationAction>
                 </div>
             }
         >
diff --git a/website/src/pages/product/code-review.tsx b/website/src/pages/product/code-review.tsx
index 08616ab865b..1bace0bfaa7 100644
--- a/website/src/pages/product/code-review.tsx
+++ b/website/src/pages/product/code-review.tsx
@@ -19,6 +19,7 @@ import { OpenSourcePrivacyFeatureItem } from '../../components/product/OpenSourc
 import { SupportedProgrammingLanguagesLink } from '../../components/product/SupportedProgrammingLanguagesLink'
 import { ContactPresalesSupportAction } from '../../css/components/actions/ContactPresalesSupportAction'
 import { GetSourcegraphNowActions } from '../../css/components/actions/GetSourcegraphNowActions'
+import { RequestDemoAction } from '../../css/components/actions/RequestDemoAction'
 import { ViewDeveloperDocumentationAction } from '../../css/components/actions/ViewDeveloperDocumentationAction'
 
 export default ((props: any) => (
@@ -28,19 +29,20 @@ export default ((props: any) => (
             description="Start doing code reviews right. Sourcegraph enhances your existing code review tool with inline code intelligence, helping you speed up the review cycle and catch more bugs before they're deployed to production."
             mainActions={
                 <div className="d-flex flex-column align-items-center">
+                    <RequestDemoAction className="mt-3" />
                     <a
-                        className="btn btn-primary mb-2"
+                        className="btn btn-outline-primary mt-3"
                         href="https://docs.sourcegraph.com/integration/browser_extension"
                     >
                         Install browser extension
                     </a>
+                    <ContactPresalesSupportAction className="mt-3 text-light" />
                     <ViewDeveloperDocumentationAction
-                        className="text-light my-1"
+                        className="text-light mt-2"
                         url="https://docs.sourcegraph.com/integration"
                     >
                         Code review integrations documentation
                     </ViewDeveloperDocumentationAction>
-                    {/*<ContactPresalesSupportAction className="text-light" /> TODO(sqs) */}
                 </div>
             }
         >
diff --git a/website/src/pages/product/code-search-navigation.tsx b/website/src/pages/product/code-search-navigation.tsx
index 6ab7ce8b68d..faebe1f6957 100644
--- a/website/src/pages/product/code-search-navigation.tsx
+++ b/website/src/pages/product/code-search-navigation.tsx
@@ -20,6 +20,7 @@ import { SupportedProgrammingLanguagesLink } from '../../components/product/Supp
 import { UseCasesTable } from '../../components/product/UseCasesTable'
 import { ContactPresalesSupportAction } from '../../css/components/actions/ContactPresalesSupportAction'
 import { GetSourcegraphNowActions } from '../../css/components/actions/GetSourcegraphNowActions'
+import { RequestDemoAction } from '../../css/components/actions/RequestDemoAction'
 import { ViewDeveloperDocumentationAction } from '../../css/components/actions/ViewDeveloperDocumentationAction'
 
 export default ((props: any) => (
@@ -29,16 +30,14 @@ export default ((props: any) => (
             description="Code search helps you grok code so you can write better code more quickly. Sourcegraph's code search is used by elite software teams."
             mainActions={
                 <div className="d-flex flex-column align-items-center">
-                    <a className="btn btn-primary mb-2" href="https://docs.sourcegraph.com/#quickstart">
-                        Install
-                    </a>
+                    <RequestDemoAction className="mt-3" />
+                    <ContactPresalesSupportAction className="mt-3 text-light" />
                     <ViewDeveloperDocumentationAction
-                        className="text-light my-1"
-                        url="https://docs.sourcegraph.com/user/search"
+                        className="text-light mt-2"
+                        url="https://docs.sourcegraph.com/#quickstart"
                     >
-                        Code search documentation
+                        Documentation &amp; self-service install
                     </ViewDeveloperDocumentationAction>
-                    {/*<ContactPresalesSupportAction className="text-light" /> TODO(sqs) */}
                 </div>
             }
         >
diff --git a/website/src/pages/product/index.tsx b/website/src/pages/product/index.tsx
index d9ba1d20360..a01b6a8f932 100644
--- a/website/src/pages/product/index.tsx
+++ b/website/src/pages/product/index.tsx
@@ -18,15 +18,15 @@ import { ProductDemoVideo } from '../../components/product/ProductDemoVideo'
 import { ProductFeaturesAndUseCases } from '../../components/product/ProductFeaturesAndUseCases'
 import { ContactPresalesSupportAction } from '../../css/components/actions/ContactPresalesSupportAction'
 import { GetSourcegraphNowActions } from '../../css/components/actions/GetSourcegraphNowActions'
-import { GetStartedAction } from '../../css/components/actions/GetStartedAction'
+import { RequestDemoAction } from '../../css/components/actions/RequestDemoAction'
 import { ViewDeveloperDocumentationAction } from '../../css/components/actions/ViewDeveloperDocumentationAction'
 export default ((props: any) => {
     const actions = (
         <div className="d-flex justify-content-center mt-6">
             <div>
-                <GetStartedAction />
-                {/*<ContactPresalesSupportAction className="text-light" /> TODO(sqs) */}
-                <ViewDeveloperDocumentationAction className="mt-3 text-light" />
+                <RequestDemoAction />
+                <ContactPresalesSupportAction className="mt-3 text-light" />
+                <ViewDeveloperDocumentationAction className="mt-2 text-light" />
             </div>
         </div>
     )