diff --git a/package.json b/package.json
index 224ddd0f79..84b44f4b9d 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "react-motion": "0.4.4",
     "react-router": "2.4.0",
     "react-router-redux": "2.1.0",
-    "react-select": "1.0.0-beta14",
+    "react-select": "1.0.0-rc.1",
     "react-transform-catch-errors": "1.0.2",
     "redbox-react": "1.2.4",
     "redux-devtools": "3.1.1",
diff --git a/web/client/actions/__tests__/layers-test.js b/web/client/actions/__tests__/layers-test.js
index 937d5f4d8f..3fc4c94c24 100644
--- a/web/client/actions/__tests__/layers-test.js
+++ b/web/client/actions/__tests__/layers-test.js
@@ -33,7 +33,8 @@ var {
     removeLayer,
     showSettings,
     hideSettings,
-    updateSettings
+    updateSettings,
+    getLayerCapabilities
 } = require('../layers');
 
 describe('Test correctness of the layers actions', () => {
@@ -167,4 +168,25 @@ describe('Test correctness of the layers actions', () => {
         expect(action.type).toBe(UPDATE_SETTINGS);
         expect(action.options).toEqual({opacity: 0.5, size: 500});
     });
+    it('get layer capabilities', (done) => {
+        const layer = {
+            id: "TEST_ID",
+            name: 'testworkspace:testlayer',
+            title: 'Layer',
+            visibility: true,
+            storeIndex: 9,
+            type: 'shapefile',
+            url: 'base/web/client/test-resources/geoserver/wms'
+        };
+        const actionCall = getLayerCapabilities(layer);
+        expect(actionCall).toExist();
+        actionCall((action)=> {
+            expect(action).toExist();
+            expect(action.options).toExist();
+            expect(action.type === UPDATE_NODE);
+            if (action.options.capabilities) {
+                done();
+            }
+        });
+    });
 });
diff --git a/web/client/actions/layers.js b/web/client/actions/layers.js
index 36e6d1f98f..7f6358e381 100644
--- a/web/client/actions/layers.js
+++ b/web/client/actions/layers.js
@@ -196,6 +196,9 @@ function getLayerCapabilities(layer, options) {
     }
     return (dispatch) => {
         // TODO, look ad current cached capabilities;
+        dispatch(updateNode(layer.id, "id", {
+            capabilitiesLoading: true
+        }));
         return WMS.getCapabilities(reqUrl, options).then((capabilities) => {
             let layers = _.get(capabilities, "capability.layer.layer");
             let layerCapability;
@@ -213,6 +216,7 @@ function getLayerCapabilities(layer, options) {
             if (layerCapability) {
                 dispatch(updateNode(layer.id, "id", {
                     capabilities: layerCapability,
+                    capabilitiesLoading: null,
                     boundingBox: layerCapability.latLonBoundingBox,
                     availableStyles: layerCapability.style && (Array.isArray(layerCapability.style) ? layerCapability.style : [layerCapability.style])
                 }));
@@ -220,7 +224,7 @@ function getLayerCapabilities(layer, options) {
             // return dispatch(updateNode(layer.id, "id", {capabilities: capabilities || {"error": "no describe Layer found"}}));
 
         }).catch((error) => {
-            dispatch(updateNode(layer.id, "id", {capabilities: {error: "error getting capabilities", details: error}} ));
+            dispatch(updateNode(layer.id, "id", {capabilitiesLoading: null, capabilities: {error: "error getting capabilities", details: error}} ));
 
             // return dispatch(updateNode(layer.id, "id", {capabilities: capabilities || {"error": "no describe Layer found"}}));
 
diff --git a/web/client/components/TOC/fragments/settings/WMSStyle.jsx b/web/client/components/TOC/fragments/settings/WMSStyle.jsx
index 146a1ae574..e2543d60e4 100644
--- a/web/client/components/TOC/fragments/settings/WMSStyle.jsx
+++ b/web/client/components/TOC/fragments/settings/WMSStyle.jsx
@@ -7,7 +7,7 @@
  */
 
 var React = require('react');
-// const Message = require('../../../I18N/Message');
+const Message = require('../../../I18N/Message');
 const Select = require('react-select');
 const {Button, Glyphicon, Alert} = require('react-bootstrap');
 
@@ -29,28 +29,39 @@ const WMSStyle = React.createClass({
         };
     },
     renderLegend() {
-        if (this.props.element && this.props.element.availableStyles) {
-            let i = this.props.element.availableStyles.findIndex((item) => item.name === this.props.element.style);
-            if (i >= 0) {
-                let style = this.props.element.availableStyles[i];
-                let legendUrl = style.legendURL && style.legendURL[0];
-            }
-        }
+        // legend can not added because of this issue
+        // https://github.com/highsource/ogc-schemas/issues/183
+        return null;
     },
     renderError() {
         if (this.props.element && this.props.element.capabilities && this.props.element && this.props.element.capabilities.error) {
-            return <Alert bsStyle="danger">There was an error getting layer's style list</Alert>;
+            return <Alert bsStyle="danger"><Message msgId="layerProperties.styleListLoadError" /></Alert>;
         }
     },
     render() {
+        let options = [{label: "Default Style", value: ""}].concat((this.props.element.availableStyles || []).map((item) => {
+            return {label: item.title || item.name, value: item.name};
+        }));
+        let currentStyleIndex = this.props.element.style && this.props.element.availableStyles && this.props.element.availableStyles.findIndex( el => el.name === this.props.element.style);
+        if (!(currentStyleIndex >= 0) && this.props.element.style) {
+            options.push({label: this.props.element.style, value: this.props.element.style });
+        }
         return (<form ref="style">
-            <Select
-                    allowCreate={true}
+            <Select.Creatable
                     key="styles-dropdown"
-                    options={[{label: "Default Style", value: ""}].concat((this.props.element.availableStyles && this.props.element.availableStyles || []).map((item) => {
-                        return {label: item.title || item.name, value: item.name};
-                    }))}
+                    options={options}
+                    isLoading={this.props.element && this.props.element.capabilitiesLoading}
                     value={this.props.element.style || ""}
+                    onOpen={() => {
+                        // automatic retrieve if availableStyles are not available or capabilities is not present
+                        // that means you don't have a list and you didn't try to load it.
+                        if (this.props.element && !(this.props.element.capabilities && this.props.element.availableStyles)) {
+                            this.props.retrieveLayerData(this.props.element);
+                        }
+                    }}
+                    promptTextCreator={(value) => {
+                        return <Message msgId="layerProperties.styleCustom" msgParams={{value}} />;
+                    }}
                     onChange={(selected) => {
                         this.updateEntry("style", {target: {value: (selected && selected.value) || ""}});
                     }}
diff --git a/web/client/components/TOC/fragments/settings/__tests__/WMSStyle-test.jsx b/web/client/components/TOC/fragments/settings/__tests__/WMSStyle-test.jsx
new file mode 100644
index 0000000000..907e066abd
--- /dev/null
+++ b/web/client/components/TOC/fragments/settings/__tests__/WMSStyle-test.jsx
@@ -0,0 +1,122 @@
+/**
+ * Copyright 2015, GeoSolutions Sas.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+var React = require('react/addons');
+var ReactDOM = require('react-dom');
+var ReactTestUtils = require('react-addons-test-utils');
+var WMSStyle = require('../WMSStyle');
+
+var expect = require('expect');
+
+describe('test  Layer Properties General module component', () => {
+    beforeEach((done) => {
+        document.body.innerHTML = '<div id="container"></div>';
+        setTimeout(done);
+    });
+
+    afterEach((done) => {
+        ReactDOM.unmountComponentAtNode(document.getElementById("container"));
+        document.body.innerHTML = '';
+        setTimeout(done);
+    });
+
+    it('tests component rendering', () => {
+        const l = {
+            name: 'testworkspace:testlayer',
+            title: 'Layer',
+            visibility: true,
+            storeIndex: 9,
+            type: 'shapefile',
+            url: 'base/web/client/test-resources/geoserver/wms'
+        };
+        const settings = {
+            options: {opacity: 1}
+        };
+
+        const comp = ReactDOM.render(<WMSStyle element={l} settings={settings} />, document.getElementById("container"));
+        expect(comp).toExist();
+        const form = ReactTestUtils.scryRenderedDOMComponentsWithTag( comp, "form" );
+        expect(form).toExist();
+
+    });
+    it('tests component events', () => {
+        const l = {
+            name: 'testworkspace:testlayer',
+            title: 'Layer',
+            visibility: true,
+            storeIndex: 9,
+            type: 'wms',
+            url: 'base/web/client/test-resources/geoserver/wms',
+            availableStyles: [{name: 'style1'}]
+
+        };
+        const settings = {
+            options: {opacity: 1}
+        };
+        const handlers = {
+            retrieveLayerData: () => {},
+            updateSettings: () => {}
+        };
+        let spyRetrive = expect.spyOn(handlers, "retrieveLayerData");
+        let spyUpdate = expect.spyOn(handlers, "updateSettings");
+
+        const comp = ReactDOM.render(<WMSStyle element={l} settings={settings} retrieveLayerData={handlers.retrieveLayerData} updateSettings={handlers.updateSettings}/>, document.getElementById("container"));
+        expect(comp).toExist();
+        // refresh layers list button click
+        const buttons = ReactTestUtils.scryRenderedDOMComponentsWithTag( comp, "button" );
+        expect(buttons).toExist();
+        expect(buttons.length).toBe(1);
+        ReactTestUtils.Simulate.click(buttons[0]);
+        expect(spyRetrive.calls.length).toBe(1);
+
+        // Simpulate selection
+        const selectArrow = ReactDOM.findDOMNode(comp).querySelector('.Select-arrow');
+        const selectControl = ReactDOM.findDOMNode(comp).querySelector('.Select-control');
+        const inputs = ReactTestUtils.scryRenderedDOMComponentsWithTag( comp, "input" );
+        ReactTestUtils.Simulate.mouseDown(selectArrow, { button: 0 });
+        ReactTestUtils.Simulate.keyDown(selectControl, { keyCode: 40, key: 'ArrowDown' });
+        ReactTestUtils.Simulate.keyDown(inputs[0], { keyCode: 13, key: 'Enter' });
+        expect(spyUpdate.calls.length).toBe(1);
+
+        // click on arrow of the select auto try to retrieve data if not present
+        const l2 = {
+            name: 'testworkspace:testlayer',
+            title: 'Layer',
+            visibility: true,
+            storeIndex: 9,
+            type: 'wms',
+            url: 'base/web/client/test-resources/geoserver/wms'
+        };
+        const comp1 = ReactDOM.render(<WMSStyle element={l2} settings={settings} retrieveLayerData={handlers.retrieveLayerData} updateSettings={handlers.updateSettings}/>, document.getElementById("container"));
+        const selectArrow1 = ReactDOM.findDOMNode(comp1).querySelector('.Select-arrow');
+        ReactTestUtils.Simulate.click(selectArrow1);
+        expect(spyRetrive.calls.length).toBe(2);
+    });
+    it('tests rendering error', () => {
+        const l = {
+            name: 'testworkspace:testlayer',
+            title: 'Layer',
+            visibility: true,
+            storeIndex: 9,
+            type: 'shapefile',
+            url: 'base/web/client/test-resources/geoserver/wms',
+            capabilities: {
+                error: "unable to retrieve capabiltiies"
+            }
+        };
+        const settings = {
+            options: {opacity: 1}
+        };
+        const comp = ReactDOM.render(<WMSStyle element={l} settings={settings} />, document.getElementById("container"));
+        expect(comp).toExist();
+        const form = ReactTestUtils.scryRenderedDOMComponentsWithTag( comp, "form" );
+        expect(form).toExist();
+
+    });
+
+});
diff --git a/web/client/plugins/Save.jsx b/web/client/plugins/Save.jsx
index 26cd5b3145..809db226b8 100644
--- a/web/client/plugins/Save.jsx
+++ b/web/client/plugins/Save.jsx
@@ -92,6 +92,9 @@ const Save = React.createClass({
                         opacity: layer.opacity,
                         provider: layer.provider,
                         styles: layer.styles,
+                        style: layer.style,
+                        availableStyles: layer.availableStyles,
+                        capabilitiesURL: layer.capabilitiesURL,
                         title: layer.title,
                         transparent: layer.transparent,
                         type: layer.type,
diff --git a/web/client/plugins/SaveAs.jsx b/web/client/plugins/SaveAs.jsx
index 56873414ee..d908c4c4c6 100644
--- a/web/client/plugins/SaveAs.jsx
+++ b/web/client/plugins/SaveAs.jsx
@@ -124,6 +124,9 @@ const SaveAs = React.createClass({
                 opacity: layer.opacity,
                 provider: layer.provider,
                 styles: layer.styles,
+                style: layer.style,
+                availableStyles: layer.availableStyles,
+                capabilitiesURL: layer.capabilitiesURL,
                 title: layer.title,
                 transparent: layer.transparent,
                 type: layer.type,
diff --git a/web/client/test-resources/geoserver/testworkspace/testlayer/wms b/web/client/test-resources/geoserver/testworkspace/testlayer/wms
new file mode 100644
index 0000000000..8dd5389112
--- /dev/null
+++ b/web/client/test-resources/geoserver/testworkspace/testlayer/wms
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE WMT_MS_Capabilities SYSTEM "https://test/geoserver/schemas/wms/1.1.1/WMS_MS_Capabilities.dtd?authkey=260a670e-4dc0-4719-8bc9-85555d7dcbe1">
+<WMT_MS_Capabilities version="1.1.1" updateSequence="2538">
+  <Service>
+    <Name>OGC:WMS</Name>
+    <Title>GeoServer Web Map Service</Title>
+    <Abstract>A compliant implementation of WMS plus most of the SLD extension (dynamic styling). Can also generate PDF, SVG, KML, GeoRSS</Abstract>
+    <KeywordList>
+      <Keyword>WFS</Keyword>
+      <Keyword>WMS</Keyword>
+      <Keyword>GEOSERVER</Keyword>
+    </KeywordList>
+    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://geoserver.sourceforge.net/html/index.php"/>
+    <ContactInformation>
+      <ContactPersonPrimary>
+        <ContactPerson>Claudius Ptolomaeus</ContactPerson>
+        <ContactOrganization>The ancient geographes INC</ContactOrganization>
+      </ContactPersonPrimary>
+      <ContactPosition>Chief geographer</ContactPosition>
+      <ContactAddress>
+        <AddressType>Work</AddressType>
+        <Address/>
+        <City>Alexandria</City>
+        <StateOrProvince/>
+        <PostCode/>
+        <Country>Egypt</Country>
+      </ContactAddress>
+      <ContactVoiceTelephone/>
+      <ContactFacsimileTelephone/>
+      <ContactElectronicMailAddress>claudius.ptolomaeus@gmail.com</ContactElectronicMailAddress>
+    </ContactInformation>
+    <Fees>NONE</Fees>
+    <AccessConstraints>NONE</AccessConstraints>
+  </Service>
+  <Capability>
+    <Request>
+      <GetCapabilities>
+        <Format>application/vnd.ogc.wms_xml</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms"/>
+            </Get>
+            <Post>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms"/>
+            </Post>
+          </HTTP>
+        </DCPType>
+      </GetCapabilities>
+      <GetMap>
+        <Format>image/png</Format>
+        <Format>application/openlayers</Format>
+        <Format>image/jpeg</Format>
+        <Format>image/png8</Format>
+        <Format>image/png; mode=8bit</Format>
+        <Format>openlayers</Format>
+        <Format>text/html; subtype=openlayers</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms"/>
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetMap>
+      <GetFeatureInfo>
+        <Format>text/plain</Format>
+        <Format>application/vnd.ogc.gml</Format>
+        <Format>text/xml</Format>
+        <Format>application/vnd.ogc.gml/3.1.1</Format>
+        <Format>text/xml; subtype=gml/3.1.1</Format>
+        <Format>text/html</Format>
+        <Format>application/json</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms?SERVICE=WMS&amp;authkey=260a670e-4dc0-4719-8bc9-85555d7dcbe1&amp;"/>
+            </Get>
+            <Post>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms?SERVICE=WMS&amp;authkey=260a670e-4dc0-4719-8bc9-85555d7dcbe1&amp;"/>
+            </Post>
+          </HTTP>
+        </DCPType>
+      </GetFeatureInfo>
+      <DescribeLayer>
+        <Format>application/vnd.ogc.wms_xml</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms?SERVICE=WMS&amp;authkey=260a670e-4dc0-4719-8bc9-85555d7dcbe1&amp;"/>
+            </Get>
+          </HTTP>
+        </DCPType>
+      </DescribeLayer>
+      <GetLegendGraphic>
+        <Format>image/png</Format>
+        <Format>image/jpeg</Format>
+        <Format>image/gif</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms?SERVICE=WMS&amp;authkey=260a670e-4dc0-4719-8bc9-85555d7dcbe1&amp;"/>
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetLegendGraphic>
+      <GetStyles>
+        <Format>application/vnd.ogc.sld+xml</Format>
+        <DCPType>
+          <HTTP>
+            <Get>
+              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/wms?SERVICE=WMS&amp;authkey=260a670e-4dc0-4719-8bc9-85555d7dcbe1&amp;"/>
+            </Get>
+          </HTTP>
+        </DCPType>
+      </GetStyles>
+    </Request>
+    <Exception>
+      <Format>application/vnd.ogc.se_xml</Format>
+      <Format>application/vnd.ogc.se_inimage</Format>
+      <Format>application/vnd.ogc.se_blank</Format>
+      <Format>application/json</Format>
+    </Exception>
+    <UserDefinedSymbolization SupportSLD="1" UserLayer="1" UserStyle="1" RemoteWFS="1"/>
+    <Layer>
+      <Title>GeoServer Web Map Service</Title>
+      <Abstract>A compliant implementation of WMS plus most of the SLD extension (dynamic styling). Can also generate PDF, SVG, KML, GeoRSS</Abstract>
+      <!--Limited list of EPSG projections:-->
+      <SRS>EPSG:3857</SRS>
+      <SRS>EPSG:4326</SRS>
+      <SRS>EPSG:900913</SRS>
+      <LatLonBoundingBox minx="-169.785705566406" miny="-27.1886425018311" maxx="163.041122436523" maxy="74.9355163574219"/>
+      <Layer queryable="1" opaque="0">
+        <Name>testlayer</Name>
+        <Title>Test Layer</Title>
+        <Abstract/>
+        <KeywordList>
+          <Keyword>testlayer</Keyword>
+          <Keyword>features</Keyword>
+        </KeywordList>
+        <SRS>EPSG:4326</SRS>
+        <LatLonBoundingBox minx="-169.785705566406" miny="-27.1886425018311" maxx="163.041122436523" maxy="74.9355163574219"/>
+        <BoundingBox SRS="EPSG:4326" minx="-169.785705566406" miny="-27.1886425018311" maxx="163.041122436523" maxy="74.9355163574219"/>
+        <Style>
+          <Name>style1</Name>
+          <Title>style 1</Title>
+          <Abstract>style1</Abstract>
+          <LegendURL width="169" height="140">
+            <Format>image/png</Format>
+            <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/TODO_GET_LEGEND_GRAPHIC"/>
+          </LegendURL>
+        </Style>
+        <Style>
+          <Name>style2</Name>
+          <Title>style 2</Title>
+          <Abstract>style 2</Abstract>
+          <LegendURL width="169" height="140">
+            <Format>image/png</Format>
+            <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="base/web/client/test-resources/geoserver/testworkspace/testlayer/TODO_GET_LEGEND_GRAPHIC"/>
+          </LegendURL>
+        </Style>
+      </Layer>
+    </Layer>
+  </Capability>
+</WMT_MS_Capabilities>
diff --git a/web/client/translations/data.de-DE b/web/client/translations/data.de-DE
index c9250b0ca5..49986958a3 100644
--- a/web/client/translations/data.de-DE
+++ b/web/client/translations/data.de-DE
@@ -28,6 +28,9 @@
             "general": "General",
             "display": "Display",
             "style": "Style",
+            "styleCustom": "Use style named \"{value}\"",
+            "styleListLoadError": "There was an error loading the styles list",
+            "stylesRefreshList": "Refresh Styles List",
             "format": "Format",
             "delete": "Delete",
             "deleteLayer":"Delete Layer",
diff --git a/web/client/translations/data.en-US b/web/client/translations/data.en-US
index c9250b0ca5..49986958a3 100644
--- a/web/client/translations/data.en-US
+++ b/web/client/translations/data.en-US
@@ -28,6 +28,9 @@
             "general": "General",
             "display": "Display",
             "style": "Style",
+            "styleCustom": "Use style named \"{value}\"",
+            "styleListLoadError": "There was an error loading the styles list",
+            "stylesRefreshList": "Refresh Styles List",
             "format": "Format",
             "delete": "Delete",
             "deleteLayer":"Delete Layer",
diff --git a/web/client/translations/data.fr-FR b/web/client/translations/data.fr-FR
index adb777a5d3..194a70704d 100644
--- a/web/client/translations/data.fr-FR
+++ b/web/client/translations/data.fr-FR
@@ -28,6 +28,9 @@
             "general": "Général",
             "display": "Affichage",
             "style": "Style",
+            "styleCustom": "Utilisez un style nommé \"{value} \"",
+            "styleListLoadError": "Une erreur s'est produite lors du chargement de la liste de styles",
+            "stylesRefreshList": "Refresh Styles List",
             "format": "Format",
             "delete": "Effacer",
             "deleteLayer":"Supprimer le calque",
diff --git a/web/client/translations/data.it-IT b/web/client/translations/data.it-IT
index cbe5a38d08..fc2eb5d67c 100644
--- a/web/client/translations/data.it-IT
+++ b/web/client/translations/data.it-IT
@@ -28,6 +28,9 @@
             "general": "Generale",
             "display": "Visualizzazione",
             "style": "Stile",
+            "styleCustom": "Usa stile con nome \"{value}\"",
+            "styleListLoadError": "Si è verificato un errore durante il caricamento della lista degli stili",
+            "stylesRefreshList": "Aggiorna lista degli stili",
             "format": "Formato",
             "delete": "Elimina",
             "deleteLayer":"Elimina Livello",