diff --git a/assets/actions/dataset.ts b/assets/actions/dataset.ts
index 0ba837d45683ed408fabc305e45d99b4fa21f746..020b0cff434e5f8e068bab9f2b790d44059be5cc 100644
--- a/assets/actions/dataset.ts
+++ b/assets/actions/dataset.ts
@@ -63,7 +63,7 @@ function getDatasetRequest(uuid: string) {
 }
 
 function createDatasetRequest() {
-    const dataset = new Dataset({title: 'New Dataset', description: 'Description here'});
+    const dataset = new Dataset();
     return (dispatch, getState) => {
         const token = getState().login.access_token;
 
diff --git a/assets/components/common/filter/CollapsibleComponentSearch.tsx b/assets/components/common/filter/CollapsibleComponentSearch.tsx
index 151180b49d606b7bb64904436ef4501c8f8b78c1..c2986040234f3fe0874ea39b1329acc13a9ca150 100644
--- a/assets/components/common/filter/CollapsibleComponentSearch.tsx
+++ b/assets/components/common/filter/CollapsibleComponentSearch.tsx
@@ -67,7 +67,7 @@ class CollapsibleComponentSearch  extends React.Component<ICollapsibleComponentS
                 </div>
                 <Collapse
                     in={ this.state.show }
-                    transitionDuration="auto"
+                    timeout="auto"
                     unmountOnExit
                 >
                     <div className={ classes.collapseBlockBody }>{ children }</div>
diff --git a/assets/components/common/filter/ExpandFiltersComponent.tsx b/assets/components/common/filter/ExpandFiltersComponent.tsx
index 5644c05a3e213fdf86d6548a212c4e53611b1443..ea9e8ad9f94593b689d3ba6338f8aa1987d719a1 100644
--- a/assets/components/common/filter/ExpandFiltersComponent.tsx
+++ b/assets/components/common/filter/ExpandFiltersComponent.tsx
@@ -84,7 +84,7 @@ class ExpandFiltersComponent extends React.Component<IExpandFiltersComponentProp
                 </div>
                 <Collapse
                     in={ this.state.filterExpanded }
-                    transitionDuration="auto"
+                    timeout="auto"
                     unmountOnExit
                 >
                     { children }
diff --git a/assets/components/pages/dataset/dataset-detail/BrowseMenu.tsx b/assets/components/pages/dataset/dataset-detail/BrowseMenu.tsx
index 33c1996de94ca5c01510dd9de5646703196266b6..7868d72ced34f6c8bcc33ead6108353375c4ee85 100644
--- a/assets/components/pages/dataset/dataset-detail/BrowseMenu.tsx
+++ b/assets/components/pages/dataset/dataset-detail/BrowseMenu.tsx
@@ -130,7 +130,7 @@ class BrowseMenu extends React.Component<IBrowseMenuProps, any> {
                         </Hidden>
                     </ListItem>
 
-                    <Collapse in={ this.state.expanded } transitionDuration="auto" unmountOnExit>
+                    <Collapse in={ this.state.expanded } timeout="auto" unmountOnExit>
                         <div>
                             <Divider />
                             <ListItem button className={ `${classes.liItemWrapper}` }>
diff --git a/assets/components/pages/dataset/dataset-stepper/StepNavigation.tsx b/assets/components/pages/dataset/dataset-stepper/StepNavigation.tsx
index 1530ace863d912e1ef606f91c202ff010a2b7ac1..5fc4a9ae88e9a5c6f77b08e6f2a583186420d7ee 100644
--- a/assets/components/pages/dataset/dataset-stepper/StepNavigation.tsx
+++ b/assets/components/pages/dataset/dataset-stepper/StepNavigation.tsx
@@ -68,11 +68,11 @@ class StepNavigation extends React.Component<IStepNavigationProps, any> {
         return steps.find((e) => e.link === path).id;
     }
 
-    protected onNext = () => {
-        if (this.state.id === 6) {
+    protected goToStep = (id) => () => {
+        if (id > 6) {
             // ACCEPT AND PUBLISH
         } else {
-            const path = steps.find((e) => e.id === this.state.id + 1).link;
+            const path = steps.find((e) => e.id === id).link;
             const {router, params: {uuid}} = this.props;
             router.push(`/datasets/${uuid}/${path}`);
         }
@@ -92,10 +92,13 @@ class StepNavigation extends React.Component<IStepNavigationProps, any> {
                         }
                     </Typography>
                     <div className={ classes.flexGrow }/>
-                    <Button className={ classes.btnReturn }>
-                        Return
-                    </Button>
-                    <Button raised onClick={ this.onNext } className={ classes.btnBlue }>
+                    { this.state.id > 1 && (
+                        <Button onClick={ this.goToStep(this.state.id - 1) } className={ classes.btnReturn }>
+                            Return
+                        </Button>
+                    )
+                    }
+                    <Button raised onClick={ this.goToStep(this.state.id + 1) } className={ classes.btnBlue }>
                         { this.state.id === 6 ? 'ACCEPT AND PUBLISH' : 'NEXT STEP' }
                     </Button>
                 </Grid>
diff --git a/assets/components/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx b/assets/components/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx
index 7f47be06b613bd518d1f797a590ad9df6097e791..e6b9e6d9dcd95e6a6803c594283f2178610f722d 100644
--- a/assets/components/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx
+++ b/assets/components/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx
@@ -2,8 +2,9 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import {Field, FieldArray, reduxForm} from 'redux-form';
 import {withStyles} from 'material-ui/styles';
-import {FormLabel, FormControl, FormControlLabel} from 'material-ui/Form';
-import Radio, {RadioGroup} from 'material-ui/Radio';
+import {DatePicker} from 'material-ui-pickers';
+import KeyboardArrowLeft from 'material-ui-icons/KeyboardArrowLeft';
+import KeyboardArrowRight from 'material-ui-icons/KeyboardArrowRight';
 
 import UploadSection from './upload-section';
 import MaterialAutosuggest from '../../../../../common/material-autosuggest';
@@ -12,6 +13,7 @@ import languages from '../../../../../../data/Languages';
 import {TextField} from '../../../../../common/text-field';
 import SelectPartnerComponent from './SelectPartnerComponent';
 import {Partner} from '../../../../../../model/partner.model';
+import {BasicInfoRadioGroup} from './BasicInfoRadioGroup';
 
 interface ILoginContainerProps extends React.ClassAttributes<any> {
     handleSubmit: () => void;
@@ -27,36 +29,40 @@ const styleSheet = {
     },
 };
 
-const renderRadioGroup = ({input, meta, ...rest}) => (
-    <FormControl required>
-        <FormLabel>Rights*</FormLabel>
-        <RadioGroup
-            { ...input }
-            { ...rest }
-            value={ input.value }
-            onChange={
-                (event, value) => input.onChange(value) // tslint:disable-line
-            }
-        >
-            <FormControlLabel value="CC0" label="CC0" control={ <Radio /> }/>
-            <FormControlLabel value="CC-BY" label="CC-BY" control={ <Radio /> }/>
-            <FormControlLabel value="CC-BY-NC" label="CC-BY-NC" control={ <Radio /> }/>
-        </RadioGroup>
-    </FormControl>
+const renderDatePicker = ({input, meta, label, ...rest}) => (
+    <DatePicker
+        value={ input.value }
+        onChange={
+            (value) => input.onChange(value.getTime()) // tslint:disable-line
+        }
+        invalidLabel={ label }
+        returnMoment={ false }
+        leftArrowIcon={ <KeyboardArrowLeft/> }
+        rightArrowIcon={ <KeyboardArrowRight/> }
+    />
 );
 
 class BasicInfoStep extends React.Component<ILoginContainerProps, any> {
 
     protected save = () => {
-        this.props.handleSubmit();
+        setTimeout(this.props.handleSubmit);
     }
 
     public render() {
 
-        const {handleSubmit, initialValues, classes, uuid, partners} = this.props;
+        const {classes, uuid, partners} = this.props;
 
         return (
             <form>
+                <Field
+                    name="owner"
+                    component={ SelectPartnerComponent }
+                    label="Select Partner"
+                    placeholder="Partner"
+                    array={ partners }
+                    selectId="select-option-partner"
+                    onBlur={ this.save }
+                />
                 <Field
                     name="title"
                     component={ TextField }
@@ -72,29 +78,16 @@ class BasicInfoStep extends React.Component<ILoginContainerProps, any> {
                     placeholder="An abstract, short or long description of the resource. Descriptive details improves discoverability of the resource."
                     onBlur={ this.save }
                 />
-                <Field
-                    name="owner"
-                    component={ SelectPartnerComponent }
-                    label="Select Partner"
-                    placeholder="Partner"
-                    array= { partners }
-                    selectId = "select-option-partner"
-                    onBlur={ this.save }
-                />
                 <Field
                     name="dateCreateDocument"
-                    component={ TextField }
+                    component={ renderDatePicker }
                     label="Date of creation of the document*"
-                    type="date"
-                    onBlur={ this.save }
-                    InputLabelProps={ {
-                        shrink: true,
-                    } }
+                    onChange={ this.save }
                 />
                 <Field
                     name="rights"
-                    component={ renderRadioGroup }
-                    onBlur={ this.save }
+                    component={ BasicInfoRadioGroup }
+                    onChange={ this.save }
                 />
                 <Field
                     name="language"
diff --git a/assets/components/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoRadioGroup.tsx b/assets/components/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoRadioGroup.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..d07ea72a3cf0c98942583ab31d0bea2c37dccab1
--- /dev/null
+++ b/assets/components/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoRadioGroup.tsx
@@ -0,0 +1,79 @@
+import * as React from 'react';
+import {FormLabel, FormControl, FormControlLabel} from 'material-ui/Form';
+import Radio, {RadioGroup} from 'material-ui/Radio';
+import Tooltip from 'material-ui/Tooltip';
+
+export const BasicInfoRadioGroup = ({input, meta, ...rest}) => (
+    <FormControl required>
+        <FormLabel>Rights*</FormLabel>
+        <RadioGroup
+            { ...input }
+            { ...rest }
+            value={ input.value }
+            onChange={
+                (event, value) => input.onChange(value) // tslint:disable-line
+            }
+        >
+            <FormControlLabel
+                value="CC0"
+                label={ (
+                    <Tooltip
+                        id="tooltip-controlled1"
+                        title={ (
+                            <a href="https://creativecommons.org/publicdomain/zero/1.0/" target="_blank"
+                               style={ {color: 'white'} }>
+                                https://creativecommons.org/publicdomain/zero/1.0/
+                            </a>
+                        ) }
+                        enterDelay={ 300 }
+                        leaveDelay={ 1200 }
+                        placement="right"
+                    >
+                        <div>CCO</div>
+                    </Tooltip>
+                ) }
+                control={ <Radio /> }
+            />
+            <FormControlLabel
+                value="CC-BY"
+                label={ (
+                    <Tooltip
+                        id="tooltip-controlled1"
+                        title={ (
+                            <a href="https://creativecommons.org/licenses/by/4.0/" target="_blank"
+                               style={ {color: 'white'} }>
+                                https://creativecommons.org/licenses/by/4.0/
+                            </a>
+                        ) }
+                        enterDelay={ 300 }
+                        leaveDelay={ 1200 }
+                        placement="right"
+                    >
+                        <div>CC-BY</div>
+                    </Tooltip>
+                ) }
+                control={ <Radio /> }
+            />
+            <FormControlLabel
+                value="CC-BY-NC"
+                label={ (
+                    <Tooltip
+                        id="tooltip-controlled1"
+                        title={ (
+                            <a href="https://creativecommons.org/licenses/by-nc/4.0/" target="_blank"
+                               style={ {color: 'white'} }>
+                                https://creativecommons.org/licenses/by-nc/4.0/
+                            </a>
+                        ) }
+                        enterDelay={ 300 }
+                        leaveDelay={ 1200 }
+                        placement="right"
+                    >
+                        <div>CC-BY-NC</div>
+                    </Tooltip>
+                ) }
+                control={ <Radio /> }
+            />
+        </RadioGroup>
+    </FormControl>
+);
diff --git a/assets/components/pages/dataset/dataset-stepper/steps/basic-info/index.tsx b/assets/components/pages/dataset/dataset-stepper/steps/basic-info/index.tsx
index 8fa5c813841498d742f71a870bcfa0f9971fcbbb..37df3dac2b99cafd1dfb7a5ad17a0c9f942115dd 100644
--- a/assets/components/pages/dataset/dataset-stepper/steps/basic-info/index.tsx
+++ b/assets/components/pages/dataset/dataset-stepper/steps/basic-info/index.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 import * as _ from 'lodash';
-import * as moment from 'moment';
 
 import BasicInfoForm from './BasicInfoForm';
 import {Dataset} from '../../../../../../model/dataset.model';
@@ -11,8 +10,6 @@ import {loadPartners} from '../../../../../../actions/partner';
 import {IPartnerFilter} from '../../../../../../model/filter.model';
 import {Partner} from '../../../../../../model/partner.model';
 
-const DATE_FORMAT = 'YYYY-MM-DD';
-
 interface IDatasetProps extends React.ClassAttributes<any> {
     route: any;
     router: any;
@@ -25,10 +22,6 @@ interface IDatasetProps extends React.ClassAttributes<any> {
 
 class BasicInfoStep extends React.Component<IDatasetProps, any> {
 
-    public constructor(props) {
-        super(props);
-    }
-
     public componentDidMount() {
         if (this.props.partners.length === 0) {
             this.props.loadPartners(0, 50, null, {});
@@ -37,30 +30,13 @@ class BasicInfoStep extends React.Component<IDatasetProps, any> {
 
     protected handleSubmit = (values: Dataset) => {
         const {dataset, saveDatasetRequest} = this.props;
-        const handled = {
-            ...values,
-            dateCreateDocument: moment(values.dateCreateDocument, DATE_FORMAT).valueOf(),
-        };
-        if (!_.isEqual({...dataset}, handled)) {
-            saveDatasetRequest(new Dataset(handled));
-        }
-    }
-
-    // todo check date when material-ui date-picker is available
-    private withStringDateValue = (dataset) => {
-
-        if (dataset && dataset.dateCreateDocument) {
-            dataset.dateCreateDocument = moment(dataset.dateCreateDocument).format(DATE_FORMAT);
+        if (!_.isEqual({...dataset}, values)) {
+            saveDatasetRequest(values);
         }
-
-        return dataset;
     }
 
     public render() {
-
-        const { partners } = this.props;
-
-        const dataset = this.withStringDateValue({...this.props.dataset});
+        const {dataset, partners} = this.props;
 
         return (
             <BasicInfoForm
diff --git a/assets/components/pages/descriptor/descriptors/SearchMenu.tsx b/assets/components/pages/descriptor/descriptors/SearchMenu.tsx
index ec5289ed14039172982f46ffb451b8e8db572975..a350f8993bb62a27fd7592285c6f555d3c0236a8 100644
--- a/assets/components/pages/descriptor/descriptors/SearchMenu.tsx
+++ b/assets/components/pages/descriptor/descriptors/SearchMenu.tsx
@@ -362,7 +362,7 @@ class SearchMenu extends React.Component<ISearchMenuProps, any> {
                             </IconButton>
                         </div>
 
-                        <Collapse in={ this.state.searchExpanded } transitionDuration="auto" unmountOnExit>
+                        <Collapse in={ this.state.searchExpanded } timeout="auto" unmountOnExit>
                             { this.renderSearchComponent() }
                         </Collapse>
                     </div>
@@ -393,7 +393,7 @@ class SearchMenu extends React.Component<ISearchMenuProps, any> {
                         </div>
                     </Hidden>
 
-                    <Collapse in={ this.state.filterExpanded } transitionDuration="auto" unmountOnExit>
+                    <Collapse in={ this.state.filterExpanded } timeout="auto" unmountOnExit>
                         <div>
                             <Divider className={ classes.hrClass }/>
                             <ListItem className={ `${classes.gray} ${classes.smallTitle} ${classes.mgBottom5}` }>
diff --git a/assets/components/pages/partner/partner-list/SearchMenu.tsx b/assets/components/pages/partner/partner-list/SearchMenu.tsx
index 0f743dbb1bf755c858ca4cb1cc586bdab7e22e73..c83b8a03b43f348f8451d30e4576c29b54ce2952 100644
--- a/assets/components/pages/partner/partner-list/SearchMenu.tsx
+++ b/assets/components/pages/partner/partner-list/SearchMenu.tsx
@@ -217,7 +217,7 @@ class SearchMenu extends React.Component<ISearchMenuProps, any> {
 
                     <Collapse
                         in={ this.state.expanded }
-                        transitionDuration="auto"
+                        timeout="auto"
                         unmountOnExit
                         onEntered={ this.overflowVisible }
                         onExit={ this.overflowHidden }
@@ -257,7 +257,7 @@ class SearchMenu extends React.Component<ISearchMenuProps, any> {
 
                             <Collapse
                                 in={ this.state.expandDate }
-                                transitionDuration="auto"
+                                timeout="auto"
                                 unmountOnExit
                                 onEntered={ this.overflowVisible }
                                 onExit={ this.overflowHidden }
@@ -320,7 +320,7 @@ class SearchMenu extends React.Component<ISearchMenuProps, any> {
 
                             <Collapse
                                 in={ this.state.expandInst }
-                                transitionDuration="auto"
+                                timeout="auto"
                                 unmountOnExit
                                 onEntered={ this.overflowVisible }
                                 onExit={ this.overflowHidden }
diff --git a/assets/data/Steps.ts b/assets/data/Steps.ts
index b20d0cdf566b06a6f5c3dafd20cecc6befb6aa5a..4d8eb0919ec65dff71bcdc69383fb820b4eca183 100644
--- a/assets/data/Steps.ts
+++ b/assets/data/Steps.ts
@@ -1,7 +1,7 @@
 const steps = [
     {
         id: 1,
-        name: 'Basic info',
+        name: 'Basic information',
         link: '',
     },
     {
diff --git a/assets/theme/index.ts b/assets/theme/index.ts
index e512f6b7999815c8d6e106e1aa3b32689fe6ede0..44ed0c7ccfbeaaa5b4ae0855bd88ed24ad602411 100644
--- a/assets/theme/index.ts
+++ b/assets/theme/index.ts
@@ -1,4 +1,5 @@
 import {createMuiTheme} from 'material-ui/styles';
+import {ThemeOptions} from 'material-ui/styles/createMuiTheme';
 
 const theme = createMuiTheme({
     /* tslint:disable */
@@ -178,7 +179,7 @@ const theme = createMuiTheme({
             backgroundColor: '#fff',
         },
     },
-
-});
+    /* tslint:enable */
+} as ThemeOptions);
 
 export default theme;
diff --git a/package.json b/package.json
index eddc474af3014cfc3fa0a36454f238e0993816fd..25760a98906e21b68037e1bc8d1c145d5e55fabe 100644
--- a/package.json
+++ b/package.json
@@ -41,9 +41,10 @@
     "immutability-helper": "^2.1.2",
     "leaflet": "^1.2.0",
     "lodash": "^4.17.4",
-    "material-ui": "1.0.0-beta.18",
+    "material-ui": "^1.0.0-beta.22",
     "material-ui-icons": "^1.0.0-beta.17",
-    "moment": "^2.18.1",
+    "material-ui-pickers": "^1.0.0-beta.7",
+    "moment": "^2.19.3",
     "prop-types": "^15.5.10",
     "react": "^15.5.4",
     "react-autosuggest": "^9.3.1",