diff --git a/packages/netlify-cms-core/src/components/App/Header.js b/packages/netlify-cms-core/src/components/App/Header.js
index 35909e33..b10dcd03 100644
--- a/packages/netlify-cms-core/src/components/App/Header.js
+++ b/packages/netlify-cms-core/src/components/App/Header.js
@@ -47,9 +47,7 @@ const AppHeaderContent = styled.div`
 `;
 
 const AppHeaderButton = styled.button`
-  border: 0;
-  cursor: pointer;
-  background-color: transparent;
+  ${buttons.button};
   color: #7b8290;
   font-size: 16px;
   font-weight: 500;
@@ -103,8 +101,6 @@ export default class Header extends React.Component {
     displayUrl: PropTypes.string,
   };
 
-  static activeClassName = `${uuid()}-active`;
-
   handleCreatePostClick = (collectionName) => {
     const { onCreateEntryClick } = this.props;
     if (onCreateEntryClick) {
@@ -132,7 +128,7 @@ export default class Header extends React.Component {
             <nav>
               <AppHeaderNavLink
                 to="/"
-                activeClassName={Header.activeClassName}
+                activeClassName="header-link-active"
                 isActive={(match, location) => location.pathname.startsWith('/collections/')}
               >
                 <Icon type="page"/>
@@ -140,7 +136,7 @@ export default class Header extends React.Component {
               </AppHeaderNavLink>
               {
                 hasWorkflow
-                  ? <AppHeaderNavLink to="/workflow" activeClassName={Header.activeClassName}>
+                  ? <AppHeaderNavLink to="/workflow" activeClassName="header-link-active">
                       <Icon type="workflow"/>
                       Workflow
                     </AppHeaderNavLink>
diff --git a/packages/netlify-cms-core/src/components/Collection/Sidebar.js b/packages/netlify-cms-core/src/components/Collection/Sidebar.js
index 5a81f46a..bb1755e3 100644
--- a/packages/netlify-cms-core/src/components/Collection/Sidebar.js
+++ b/packages/netlify-cms-core/src/components/Collection/Sidebar.js
@@ -97,8 +97,6 @@ export default class Sidebar extends React.Component {
     collections: ImmutablePropTypes.orderedMap.isRequired,
   };
 
-  static sidebarLinkActiveClassName = `${uuid()}-sidebar-active`;
-
   state = { query: this.props.searchTerm || '' };
 
   renderLink = collection => {
@@ -107,7 +105,7 @@ export default class Sidebar extends React.Component {
       <SidebarNavLink
         key={collectionName}
         to={`/collections/${collectionName}`}
-        activeClassName={Sidebar.sidebarLinkActiveClassName}
+        activeClassName="sidebar-active"
       >
         <Icon type="write"/>
         {collection.get('label')}
diff --git a/packages/netlify-cms-widget-relation/src/RelationControl.js b/packages/netlify-cms-widget-relation/src/RelationControl.js
index 86307661..9dd543d0 100644
--- a/packages/netlify-cms-widget-relation/src/RelationControl.js
+++ b/packages/netlify-cms-widget-relation/src/RelationControl.js
@@ -1,55 +1,49 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { css } from 'react-emotion';
+import { injectGlobal, css } from 'react-emotion';
 import Autosuggest from 'react-autosuggest';
 import uuid from 'uuid/v4';
 import { List, Map } from 'immutable';
 import { debounce } from 'lodash';
 import { Loader, components } from 'netlify-cms-ui-default';
 
-/**
- * Create a classname for use as a descendant selector. This is generally
- * discouraged in Emotion because composition will break the resulting
- * classnames, but we won't be using composition here.
- */
-const styles = {
-  suggestionsContainer: css`
-    display: none;
-  `,
-};
-
-/**
- * react-autosuggest theme spec:
- * https://github.com/moroshko/react-autosuggest#theme-optional
- */
-const theme = {
-  container: css`
+injectGlobal`
+  .react-autosuggest__container {
     position: relative;
-  `,
-  containerOpen: css`
-    ${styles.suggestionsContainer} {
-      ${components.dropdownList}
-      position: absolute;
-      display: block;
-      top: 51px;
-      width: 100%;
-      z-index: 2;
-    }
-  `,
-  suggestion: css`
-    ${components.drodpownItem};
-    cursor: pointer;
-    padding: 10px 20px;
-  `,
-  suggestionsList: css`
+  }
+
+  .react-autosuggest__suggestions-container {
+    display: none;
+  }
+
+  .react-autosuggest__container--open .react-autosuggest__suggestions-container {
+    ${components.dropdownList}
+    position: absolute;
+    display: block;
+    top: 51px;
+    width: 100%;
+    z-index: 2;
+  }
+
+  .react-autosuggest__suggestion {
+    ${components.dropdownItem}
+  }
+
+  .react-autosuggest__suggestions-list {
     margin: 0;
     padding: 0;
     list-style-type: none;
-  `,
-  suggestionHighlighted: css`
+  }
+
+  .react-autosuggest__suggestion {
+    cursor: pointer;
+    padding: 10px 20px;
+  }
+
+  .react-autosuggest__suggestion--focused {
     background-color: #ddd;
-  `,
-};
+  }
+`
 
 function escapeRegexCharacters(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -93,15 +87,12 @@ export default class RelationControl extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    console.log(`receiving`);
-    console.log(nextProps.queryHits && nextProps.queryHits.get(this.controlID));
     if (this.didInitialSearch) return;
     if (nextProps.queryHits !== this.props.queryHits && nextProps.queryHits.get && nextProps.queryHits.get(this.controlID)) {
       this.didInitialSearch = true;
       const suggestion = nextProps.queryHits.get(this.controlID);
       if (suggestion && suggestion.length === 1) {
         const val = this.getSuggestionValue(suggestion[0]);
-        console.log(`accepting ${val}`);
         this.props.onChange(val, { [nextProps.field.get('collection')]: { [val]: suggestion[0].data } });
       }
     }
@@ -121,7 +112,6 @@ export default class RelationControl extends React.Component {
     const { field } = this.props;
     const collection = field.get('collection');
     const searchFields = field.get('searchFields').toJS();
-    console.log(`querying ${value}`);
     this.props.query(this.controlID, collection, searchFields, value);
   }, 500);
 
@@ -182,7 +172,6 @@ export default class RelationControl extends React.Component {
           renderSuggestion={this.renderSuggestion}
           inputProps={inputProps}
           focusInputOnSuggestionClick={false}
-          theme={theme}
         />
         <Loader active={isFetching === this.controlID} />
       </div>