diff --git a/js/components/ascribe_settings/account_settings.js b/js/components/ascribe_settings/account_settings.js
new file mode 100644
index 00000000..b4d46b2d
--- /dev/null
+++ b/js/components/ascribe_settings/account_settings.js
@@ -0,0 +1,144 @@
+'use strict';
+
+import React from 'react';
+
+import UserStore from '../../stores/user_store';
+import UserActions from '../../actions/user_actions';
+
+import GlobalNotificationModel from '../../models/global_notification_model';
+import GlobalNotificationActions from '../../actions/global_notification_actions';
+
+import Form from '../ascribe_forms/form';
+import Property from '../ascribe_forms/property';
+import InputCheckbox from '../ascribe_forms/input_checkbox';
+import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
+
+import ApiUrls from '../../constants/api_urls';
+import AppConstants from '../../constants/application_constants';
+
+import { getLangText } from '../../utils/lang_utils';
+
+let AccountSettings = React.createClass({
+    getInitialState() {
+        return UserStore.getState();
+    },
+
+    componentDidMount() {
+        UserStore.listen(this.onChange);
+        UserActions.fetchCurrentUser();
+    },
+
+    componentWillUnmount() {
+        UserStore.unlisten(this.onChange);
+    },
+
+    onChange(state) {
+        this.setState(state);
+    },
+
+    handleSuccess(){
+        UserActions.fetchCurrentUser();
+        let notification = new GlobalNotificationModel(getLangText('Settings succesfully updated'), 'success', 5000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+
+    getFormDataProfile(){
+        return {'email': this.state.currentUser.email};
+    },
+    
+    render() {
+        let content = <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />;
+        let profile = null;
+
+        if (this.state.currentUser.username) {
+            content = (
+                <Form
+                    url={ApiUrls.users_username}
+                    handleSuccess={this.handleSuccess}>
+                    <Property
+                        name='username'
+                        label={getLangText('Username')}>
+                        <input
+                            type="text"
+                            defaultValue={this.state.currentUser.username}
+                            placeholder={getLangText('Enter your username')}
+                            required/>
+                    </Property>
+                    <Property
+                        name='email'
+                        label={getLangText('Email')}
+                        editable={false}>
+                        <input
+                            type="text"
+                            defaultValue={this.state.currentUser.email}
+                            placeholder={getLangText('Enter your username')}
+                            required/>
+                    </Property>
+                    <hr />
+                </Form>
+            );
+            profile = (
+                <Form
+                    url={ApiUrls.users_profile}
+                    handleSuccess={this.handleSuccess}
+                    getFormData={this.getFormDataProfile}>
+                    <Property
+                        name="hash_locally"
+                        className="ascribe-settings-property-collapsible-toggle"
+                        style={{paddingBottom: 0}}>
+                        <InputCheckbox
+                            defaultChecked={this.state.currentUser.profile.hash_locally}>
+                            <span>
+                                {' ' + getLangText('Enable hash option, e.g. slow connections or to keep piece private')}
+                            </span>
+                        </InputCheckbox>
+                    </Property>
+                    <hr />
+                    {/*<Property
+                        name='language'
+                        label={getLangText('Choose your Language')}
+                        editable={true}>
+                        <select id="select-lang" name="language">
+                            <option value="fr">
+                                Fran&ccedil;ais
+                            </option>
+                            <option value="en"
+                                    selected="selected">
+                                English
+                            </option>
+                        </select>
+                    </Property>*/}
+                </Form>
+            );
+        }
+        return (
+            <CollapsibleParagraph
+                title={getLangText('Account')}
+                show={true}
+                defaultExpanded={true}>
+                {content}
+                {profile}
+                {/*<Form
+                    url={AppConstants.serverUrl + 'api/users/set_language/'}>
+                    <Property
+                        name='language'
+                        label={getLangText('Choose your Language')}
+                        editable={true}>
+                        <select id="select-lang" name="language">
+                            <option value="fr">
+                                Fran&ccedil;ais
+                            </option>
+                            <option value="en"
+                                    selected="selected">
+                                English
+                            </option>
+                        </select>
+                    </Property>
+                    <hr />
+                </Form>*/}
+            </CollapsibleParagraph>
+        );
+    }
+});
+
+export default AccountSettings;
\ No newline at end of file
diff --git a/js/components/ascribe_settings/api_settings.js b/js/components/ascribe_settings/api_settings.js
new file mode 100644
index 00000000..7908b42a
--- /dev/null
+++ b/js/components/ascribe_settings/api_settings.js
@@ -0,0 +1,124 @@
+'use strict';
+
+import React from 'react';
+
+import ApplicationStore from '../../stores/application_store';
+import ApplicationActions from '../../actions/application_actions';
+
+import GlobalNotificationModel from '../../models/global_notification_model';
+import GlobalNotificationActions from '../../actions/global_notification_actions';
+
+import Form from '../ascribe_forms/form';
+import Property from '../ascribe_forms/property';
+
+import ActionPanel from '../ascribe_panel/action_panel';
+import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
+
+import ApiUrls from '../../constants/api_urls';
+import AppConstants from '../../constants/application_constants';
+
+import { getLangText } from '../../utils/lang_utils';
+
+
+let APISettings = React.createClass({
+    propTypes: {
+        defaultExpanded: React.PropTypes.bool
+    },
+
+    getInitialState() {
+        return ApplicationStore.getState();
+    },
+
+    componentDidMount() {
+        ApplicationStore.listen(this.onChange);
+        ApplicationActions.fetchApplication();
+    },
+
+    componentWillUnmount() {
+        ApplicationStore.unlisten(this.onChange);
+    },
+
+    onChange(state) {
+        this.setState(state);
+    },
+
+    handleCreateSuccess() {
+        ApplicationActions.fetchApplication();
+        let notification = new GlobalNotificationModel(getLangText('Application successfully created'), 'success', 5000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+
+    handleTokenRefresh(event) {
+        let applicationName = event.target.getAttribute('data-id');
+        ApplicationActions.refreshApplicationToken(applicationName);
+
+        let notification = new GlobalNotificationModel(getLangText('Token refreshed'), 'success', 2000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+
+    getApplications(){
+        let content = <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />;
+
+        if (this.state.applications.length > -1) {
+            content = this.state.applications.map(function(app, i) {
+                return (
+                    <ActionPanel
+                        name={app.name}
+                        key={i}
+                        content={
+                            <div>
+                                <div className='ascribe-panel-title'>
+                                    {app.name}
+                                </div>
+                                <div className="ascribe-panel-subtitle">
+                                    {'Bearer ' + app.bearer_token.token}
+                                </div>
+                            </div>
+                        }
+                        buttons={
+                            <div className="pull-right">
+                                <div className="pull-right">
+                                    <button
+                                        className="pull-right btn btn-default btn-sm"
+                                        onClick={this.handleTokenRefresh}
+                                        data-id={app.name}>
+                                        {getLangText('REFRESH')}
+                                    </button>
+                                </div>
+                            </div>
+                        }/>
+                    );
+            }, this);
+        }
+        return content;
+    },
+    
+    render() {
+        return (
+            <CollapsibleParagraph
+                title={getLangText('API Integration')}
+                show={true}
+                defaultExpanded={this.props.defaultExpanded}>
+                <Form
+                    url={ApiUrls.applications}
+                    handleSuccess={this.handleCreateSuccess}>
+                    <Property
+                        name='name'
+                        label={getLangText('Application Name')}>
+                        <input
+                            type="text"
+                            placeholder={getLangText('Enter the name of your app')}
+                            required/>
+                    </Property>
+                    <hr />
+                </Form>
+                <pre>
+                    Usage: curl &lt;url&gt; -H 'Authorization: Bearer &lt;token&gt;'
+                </pre>
+                {this.getApplications()}
+            </CollapsibleParagraph>
+        );
+    }
+});
+
+export default APISettings;
\ No newline at end of file
diff --git a/js/components/ascribe_settings/bitcoin_wallet_settings.js b/js/components/ascribe_settings/bitcoin_wallet_settings.js
new file mode 100644
index 00000000..18646d75
--- /dev/null
+++ b/js/components/ascribe_settings/bitcoin_wallet_settings.js
@@ -0,0 +1,72 @@
+'use strict';
+
+import React from 'react';
+
+import WalletSettingsStore from '../../stores/wallet_settings_store';
+import WalletSettingsActions from '../../actions/wallet_settings_actions';
+
+import Form from '../ascribe_forms/form';
+import Property from '../ascribe_forms/property';
+
+import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
+
+import AppConstants from '../../constants/application_constants';
+
+import { getLangText } from '../../utils/lang_utils';
+
+
+let BitcoinWalletSettings = React.createClass({
+    propTypes: {
+        defaultExpanded: React.PropTypes.bool
+    },
+
+    getInitialState() {
+        return WalletSettingsStore.getState();
+    },
+
+    componentDidMount() {
+        WalletSettingsStore.listen(this.onChange);
+        WalletSettingsActions.fetchWalletSettings();
+    },
+
+    componentWillUnmount() {
+        WalletSettingsStore.unlisten(this.onChange);
+    },
+
+    onChange(state) {
+        this.setState(state);
+    },
+
+    render() {
+        let content = <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />;
+
+        if (this.state.walletSettings.btc_public_key) {
+            content = (
+                <Form >
+                    <Property
+                        name='btc_public_key'
+                        label={getLangText('Bitcoin public key')}
+                        editable={false}>
+                        <pre className="ascribe-pre">{this.state.walletSettings.btc_public_key}</pre>
+                    </Property>
+                    <Property
+                        name='btc_root_address'
+                        label={getLangText('Root Address')}
+                        editable={false}>
+                        <pre className="ascribe-pre">{this.state.walletSettings.btc_root_address}</pre>
+                    </Property>
+                    <hr />
+                </Form>);
+        }
+        return (
+            <CollapsibleParagraph
+                title={getLangText('Crypto Wallet')}
+                show={true}
+                defaultExpanded={this.props.defaultExpanded}>
+                {content}
+            </CollapsibleParagraph>
+        );
+    }
+});
+
+export default BitcoinWalletSettings;
\ No newline at end of file
diff --git a/js/components/ascribe_settings/contract_settings.js b/js/components/ascribe_settings/contract_settings.js
new file mode 100644
index 00000000..1730fe08
--- /dev/null
+++ b/js/components/ascribe_settings/contract_settings.js
@@ -0,0 +1,79 @@
+'use strict';
+
+import React from 'react';
+
+import Form from '../ascribe_forms/form';
+import Property from '../ascribe_forms/property';
+
+import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
+
+import ReactS3FineUploader from '../ascribe_uploader/react_s3_fine_uploader';
+
+import AppConstants from '../../constants/application_constants';
+import ApiUrls from '../../constants/api_urls';
+
+import { getCookie } from '../../utils/fetch_api_utils';
+import { getLangText } from '../../utils/lang_utils';
+
+
+let ContractSettings = React.createClass({
+    propTypes: {
+        defaultExpanded: React.PropTypes.bool
+    },
+
+    render() {
+        return (
+            <CollapsibleParagraph
+                title={getLangText('Contract Settings')}
+                show={true}
+                defaultExpanded={this.props.defaultExpanded}>
+                <Form>
+                    <Property
+                        label="Contract file">
+                        <ReactS3FineUploader
+                            keyRoutine={{
+                                url: AppConstants.serverUrl + 's3/key/',
+                                fileClass: 'contract'
+                            }}
+                            createBlobRoutine={{
+                                url: ApiUrls.blob_otherdatas
+                            }}
+                            validation={{
+                                itemLimit: 100000,
+                                sizeLimit: '50000000'
+                            }}
+                            session={{
+                                endpoint: ApiUrls.blob_otherdatas,
+                                customHeaders: {
+                                    'X-CSRFToken': getCookie(AppConstants.csrftoken)
+                                },
+                                cors: {
+                                    expected: true,
+                                    sendCredentials: true
+                                }
+                            }}
+                            signature={{
+                                endpoint: AppConstants.serverUrl + 's3/signature/',
+                                customHeaders: {
+                                   'X-CSRFToken': getCookie(AppConstants.csrftoken)
+                                }
+                            }}
+                            deleteFile={{
+                                enabled: true,
+                                method: 'DELETE',
+                                endpoint: AppConstants.serverUrl + 's3/delete',
+                                customHeaders: {
+                                   'X-CSRFToken': getCookie(AppConstants.csrftoken)
+                                }
+                            }}
+                            areAssetsDownloadable={true}
+                            areAssetsEditable={true}/>
+                    </Property>
+                    <hr />
+                </Form>
+            </CollapsibleParagraph>
+        );
+    }
+});
+
+export default ContractSettings;
\ No newline at end of file
diff --git a/js/components/ascribe_settings/settings_container.js b/js/components/ascribe_settings/settings_container.js
new file mode 100644
index 00000000..485b26d7
--- /dev/null
+++ b/js/components/ascribe_settings/settings_container.js
@@ -0,0 +1,36 @@
+'use strict';
+
+import React from 'react';
+import Router from 'react-router';
+
+import AccountSettings from './account_settings';
+import BitcoinWalletSettings from './bitcoin_wallet_settings';
+import ContractSettings from './contract_settings';
+import APISettings from './api_settings';
+
+
+let SettingsContainer = React.createClass({
+    propTypes: {
+        children: React.PropTypes.oneOfType([
+            React.PropTypes.arrayOf(React.PropTypes.element),
+            React.PropTypes.element])
+    },
+
+    mixins: [Router.Navigation],
+
+    render() {
+        return (
+            <div className="settings-container">
+                <AccountSettings />
+                {this.props.children}
+                <APISettings />
+                <BitcoinWalletSettings />
+                <ContractSettings />
+                <br />
+                <br />
+            </div>
+        );
+    }
+});
+
+export default SettingsContainer;
diff --git a/js/components/piece_list.js b/js/components/piece_list.js
index 79f1471c..02286374 100644
--- a/js/components/piece_list.js
+++ b/js/components/piece_list.js
@@ -60,6 +60,7 @@ let PieceList = React.createClass({
         
         PieceListStore.listen(this.onChange);
         EditionListStore.listen(this.onChange);
+
         let orderBy = this.props.orderBy ? this.props.orderBy : this.state.orderBy;
         if (this.state.pieceList.length === 0 || this.state.page !== page){
             PieceListActions.fetchPieceList(page, this.state.pageSize, this.state.search,
diff --git a/js/components/settings_container.js b/js/components/settings_container.js
deleted file mode 100644
index d5821b7a..00000000
--- a/js/components/settings_container.js
+++ /dev/null
@@ -1,408 +0,0 @@
-'use strict';
-
-import React from 'react';
-import Router from 'react-router';
-
-import UserActions from '../actions/user_actions';
-import UserStore from '../stores/user_store';
-
-import WalletSettingsActions from '../actions/wallet_settings_actions';
-import WalletSettingsStore from '../stores/wallet_settings_store';
-
-import ApplicationActions from '../actions/application_actions';
-import ApplicationStore from '../stores/application_store';
-
-import GlobalNotificationModel from '../models/global_notification_model';
-import GlobalNotificationActions from '../actions/global_notification_actions';
-
-import ReactS3FineUploader from './ascribe_uploader/react_s3_fine_uploader';
-
-import CollapsibleParagraph from './ascribe_collapsible/collapsible_paragraph';
-import Form from './ascribe_forms/form';
-import Property from './ascribe_forms/property';
-import InputCheckbox from './ascribe_forms/input_checkbox';
-
-import ActionPanel from './ascribe_panel/action_panel';
-
-import ApiUrls from '../constants/api_urls';
-import AppConstants from '../constants/application_constants';
-
-import { getLangText } from '../utils/lang_utils';
-import { getCookie } from '../utils/fetch_api_utils';
-
-let SettingsContainer = React.createClass({
-    propTypes: {
-        children: React.PropTypes.oneOfType([
-            React.PropTypes.arrayOf(React.PropTypes.element),
-            React.PropTypes.element])
-    },
-
-    mixins: [Router.Navigation],
-
-    render() {
-        return (
-            <div className="settings-container">
-                <AccountSettings />
-                {this.props.children}
-                <APISettings />
-                <BitcoinWalletSettings />
-                <ContractSettings />
-                <br />
-                <br />
-            </div>
-        );
-    }
-});
-
-
-let AccountSettings = React.createClass({
-    getInitialState() {
-        return UserStore.getState();
-    },
-
-    componentDidMount() {
-        UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
-    },
-
-    componentWillUnmount() {
-        UserStore.unlisten(this.onChange);
-    },
-
-    onChange(state) {
-        this.setState(state);
-    },
-
-    handleSuccess(){
-        UserActions.fetchCurrentUser();
-        let notification = new GlobalNotificationModel(getLangText('Settings succesfully updated'), 'success', 5000);
-        GlobalNotificationActions.appendGlobalNotification(notification);
-    },
-
-    getFormDataProfile(){
-        return {'email': this.state.currentUser.email};
-    },
-    
-    render() {
-        let content = <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />;
-        let profile = null;
-
-        if (this.state.currentUser.username) {
-            content = (
-                <Form
-                    url={ApiUrls.users_username}
-                    handleSuccess={this.handleSuccess}>
-                    <Property
-                        name='username'
-                        label={getLangText('Username')}>
-                        <input
-                            type="text"
-                            defaultValue={this.state.currentUser.username}
-                            placeholder={getLangText('Enter your username')}
-                            required/>
-                    </Property>
-                    <Property
-                        name='email'
-                        label={getLangText('Email')}
-                        editable={false}>
-                        <input
-                            type="text"
-                            defaultValue={this.state.currentUser.email}
-                            placeholder={getLangText('Enter your username')}
-                            required/>
-                    </Property>
-                    <hr />
-                </Form>
-            );
-            profile = (
-                <Form
-                    url={ApiUrls.users_profile}
-                    handleSuccess={this.handleSuccess}
-                    getFormData={this.getFormDataProfile}>
-                    <Property
-                        name="hash_locally"
-                        className="ascribe-settings-property-collapsible-toggle"
-                        style={{paddingBottom: 0}}>
-                        <InputCheckbox
-                            defaultChecked={this.state.currentUser.profile.hash_locally}>
-                            <span>
-                                {' ' + getLangText('Enable hash option, e.g. slow connections or to keep piece private')}
-                            </span>
-                        </InputCheckbox>
-                    </Property>
-                    <hr />
-                    {/*<Property
-                        name='language'
-                        label={getLangText('Choose your Language')}
-                        editable={true}>
-                        <select id="select-lang" name="language">
-                            <option value="fr">
-                                Fran&ccedil;ais
-                            </option>
-                            <option value="en"
-                                    selected="selected">
-                                English
-                            </option>
-                        </select>
-                    </Property>*/}
-                </Form>
-            );
-        }
-        return (
-            <CollapsibleParagraph
-                title={getLangText('Account')}
-                show={true}
-                defaultExpanded={true}>
-                {content}
-                {profile}
-                {/*<Form
-                    url={AppConstants.serverUrl + 'api/users/set_language/'}>
-                    <Property
-                        name='language'
-                        label={getLangText('Choose your Language')}
-                        editable={true}>
-                        <select id="select-lang" name="language">
-                            <option value="fr">
-                                Fran&ccedil;ais
-                            </option>
-                            <option value="en"
-                                    selected="selected">
-                                English
-                            </option>
-                        </select>
-                    </Property>
-                    <hr />
-                </Form>*/}
-            </CollapsibleParagraph>
-        );
-    }
-});
-
-
-
-let BitcoinWalletSettings = React.createClass({
-
-    propTypes: {
-        defaultExpanded: React.PropTypes.bool
-    },
-
-    getInitialState() {
-        return WalletSettingsStore.getState();
-    },
-
-    componentDidMount() {
-        WalletSettingsStore.listen(this.onChange);
-        WalletSettingsActions.fetchWalletSettings();
-    },
-
-    componentWillUnmount() {
-        WalletSettingsStore.unlisten(this.onChange);
-    },
-
-    onChange(state) {
-        this.setState(state);
-    },
-
-    render() {
-        let content = <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />;
-        if (this.state.walletSettings.btc_public_key) {
-            content = (
-                <Form >
-                    <Property
-                        name='btc_public_key'
-                        label={getLangText('Bitcoin public key')}
-                        editable={false}>
-                        <pre className="ascribe-pre">{this.state.walletSettings.btc_public_key}</pre>
-                    </Property>
-                    <Property
-                        name='btc_root_address'
-                        label={getLangText('Root Address')}
-                        editable={false}>
-                        <pre className="ascribe-pre">{this.state.walletSettings.btc_root_address}</pre>
-                    </Property>
-                    <hr />
-                </Form>);
-        }
-        return (
-            <CollapsibleParagraph
-                title={getLangText('Crypto Wallet')}
-                show={true}
-                defaultExpanded={this.props.defaultExpanded}>
-                {content}
-            </CollapsibleParagraph>
-        );
-    }
-});
-
-let ContractSettings = React.createClass({
-    propTypes: {
-        defaultExpanded: React.PropTypes.bool
-    },
-
-    render() {
-        return (
-            <CollapsibleParagraph
-                title={getLangText('Contract Settings')}
-                show={true}
-                defaultExpanded={this.props.defaultExpanded}>
-                    <FileUploader />
-            </CollapsibleParagraph>
-        );
-    }
-});
-
-let FileUploader = React.createClass({
-    propTypes: {
-    },
-
-    render() {
-        return (
-            <Form>
-                <Property
-                    label="Contract file">
-                    <ReactS3FineUploader
-                        keyRoutine={{
-                            url: AppConstants.serverUrl + 's3/key/',
-                            fileClass: 'contract'
-                        }}
-                        createBlobRoutine={{
-                            url: ApiUrls.blob_otherdatas
-                        }}
-                        validation={{
-                            itemLimit: 100000,
-                            sizeLimit: '50000000'
-                        }}
-                        session={{
-                            endpoint: ApiUrls.blob_otherdatas,
-                            customHeaders: {
-                                'X-CSRFToken': getCookie(AppConstants.csrftoken)
-                            },
-                            cors: {
-                                expected: true,
-                                sendCredentials: true
-                            }
-                        }}
-                        signature={{
-                            endpoint: AppConstants.serverUrl + 's3/signature/',
-                            customHeaders: {
-                               'X-CSRFToken': getCookie(AppConstants.csrftoken)
-                            }
-                        }}
-                        deleteFile={{
-                            enabled: true,
-                            method: 'DELETE',
-                            endpoint: AppConstants.serverUrl + 's3/delete',
-                            customHeaders: {
-                               'X-CSRFToken': getCookie(AppConstants.csrftoken)
-                            }
-                        }}
-                        areAssetsDownloadable={true}
-                        areAssetsEditable={true}/>
-                </Property>
-                <hr />
-            </Form>
-        );
-    }
-});
-
-let APISettings = React.createClass({
-    propTypes: {
-        defaultExpanded: React.PropTypes.bool
-    },
-
-    getInitialState() {
-        return ApplicationStore.getState();
-    },
-
-    componentDidMount() {
-        ApplicationStore.listen(this.onChange);
-        ApplicationActions.fetchApplication();
-    },
-
-    componentWillUnmount() {
-        ApplicationStore.unlisten(this.onChange);
-    },
-
-    onChange(state) {
-        this.setState(state);
-    },
-
-    handleCreateSuccess() {
-        ApplicationActions.fetchApplication();
-        let notification = new GlobalNotificationModel(getLangText('Application successfully created'), 'success', 5000);
-        GlobalNotificationActions.appendGlobalNotification(notification);
-    },
-
-    handleTokenRefresh(event) {
-        let applicationName = event.target.getAttribute('data-id');
-        ApplicationActions.refreshApplicationToken(applicationName);
-
-        let notification = new GlobalNotificationModel(getLangText('Token refreshed'), 'success', 2000);
-        GlobalNotificationActions.appendGlobalNotification(notification);
-    },
-
-    getApplications(){
-        let content = <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />;
-        if (this.state.applications.length > -1) {
-            content = this.state.applications.map(function(app, i) {
-                return (
-                    <ActionPanel
-                        name={app.name}
-                        key={i}
-                        content={
-                            <div>
-                                <div className='ascribe-panel-title'>
-                                    {app.name}
-                                </div>
-                                <div className="ascribe-panel-subtitle">
-                                    {'Bearer ' + app.bearer_token.token}
-                                </div>
-                            </div>
-                        }
-                        buttons={
-                            <div className="pull-right">
-                                <div className="pull-right">
-                                    <button
-                                        className="pull-right btn btn-default btn-sm"
-                                        onClick={this.handleTokenRefresh}
-                                        data-id={app.name}>
-                                        {getLangText('REFRESH')}
-                                    </button>
-                                </div>
-                            </div>
-                        }/>
-                    );
-            }, this);
-        }
-        return content;
-    },
-    
-    render() {
-        return (
-            <CollapsibleParagraph
-                title={getLangText('API Integration')}
-                show={true}
-                defaultExpanded={this.props.defaultExpanded}>
-                <Form
-                    url={ApiUrls.applications}
-                    handleSuccess={this.handleCreateSuccess}>
-                    <Property
-                        name='name'
-                        label={getLangText('Application Name')}>
-                        <input
-                            type="text"
-                            placeholder={getLangText('Enter the name of your app')}
-                            required/>
-                    </Property>
-                    <hr />
-                </Form>
-                <pre>
-                    Usage: curl &lt;url&gt; -H 'Authorization: Bearer &lt;token&gt;'
-                </pre>
-                {this.getApplications()}
-            </CollapsibleParagraph>
-        );
-    }
-});
-
-export default SettingsContainer;
diff --git a/js/components/whitelabel/prize/components/prize_settings_container.js b/js/components/whitelabel/prize/components/prize_settings_container.js
index f81e7078..86d0f77d 100644
--- a/js/components/whitelabel/prize/components/prize_settings_container.js
+++ b/js/components/whitelabel/prize/components/prize_settings_container.js
@@ -9,7 +9,7 @@ import PrizeStore from '../stores/prize_store';
 import PrizeJuryActions from '../actions/prize_jury_actions';
 import PrizeJuryStore from '../stores/prize_jury_store';
 
-import SettingsContainer from '../../../settings_container';
+import SettingsContainer from '../../../ascribe_settings/settings_container';
 import CollapsibleParagraph from '../../../ascribe_collapsible/collapsible_paragraph';
 
 import Form from '../../../ascribe_forms/form';
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 1a32f46f..1c4ef4a7 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -11,7 +11,7 @@ import PasswordResetContainer from '../../../components/password_reset_container
 import PieceList from '../../../components/piece_list';
 import PieceContainer from '../../../components/ascribe_detail/piece_container';
 import EditionContainer from '../../../components/ascribe_detail/edition_container';
-import SettingsContainer from '../../../components/settings_container';
+import SettingsContainer from '../../../components/ascribe_settings/settings_container';
 import RegisterPiece from '../../../components/register_piece';
 
 import CylandLanding from './components/cyland/cyland_landing';
diff --git a/js/routes.js b/js/routes.js
index f76e4b45..2762052b 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -17,7 +17,7 @@ import LogoutContainer from './components/logout_container';
 import SignupContainer from './components/signup_container';
 import PasswordResetContainer from './components/password_reset_container';
 
-import SettingsContainer from './components/settings_container';
+import SettingsContainer from './components/ascribe_settings/settings_container';
 import CoaVerifyContainer from './components/coa_verify_container';
 
 import RegisterPiece from './components/register_piece';