diff --git a/packages/gitbook-core/src/components/InjectedComponent.js b/packages/gitbook-core/src/components/InjectedComponent.js
index 216d83fb4..097edaf51 100644
--- a/packages/gitbook-core/src/components/InjectedComponent.js
+++ b/packages/gitbook-core/src/components/InjectedComponent.js
@@ -43,21 +43,22 @@ const Injection = React.createClass({
 
 const InjectedComponentSet = React.createClass({
     propTypes: {
-        components:    React.PropTypes.oneOfType([
+        components: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.func),
             React.PropTypes.instanceOf(List)
         ]).isRequired,
-        props:         React.PropTypes.object,
-        withContainer: React.PropTypes.bool
+        props:    React.PropTypes.object,
+        children: React.PropTypes.node
     },
 
     render() {
-        const { components, props, ...divProps } = this.props;
+        const { components, props, children, ...divProps } = this.props;
 
         const inner = components.map((Comp, i) => <Injection key={i} component={Comp} props={props} />);
 
         return (
             <div {...divProps}>
+                {children}
                 {inner}
             </div>
         );
diff --git a/packages/gitbook-plugin-search/package.json b/packages/gitbook-plugin-search/package.json
index 191083251..db5e9ae61 100644
--- a/packages/gitbook-plugin-search/package.json
+++ b/packages/gitbook-plugin-search/package.json
@@ -28,4 +28,4 @@
   "bugs": {
     "url": "https://github.com/GitbookIO/gitbook/issues"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/gitbook-plugin-theme-default/src/components/Toolbar.js b/packages/gitbook-plugin-theme-default/src/components/Toolbar.js
index 298017d63..d426a405c 100644
--- a/packages/gitbook-plugin-theme-default/src/components/Toolbar.js
+++ b/packages/gitbook-plugin-theme-default/src/components/Toolbar.js
@@ -21,10 +21,11 @@ const Toolbar = React.createClass({
         return (
             <GitBook.FlexLayout className="Toolbar">
                 <GitBook.FlexBox className="Toolbar-left">
-                    <GitBook.Button onClick={this.onToggle}>
-                        <GitBook.Icon id="align-justify" />
-                    </GitBook.Button>
-                    <GitBook.InjectedComponentSet align="flex-start" matching={{ role: 'toolbar:buttons:left' }} />
+                    <GitBook.InjectedComponentSet align="flex-end" matching={{ role: 'toolbar:buttons:left' }}>
+                        <GitBook.Button onClick={this.onToggle}>
+                            <GitBook.Icon id="align-justify" />
+                        </GitBook.Button>
+                    </GitBook.InjectedComponentSet>
                 </GitBook.FlexBox>
                 <GitBook.FlexBox auto>
                     <h1 className="Toolbar-Title">