diff --git a/web/client/plugins/GridContainer.jsx b/web/client/plugins/GridContainer.jsx
index 88d5e9a4ec..ae983b4b9d 100644
--- a/web/client/plugins/GridContainer.jsx
+++ b/web/client/plugins/GridContainer.jsx
@@ -51,7 +51,7 @@ const GridContainer = React.createClass({
             className={this.props.className}
             mapType={this.props.mapType}
             container={(props) => (<Grid fluid><Row>
-                        {props.children.map( item => <Col xs={12} xsOffset={0} sm={6} smOffset={3} smOffset={0}>{item}</Col>)}
+                        {props.children.map( (item, idx) => <Col key={idx} xs={12} xsOffset={0} sm={6} smOffset={3} smOffset={0}>{item}</Col>)}
                 </Row></Grid>)}
             toolStyle="primary"
             activeStyle="default"
diff --git a/web/client/plugins/ScrollTop.jsx b/web/client/plugins/ScrollTop.jsx
index 7e17262045..e1dbba57ff 100644
--- a/web/client/plugins/ScrollTop.jsx
+++ b/web/client/plugins/ScrollTop.jsx
@@ -45,7 +45,7 @@ const ScrollTop = React.createClass({
     render() {
         return (
             <ScrollUp style={this.props.style} showUnder={this.props.showUnder}>
-                <OverlayTrigger placement="left" overlay={<Tooltip><Message msgId="home.scrollTop"/></Tooltip>}>
+                <OverlayTrigger placement="left" overlay={<Tooltip id="scrollTop-button-tooltip"><Message msgId="home.scrollTop"/></Tooltip>}>
                     <Button bsStyle="primary" className={this.props.btnClassName}><Glyphicon glyph="arrow-up"/></Button>
                 </OverlayTrigger>
             </ScrollUp>);