diff --git a/web/client/components/TOC/fragments/LayersTool.jsx b/web/client/components/TOC/fragments/LayersTool.jsx
index d8e757172f..9c5ee8b739 100644
--- a/web/client/components/TOC/fragments/LayersTool.jsx
+++ b/web/client/components/TOC/fragments/LayersTool.jsx
@@ -19,7 +19,7 @@ const LayersTool = React.createClass({
         onClick: React.PropTypes.func,
         style: React.PropTypes.object,
         glyph: React.PropTypes.string,
-        tooltip: React.PropTypes.tooltip
+        tooltip: React.PropTypes.string
     },
     getDefaultProps() {
         return {
@@ -32,7 +32,7 @@ const LayersTool = React.createClass({
                    glyph={this.props.glyph}
                    onClick={(options) => this.props.onClick(this.props.node, options || {})}/>);
         return this.props.tooltip ? (
-           <OverlayTrigger placement="bottom" overlay={(<Tooltip><strong><Message msgId={this.props.tooltip}/></strong></Tooltip>)}>
+           <OverlayTrigger placement="bottom" overlay={(<Tooltip id={"Tooltip-" + this.props.tooltip}><strong><Message msgId={this.props.tooltip}/></strong></Tooltip>)}>
                {tool}
            </OverlayTrigger>) : tool;
 
diff --git a/web/client/components/file/FileUploader.jsx b/web/client/components/file/FileUploader.jsx
index 009b12f63d..09374ce08f 100644
--- a/web/client/components/file/FileUploader.jsx
+++ b/web/client/components/file/FileUploader.jsx
@@ -118,7 +118,7 @@ const FileUploader = React.createClass({
                     height: "100px",
                     textAlign: "center"
                 }}>
-                    <Glyphicon glyph="open-file" />
+                    <Glyphicon glyph="upload" />
                     {this.props.dropMessage}
                 </span>
                 </div>
diff --git a/web/client/components/misc/Dialog.jsx b/web/client/components/misc/Dialog.jsx
index 80f8058279..35abfe23a8 100644
--- a/web/client/components/misc/Dialog.jsx
+++ b/web/client/components/misc/Dialog.jsx
@@ -70,7 +70,7 @@ const Dialog = React.createClass({
         return React.Children.toArray(this.props.children).filter((child) => child.props.role === role);
     },
     render() {
-        const dialog = (<Draggable className="modal-content" start={this.props.start} handle=".draggable-header, .draggable-header *">
+        const dialog = (<Draggable start={this.props.start} handle=".draggable-header, .draggable-header *">
             <div id={this.props.id} style={{zIndex: 3, ...this.props.style}} className={this.props.className + " modal-dialog-container"}>
                 <div className={this.props.headerClassName + " draggable-header"}>
                     {this.renderRole('header')}
diff --git a/web/client/plugins/MetadataExplorer.jsx b/web/client/plugins/MetadataExplorer.jsx
index 39734f9c22..1e786725cc 100644
--- a/web/client/plugins/MetadataExplorer.jsx
+++ b/web/client/plugins/MetadataExplorer.jsx
@@ -56,7 +56,7 @@ const MetadataExplorerComponent = React.createClass({
         panelClassName: React.PropTypes.string,
         toggleControl: React.PropTypes.func,
         closeGlyph: React.PropTypes.string,
-        buttonStyle: React.PropTypes.string,
+        buttonStyle: React.PropTypes.object,
         style: React.PropTypes.object
     },
     getDefaultProps() {
diff --git a/web/client/plugins/Styler.jsx b/web/client/plugins/Styler.jsx
index 255a5de8c8..8ead83e978 100644
--- a/web/client/plugins/Styler.jsx
+++ b/web/client/plugins/Styler.jsx
@@ -192,7 +192,7 @@ const Styler = React.createClass({
 
         if (layer && layer.params && layer.params.SLD_BODY && this.props.layer && this.getRestURL(this.props.layer.url)) {
             return (
-                <Button style={{margin: "4px"}} onClick={this.saveStyle}>Save</Button>
+                <Button style={{marginRight: "4px"}} onClick={this.saveStyle}>Save</Button>
             );
         }
 
@@ -207,7 +207,9 @@ const Styler = React.createClass({
     renderZoom() {
         let originalLayer = this.findOriginalLayer(this.props, this.props);
         if (originalLayer && originalLayer.capabilities) {
-            return <Button key="zoom-btn" onClick={this.zoomToLayerExtent} ><Glyphicon glyph="search" />Zoom To Layer</Button>;
+            return (<Button key="zoom-btn" style={{
+                "float": "right"
+                }}onClick={this.zoomToLayerExtent} ><Glyphicon glyph="search" />Zoom To Layer</Button>);
         }
     },
     renderBody() {
@@ -215,12 +217,9 @@ const Styler = React.createClass({
         return (<Grid fluid>
                 {this.renderSelector()}
                 {this.props.layer ? this.renderStyler() : this.renderWaitOrError()}
-                <Row>
+                <Row style={{margin: "4px 0"}}>
                     {this.props.layer && this.props.canSave ? this.renderSave() : null}
-                    {this.renderReset()}
-                </Row>
-                <Row>
-                    {this.renderZoom()}
+                    {this.renderReset()}{this.renderZoom()}
                 </Row>
                 </Grid>);
     },
diff --git a/web/client/plugins/VectorStyler.jsx b/web/client/plugins/VectorStyler.jsx
index 3730b72f06..cd6511387f 100644
--- a/web/client/plugins/VectorStyler.jsx
+++ b/web/client/plugins/VectorStyler.jsx
@@ -206,11 +206,11 @@ const VectorStyler = React.createClass({
         return (
             <Row>
             <Col sm={3} style={{padding: 0}}><Button onClick={this.props.addRule}>
-            <Message msgId="vectorstyler.addrulebtn"/></Button></Col>
+            <Glyphicon glyph="plus" /><Message msgId="vectorstyler.addrulebtn"/></Button></Col>
             <Col sm={3} style={{padding: 0}}>
             <Button disabled={disabled}
             onClick={() => this.props.removeRule(this.props.rule.id)}>
-            <Message msgId="vectorstyler.removerulebtn"/></Button></Col>
+            <Glyphicon glyph="minus" /><Message msgId="vectorstyler.removerulebtn"/></Button></Col>
             <Col sm={4} smOffset={2} style={{padding: 0}}>
             <Button style={{"float": "right"}} onClick={this.apply}
             disabled={disabled} ><Message msgId="vectorstyler.applybtn"/></Button>
diff --git a/web/client/reducers/vectorstyler.js b/web/client/reducers/vectorstyler.js
index 2d185df13c..87bf5d1c84 100644
--- a/web/client/reducers/vectorstyler.js
+++ b/web/client/reducers/vectorstyler.js
@@ -84,7 +84,7 @@ function vectorstyler(state = initialSpec, action) {
             const newRule = {
                 id: action.id,
                 symbol: getBaseSymbol(getType(state.layer)),
-                name: 'Test Name'
+                name: 'New Rule'
             };
 
             return assign({}, state, {rule: newRule.id, rules: (state.rules ? [...state.rules, newRule] : [newRule])});