diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
index 0ae4089cff..7730e81f3f 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
@@ -3,7 +3,7 @@
  * App actions
  *
  */
-import { pick, set, camelCase } from 'lodash';
+import { cloneDeep, pick, set, camelCase } from 'lodash';
 import {
   ADD_ATTRIBUTE_TO_EXISITING_CONTENT_TYPE,
   ADD_ATTRIBUTE_TO_TEMP_CONTENT_TYPE,
@@ -25,6 +25,8 @@ import {
   RESET_PROPS,
   SAVE_EDITED_ATTRIBUTE,
   SET_TEMPORARY_ATTRIBUTE,
+  SUBMIT_CONTENT_TYPE,
+  SUBMIT_CONTENT_TYPE_SUCCEEDED,
   SUBMIT_TEMP_CONTENT_TYPE,
   SUBMIT_TEMP_CONTENT_TYPE_SUCCEEDED,
   UPDATE_TEMP_CONTENT_TYPE,
@@ -192,9 +194,34 @@ export function resetProps() {
   };
 }
 
-export function submitTempContentType() {
+export function submitContentType(oldContentTypeName, data, context, source) {
+  const attributes = formatModelAttributes(data.attributes);
+  const body = Object.assign(cloneDeep(data), { attributes });
+
+  return {
+    type: SUBMIT_CONTENT_TYPE,
+    oldContentTypeName,
+    body,
+    source,
+    context,
+  };
+}
+
+export function submitContentTypeSucceeded(oldContentTypeName) {
+  return {
+    type: SUBMIT_CONTENT_TYPE_SUCCEEDED,
+    oldContentTypeName,
+  };
+}
+
+export function submitTempContentType(data, context) {
+  const attributes = formatModelAttributes(data.attributes);
+  const body = Object.assign(cloneDeep(data), { attributes });
+
   return {
     type: SUBMIT_TEMP_CONTENT_TYPE,
+    body,
+    context,
   };
 }
 
@@ -220,3 +247,22 @@ export const buildModelAttributes = attributes => {
 
   return formattedAttributes;
 };
+
+export const formatModelAttributes = attributes =>
+  Object.keys(attributes).reduce((acc, current) => {
+    const attribute = Object.keys(attributes[current]).reduce(
+      (acc2, curr) => {
+        if (curr === 'plugin' && !!attributes[current][curr]) {
+          acc2.params.pluginValue = attributes[current][curr];
+          acc2.params.plugin = true;
+        } else {
+          acc2.params[curr] = attributes[current][curr];
+        }
+
+        return acc2;
+      },
+      { name: current, params: {} },
+    );
+
+    return acc.concat(attribute);
+  }, []);
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/constants.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/constants.js
index 88fc142549..1d72202978 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/constants.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/constants.js
@@ -29,6 +29,8 @@ export const RESET_EDIT_TEMP_CONTENT_TYPE = 'ContentTypeBuilder/App/RESET_EDIT_T
 export const RESET_PROPS = 'ContentTypeBuilder/App/RESET_PROPS';
 export const SAVE_EDITED_ATTRIBUTE = 'ContentTypeBuilder/App/SAVE_EDITED_ATTRIBUTE';
 export const SET_TEMPORARY_ATTRIBUTE = 'ContentTypeBuilder/App/SET_TEMPORARY_ATTRIBUTE';
+export const SUBMIT_CONTENT_TYPE = 'ContentTypeBuilder/App/SUBMIT_CONTENT_TYPE';
+export const SUBMIT_CONTENT_TYPE_SUCCEEDED = 'ContentTypeBuilder/App/SUBMIT_CONTENT_TYPE_SUCCEEDED';
 export const SUBMIT_TEMP_CONTENT_TYPE = 'ContentTypeBuilder/App/SUBMIT_TEMP_CONTENT_TYPE';
 export const SUBMIT_TEMP_CONTENT_TYPE_SUCCEEDED = 'ContentTypeBuilder/App/SUBMIT_TEMP_CONTENT_TYPE_SUCCEEDED';
 export const UPDATE_TEMP_CONTENT_TYPE = 'ContentTypeBuilder/App/UPDATE_TEMP_CONTENT_TYPE';
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/reducer.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/reducer.js
index aa9558f8c7..2ed1368f5c 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/reducer.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/reducer.js
@@ -25,8 +25,10 @@ import {
   RESET_PROPS,
   SAVE_EDITED_ATTRIBUTE,
   SET_TEMPORARY_ATTRIBUTE,
+  // SUBMIT_CONTENT_TYPE_SUCCEEDED,
   SUBMIT_TEMP_CONTENT_TYPE_SUCCEEDED,
   UPDATE_TEMP_CONTENT_TYPE,
+  SUBMIT_CONTENT_TYPE_SUCCEEDED,
 } from './constants';
 
 export const initialState = fromJS({
@@ -127,7 +129,7 @@ function appReducer(state = initialState, action) {
         .update('isLoading', () => false)
         .update('modifiedData', () => fromJS(action.initialData))
         .updateIn(['newContentType', 'connection'], () => action.connections[0])
-        .update('models', () => List(action.models));
+        .update('models', () => List(action.models).sortBy(model => model.name));
     case ON_CHANGE_EXISTING_CONTENT_TYPE_MAIN_INFOS:
       return state.updateIn(['modifiedData', ...action.keys], () => action.value);
     case ON_CHANGE_NEW_CONTENT_TYPE_MAIN_INFOS:
@@ -180,6 +182,33 @@ function appReducer(state = initialState, action) {
 
         return attribute;
       });
+    case SUBMIT_CONTENT_TYPE_SUCCEEDED: {
+      const newName = state.getIn(['modifiedData', action.oldContentTypeName, 'name']);
+      const newState = state
+        .updateIn(['modifiedData', newName], () => state.getIn(['modifiedData', action.oldContentTypeName]))
+        .updateIn(['initialData', newName], () => state.getIn(['modifiedData', action.oldContentTypeName]));
+
+      if (newName === action.oldContentTypeName) {
+        return newState;
+      }
+
+      return (
+        newState
+          // .updateIn(['modifiedData', newName], () => state.getIn(['modifiedData', action.oldContentTypeName]))
+          // .updateIn(['initialData', newName], () => state.getIn(['modifiedData', action.oldContentTypeName]))
+          .removeIn(['modifiedData', action.oldContentTypeName])
+          .removeIn(['initialData', action.oldContentTypeName])
+          .updateIn(
+            [
+              'models',
+              state.get('models').findIndex(model => model.name === action.oldContentTypeName),
+              'name',
+            ],
+            () => newName,
+          )
+          .update('models', models => models.sortBy(model => model.name))
+      );
+    }
     case SUBMIT_TEMP_CONTENT_TYPE_SUCCEEDED:
       return state
         .updateIn(['initialData', state.getIn(['newContentType', 'name'])], () => state.get('newContentType'))
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
index 80356d4f6c..ccd6ee796b 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/saga.js
@@ -1,10 +1,16 @@
-import { get } from 'lodash';
+import pluralize from 'pluralize';
+import { capitalize, get, sortBy } from 'lodash';
 import { all, fork, takeLatest, call, put } from 'redux-saga/effects';
 import request from 'utils/request';
 import pluginId from '../../pluginId';
 
-import { getDataSucceeded, deleteModelSucceeded, submitTempContentTypeSucceeded } from './actions';
-import { GET_DATA, DELETE_MODEL, SUBMIT_TEMP_CONTENT_TYPE } from './constants';
+import {
+  getDataSucceeded,
+  deleteModelSucceeded,
+  submitContentTypeSucceeded,
+  submitTempContentTypeSucceeded,
+} from './actions';
+import { GET_DATA, DELETE_MODEL, SUBMIT_CONTENT_TYPE, SUBMIT_TEMP_CONTENT_TYPE } from './constants';
 
 export function* getData() {
   try {
@@ -38,10 +44,70 @@ export function* deleteModel({ modelName }) {
 //  yield put(emitEvent('willSaveContentType'));
 // emitEvent('didSaveContentType')
 
-export function* submitTempCT() {
+export function* submitCT({
+  oldContentTypeName,
+  body,
+  source,
+  context: { emitEvent, plugins, updatePlugin },
+}) {
   try {
+    const requestURL = `/${pluginId}/models/${oldContentTypeName}`;
+    const { name } = body;
+
+    if (source) {
+      body.plugin = source;
+    }
+
+    yield put(emitEvent('willSaveContentType'));
+
+    const opts = { method: 'PUT', body };
+
+    yield call(request, requestURL, opts, true);
+    yield put(emitEvent('didSaveContentType'));
+    yield put(submitContentTypeSucceeded(oldContentTypeName));
+
+    if (name !== oldContentTypeName) {
+      yield put(emitEvent('didEditNameOfContentType'));
+
+      const appPlugins = plugins.toJS ? plugins.toJS() : plugins;
+      const appMenu = get(appPlugins, ['content-manager', 'leftMenuSections'], []);
+      const oldContentTypeNameIndex = appMenu[0].links.findIndex(el => el.destination === oldContentTypeName);
+      const updatedLink = { destination: name.toLowerCase(), label: capitalize(pluralize(name)) };
+      appMenu[0].links.splice(oldContentTypeNameIndex, 1, updatedLink);
+      appMenu[0].links = sortBy(appMenu[0].links, 'label');
+      updatePlugin('content-manager', 'leftMenuSections', appMenu);
+    }
+  } catch (error) {
+    const errorMessage = get(
+      error,
+      ['response', 'payload', 'message', '0', 'messages', '0', 'id'],
+      'notification.error',
+    );
+    strapi.notification.error(errorMessage);
+  }
+}
+
+export function* submitTempCT({ body, context: { emitEvent, plugins, updatePlugin } }) {
+  try {
+    yield put(emitEvent('willSaveContentType'));
+
+    const requestURL = `/${pluginId}/models`;
+    const opts = { method: 'POST', body };
+
+    yield call(request, requestURL, opts, true);
+
+    yield put(emitEvent('didSaveContentType'));
     yield put(submitTempContentTypeSucceeded());
-  } catch (err) {
+
+    const { name } = body;
+    const appPlugins = plugins.toJS ? plugins.toJS() : plugins;
+    const appMenu = get(appPlugins, ['content-manager', 'leftMenuSections'], []);
+    const newLink = { destination: name.toLowerCase(), label: capitalize(pluralize(name)) };
+    appMenu[0].links.push(newLink);
+    appMenu[0].links = sortBy(appMenu[0].links, 'label');
+
+    updatePlugin('content-manager', 'leftMenuSections', appMenu);
+  } catch (error) {
     const errorMessage = get(
       error,
       ['response', 'payload', 'message', '0', 'messages', '0', 'id'],
@@ -56,6 +122,7 @@ export default function* defaultSaga() {
   yield all([
     fork(takeLatest, GET_DATA, getData),
     fork(takeLatest, DELETE_MODEL, deleteModel),
+    fork(takeLatest, SUBMIT_CONTENT_TYPE, submitCT),
     fork(takeLatest, SUBMIT_TEMP_CONTENT_TYPE, submitTempCT),
   ]);
 }
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
index f1dc1de1f3..8849997c20 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
@@ -12,7 +12,7 @@ import {
   onChangeExistingContentTypeMainInfos,
   onChangeNewContentTypeMainInfos,
   onChangeAttribute,
-  submitTempContentType,
+  // submitTempContentType,
   submitTempContentTypeSucceeded,
   saveEditedAttribute,
   setTemporaryAttribute,
@@ -38,7 +38,7 @@ import {
   ON_CHANGE_EXISTING_CONTENT_TYPE_MAIN_INFOS,
   ON_CHANGE_NEW_CONTENT_TYPE_MAIN_INFOS,
   ON_CHANGE_ATTRIBUTE,
-  SUBMIT_TEMP_CONTENT_TYPE,
+  // SUBMIT_TEMP_CONTENT_TYPE,
   SUBMIT_TEMP_CONTENT_TYPE_SUCCEEDED,
   SAVE_EDITED_ATTRIBUTE,
   SET_TEMPORARY_ATTRIBUTE,
@@ -429,15 +429,15 @@ describe('App actions', () => {
     });
   });
 
-  describe('SubmitTempContentType', () => {
-    it('has a type SUBMIT_TEMP_CONTENT_TYPE and returns the correct data', () => {
-      const expected = {
-        type: SUBMIT_TEMP_CONTENT_TYPE,
-      };
+  // describe('SubmitTempContentType', () => {
+  //   it('has a type SUBMIT_TEMP_CONTENT_TYPE and returns the correct data', () => {
+  //     const expected = {
+  //       type: SUBMIT_TEMP_CONTENT_TYPE,
+  //     };
 
-      expect(submitTempContentType()).toEqual(expected);
-    });
-  });
+  //     expect(submitTempContentType()).toEqual(expected);
+  //   });
+  // });
 
   describe('SubmitTempContentTypeSucceeded', () => {
     it('has a type SUBMIT_TEMP_CONTENT_TYPE_SUCCEEDED and returns the correct data', () => {
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/saga.test.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/saga.test.js
index dfbccce1bc..de08701308 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/saga.test.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/saga.test.js
@@ -4,10 +4,10 @@
 
 /* eslint-disable redux-saga/yield-effects */
 import { all, fork, takeLatest, put } from 'redux-saga/effects';
-import defaultSaga, { deleteModel, getData, submitTempCT } from '../saga';
+import defaultSaga, { deleteModel, getData, submitCT, submitTempCT } from '../saga';
 
-import { deleteModelSucceeded, getDataSucceeded, submitTempContentTypeSucceeded } from '../actions';
-import { DELETE_MODEL, GET_DATA, SUBMIT_TEMP_CONTENT_TYPE } from '../constants';
+import { deleteModelSucceeded, getDataSucceeded } from '../actions';
+import { DELETE_MODEL, GET_DATA, SUBMIT_CONTENT_TYPE, SUBMIT_TEMP_CONTENT_TYPE } from '../constants';
 
 const response = [
   {
@@ -93,22 +93,29 @@ describe('CTB <App /> GetData saga', () => {
   });
 });
 
-describe('CTB <App /> SubmitTempCt saga', () => {
-  let submitTempCtGenerator;
+// describe('CTB <App /> SubmitTempCt saga', () => {
+//   let submitTempCtGenerator;
 
-  beforeEach(() => {
-    submitTempCtGenerator = submitTempCT();
-    // const callDescriptor = submitTempCtGenerator.next(response).value;
+//   beforeEach(() => {
+//     submitTempCtGenerator = submitTempCT({
+//       action: {
+//         oldContentTypeName: '',
+//         body: {},
+//         source: null,
+//         context: { emitEvent: jest.fn(), plugins: {}, updatePlugin: jest.fn() },
+//       },
+//     });
+//     // const callDescriptor = submitTempCtGenerator.next(response).value;
 
-    // expect(callDescriptor).toMatchSnapshot();
-  });
+//     // expect(callDescriptor).toMatchSnapshot();
+//   });
 
-  it('should dispatch the getDataSucceeded action if it requests the data successfully', () => {
-    const putDescriptor = submitTempCtGenerator.next(response).value;
+//   it('should dispatch the getDataSucceeded action if it requests the data successfully', () => {
+//     const putDescriptor = submitTempCtGenerator.next(response).value;
 
-    expect(putDescriptor).toEqual(put(submitTempContentTypeSucceeded()));
-  });
-});
+//     expect(putDescriptor).toEqual(put(submitTempContentTypeSucceeded()));
+//   });
+// });
 
 describe('defaultSaga Saga', () => {
   const defaultSagaSaga = defaultSaga();
@@ -120,6 +127,7 @@ describe('defaultSaga Saga', () => {
       all([
         fork(takeLatest, GET_DATA, getData),
         fork(takeLatest, DELETE_MODEL, deleteModel),
+        fork(takeLatest, SUBMIT_CONTENT_TYPE, submitCT),
         fork(takeLatest, SUBMIT_TEMP_CONTENT_TYPE, submitTempCT),
       ]),
     );
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/index.js
index de2435ab84..6b4dac830f 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/index.js
@@ -116,7 +116,8 @@ class AttributeForm extends React.Component {
     }
   };
 
-  handleSubmitAndContinue = () => {
+  handleSubmitAndContinue = e => {
+    e.preventDefault();
     const { emitEvent } = this.context;
 
     if (isEmpty(this.getFormErrors())) {
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/tests/index.test.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/tests/index.test.js
index 8b15dd76f8..f64bf1771b 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/tests/index.test.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/AttributeForm/tests/index.test.js
@@ -265,7 +265,7 @@ describe('<AttributeForm />', () => {
 
         const { handleSubmitAndContinue } = wrapper.instance();
 
-        handleSubmitAndContinue();
+        handleSubmitAndContinue({ preventDefault: jest.fn() });
 
         expect(props.onSubmit).toHaveBeenCalledWith(true);
       });
@@ -278,7 +278,7 @@ describe('<AttributeForm />', () => {
 
         const { handleSubmitAndContinue } = wrapper.instance();
 
-        handleSubmitAndContinue();
+        handleSubmitAndContinue({ preventDefault: jest.fn() });
 
         expect(props.onSubmitEdit).toHaveBeenCalledWith(true);
         expect(context.emitEvent).toHaveBeenCalledWith('willAddMoreFieldToContentType');
@@ -289,7 +289,7 @@ describe('<AttributeForm />', () => {
 
         const { handleSubmitAndContinue } = wrapper.instance();
 
-        handleSubmitAndContinue();
+        handleSubmitAndContinue({ preventDefault: jest.fn() });
 
         expect(props.onSubmitEdit).not.toHaveBeenCalled();
         expect(props.onSubmit).not.toHaveBeenCalled();
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/sagas.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/sagas.js
index d07a1af61c..6520b02576 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/sagas.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/sagas.js
@@ -3,6 +3,7 @@ import { capitalize, findIndex, get, isEmpty, sortBy } from 'lodash';
 import { takeLatest, call, put, fork, select } from 'redux-saga/effects';
 import request from 'utils/request';
 
+/* eslint-disable */
 import {
   connectionsFetchSucceeded,
   contentTypeActionSucceeded,
@@ -11,16 +12,9 @@ import {
   unsetButtonLoading,
 } from './actions';
 
-import {
-  CONNECTIONS_FETCH,
-  CONTENT_TYPE_EDIT,
-  CONTENT_TYPE_FETCH,
-} from './constants';
+import { CONNECTIONS_FETCH, CONTENT_TYPE_EDIT, CONTENT_TYPE_FETCH } from './constants';
 
-import {
-  makeSelectInitialDataEdit,
-  makeSelectModifiedDataEdit,
-} from './selectors';
+import { makeSelectInitialDataEdit, makeSelectModifiedDataEdit } from './selectors';
 
 export function* editContentType(action) {
   try {
@@ -35,7 +29,12 @@ export function* editContentType(action) {
     yield put(setButtonLoading());
 
     const leftMenuContentTypes = get(action.context.plugins.toJS(), ['content-manager', 'leftMenuSections']);
-    const leftMenuContentTypesIndex = !isEmpty(leftMenuContentTypes) ? findIndex(get(leftMenuContentTypes[0], 'links'), ['destination', initialContentType.name.toLowerCase()]) : -1;
+    const leftMenuContentTypesIndex = !isEmpty(leftMenuContentTypes)
+      ? findIndex(get(leftMenuContentTypes[0], 'links'), [
+          'destination',
+          initialContentType.name.toLowerCase(),
+        ])
+      : -1;
     const response = yield call(request, requestUrl, opts, true);
 
     if (response.ok) {
@@ -58,7 +57,7 @@ export function* editContentType(action) {
       }
       strapi.notification.success('content-type-builder.notification.success.message.contentType.edit');
     }
-  } catch(error) {
+  } catch (error) {
     strapi.notification.error(get(error, ['response', 'payload', 'message'], 'notification.error'));
   }
 }
@@ -69,8 +68,7 @@ export function* fetchConnections() {
     const data = yield call(request, requestUrl, { method: 'GET' });
 
     yield put(connectionsFetchSucceeded(data));
-
-  } catch(error) {
+  } catch (error) {
     strapi.notification.error('content-type-builder.notification.error.message');
   }
 }
@@ -88,8 +86,7 @@ export function* fetchContentType(action) {
     const data = yield call(request, requestUrl, { method: 'GET', params });
 
     yield put(contentTypeFetchSucceeded(data));
-
-  } catch(error) {
+  } catch (error) {
     strapi.notification.error('content-type-builder.notification.error.message');
   }
 }
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
index f1b1eadd55..6e382c0a85 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js
@@ -45,6 +45,7 @@ import {
   onChangeAttribute,
   resetEditExistingContentType,
   resetEditTempContentType,
+  submitContentType,
   submitTempContentType,
 } from '../App/actions';
 
@@ -54,6 +55,7 @@ import styles from './styles.scss';
 import DocumentationSection from './DocumentationSection';
 
 /* eslint-disable react/sort-comp */
+/* eslint-disable no-extra-boolean-cast */
 export class ModelPage extends React.Component {
   // eslint-disable-line react/prefer-stateless-function
   state = { attrToDelete: null, removePrompt: false, showWarning: false };
@@ -128,7 +130,6 @@ export class ModelPage extends React.Component {
     const description = get(initialData, [this.getModelName(), 'description'], null);
 
     /* istanbul ignore if */
-    // eslint-disable-next-line no-extra-boolean-cast
     return !!description
       ? description
       : { id: `${pluginId}.modelPage.contentHeader.emptyDescription.description` };
@@ -165,19 +166,32 @@ export class ModelPage extends React.Component {
     const {
       initialData,
       modifiedData,
+      newContentType,
       resetEditExistingContentType,
       resetEditTempContentType,
+      submitContentType,
       submitTempContentType,
     } = this.props;
     /* istanbul ignore if */
     const shouldShowActions = this.isUpdatingTemporaryContentType()
       ? this.getModelAttributesLength() > 0
       : !isEqual(modifiedData[this.getModelName()], initialData[this.getModelName()]);
-    const handleSubmit = this.isUpdatingTemporaryContentType() ? submitTempContentType : () => {};
+    /* eslint-disable indent */
+    const handleSubmit = this.isUpdatingTemporaryContentType()
+      ? () => submitTempContentType(newContentType, this.context)
+      : () => {
+          submitContentType(
+            this.getModelName(),
+            get(modifiedData, this.getModelName()),
+            this.context,
+            this.getSource(),
+          );
+        };
     /* istanbul ignore next */
     const handleCancel = this.isUpdatingTemporaryContentType()
       ? resetEditTempContentType
       : () => resetEditExistingContentType(this.getModelName());
+    /* eslint-enable indent */
 
     /* istanbul ignore if */
     if (shouldShowActions) {
@@ -228,6 +242,18 @@ export class ModelPage extends React.Component {
     return this.getModelsNumber() > 1 ? `${base}plural` : `${base}singular`;
   };
 
+  getSource = () => {
+    const {
+      match: {
+        params: { modelName },
+      },
+    } = this.props;
+
+    const source = getQueryParameters(modelName, 'source');
+
+    return !!source ? source : null;
+  };
+
   handleClickEditAttribute = async (attributeName, type) => {
     const { emitEvent } = this.context;
     const {
@@ -459,11 +485,11 @@ export class ModelPage extends React.Component {
       return <Redirect to={to} />;
     }
 
-    // const modalType = getQueryParameters(search, 'modalType');
     const modalType = this.getModalType();
     const settingType = getQueryParameters(search, 'settingType');
     const attributeType = getQueryParameters(search, 'attributeType');
     const actionType = this.getActionType();
+    const icon = this.getSource() ? null : 'fa fa-pencil';
 
     return (
       <div className={styles.modelpage}>
@@ -490,7 +516,7 @@ export class ModelPage extends React.Component {
               <div className={styles.componentsContainer}>
                 <PluginHeader
                   description={this.getModelDescription()}
-                  icon="fa fa-pencil"
+                  icon={icon}
                   title={this.getPluginHeaderTitle()}
                   actions={this.getPluginHeaderActions()}
                   onClickIcon={this.handleClickEditModelMainInfos}
@@ -595,6 +621,8 @@ export class ModelPage extends React.Component {
 
 ModelPage.contextTypes = {
   emitEvent: PropTypes.func,
+  plugins: PropTypes.object,
+  updatePlugin: PropTypes.func,
 };
 
 ModelPage.defaultProps = {
@@ -622,6 +650,7 @@ ModelPage.propTypes = {
   resetEditTempContentType: PropTypes.func.isRequired,
   resetExistingContentTypeMainInfos: PropTypes.func.isRequired,
   resetNewContentTypeMainInfos: PropTypes.func.isRequired,
+  submitContentType: PropTypes.func.isRequired,
   submitTempContentType: PropTypes.func.isRequired,
   temporaryAttribute: PropTypes.object.isRequired,
   updateTempContentType: PropTypes.func.isRequired,
@@ -638,6 +667,7 @@ export function mapDispatchToProps(dispatch) {
       onChangeAttribute,
       resetEditExistingContentType,
       resetEditTempContentType,
+      submitContentType,
       submitTempContentType,
     },
     dispatch,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/tests/index.test.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/tests/index.test.js
index 135cd7a0c9..c8e98b0eb2 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/tests/index.test.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/tests/index.test.js
@@ -119,6 +119,7 @@ describe('<ModelPage />', () => {
       resetEditTempContentType: jest.fn(),
       resetExistingContentTypeMainInfos: jest.fn(),
       resetNewContentTypeMainInfos: jest.fn(),
+      submitContentType: jest.fn(),
       submitTempContentType: jest.fn(),
       temporaryAttribute: {},
       updateTempContentType: jest.fn(),
@@ -411,6 +412,7 @@ describe('<ModelPage /> lifecycle', () => {
       resetExistingContentTypeMainInfos: jest.fn(),
       resetNewContentTypeMainInfos: jest.fn(),
       setTemporaryAttribute: jest.fn(),
+      submitContentType: jest.fn(),
       submitTempContentType: jest.fn(),
       temporaryAttribute: {},
       updateTempContentType: jest.fn(),