diff --git a/js/actions/application_actions.js b/js/actions/application_actions.js
index 733746cf..e7f96275 100644
--- a/js/actions/application_actions.js
+++ b/js/actions/application_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ApplicationFetcher from '../fetchers/application_fetcher';
 
 
diff --git a/js/actions/coa_actions.js b/js/actions/coa_actions.js
index da279bc6..d3d13290 100644
--- a/js/actions/coa_actions.js
+++ b/js/actions/coa_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import CoaFetcher from '../fetchers/coa_fetcher';
 
 import Q from 'q';
diff --git a/js/actions/contract_agreement_list_actions.js b/js/actions/contract_agreement_list_actions.js
index 589c1f51..4993b129 100644
--- a/js/actions/contract_agreement_list_actions.js
+++ b/js/actions/contract_agreement_list_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import OwnershipFetcher from '../fetchers/ownership_fetcher';
diff --git a/js/actions/contract_list_actions.js b/js/actions/contract_list_actions.js
index 5b874caf..1c5c0913 100644
--- a/js/actions/contract_list_actions.js
+++ b/js/actions/contract_list_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import OwnershipFetcher from '../fetchers/ownership_fetcher';
 import Q from 'q';
 
diff --git a/js/actions/edition_actions.js b/js/actions/edition_actions.js
index 473da0e4..4bdf093a 100644
--- a/js/actions/edition_actions.js
+++ b/js/actions/edition_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import EditionFetcher from '../fetchers/edition_fetcher';
 
 
diff --git a/js/actions/edition_list_actions.js b/js/actions/edition_list_actions.js
index fb0a2249..6f9881ee 100644
--- a/js/actions/edition_list_actions.js
+++ b/js/actions/edition_list_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import EditionListFetcher from '../fetchers/edition_list_fetcher.js';
diff --git a/js/actions/event_actions.js b/js/actions/event_actions.js
index 8f1def9f..6d8ee12f 100644
--- a/js/actions/event_actions.js
+++ b/js/actions/event_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 
 
 class EventActions {
@@ -16,4 +16,4 @@ class EventActions {
     }
 }
 
-export default alt.createActions(EventActions);
+export default altThirdParty.createActions(EventActions);
diff --git a/js/actions/global_notification_actions.js b/js/actions/global_notification_actions.js
index b12f7906..2bb8d6e6 100644
--- a/js/actions/global_notification_actions.js
+++ b/js/actions/global_notification_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 
 
 class GlobalNotificationActions {
diff --git a/js/actions/license_actions.js b/js/actions/license_actions.js
index bfeacd34..ad9a3d08 100644
--- a/js/actions/license_actions.js
+++ b/js/actions/license_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import LicenseFetcher from '../fetchers/license_fetcher';
 
 
diff --git a/js/actions/notification_actions.js b/js/actions/notification_actions.js
index 9318c922..c3a6db93 100644
--- a/js/actions/notification_actions.js
+++ b/js/actions/notification_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import NotificationFetcher from '../fetchers/notification_fetcher';
diff --git a/js/actions/ownership_actions.js b/js/actions/ownership_actions.js
index 222309bb..deef2f2d 100644
--- a/js/actions/ownership_actions.js
+++ b/js/actions/ownership_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import OwnershipFetcher from '../fetchers/ownership_fetcher';
 
 
diff --git a/js/actions/piece_actions.js b/js/actions/piece_actions.js
index e3a41f93..7aed13fc 100644
--- a/js/actions/piece_actions.js
+++ b/js/actions/piece_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import PieceFetcher from '../fetchers/piece_fetcher';
 
 
diff --git a/js/actions/piece_list_actions.js b/js/actions/piece_list_actions.js
index ae5ac090..2a4464af 100644
--- a/js/actions/piece_list_actions.js
+++ b/js/actions/piece_list_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import PieceListFetcher from '../fetchers/piece_list_fetcher';
diff --git a/js/actions/prize_list_actions.js b/js/actions/prize_list_actions.js
index fddf1a04..da2f97df 100644
--- a/js/actions/prize_list_actions.js
+++ b/js/actions/prize_list_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import PrizeListFetcher from '../fetchers/prize_list_fetcher';
diff --git a/js/actions/user_actions.js b/js/actions/user_actions.js
index 2a2c3c05..661890e9 100644
--- a/js/actions/user_actions.js
+++ b/js/actions/user_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altUser } from '../alt';
 import UserFetcher from '../fetchers/user_fetcher';
 
 
@@ -34,4 +34,4 @@ class UserActions {
     }
 }
 
-export default alt.createActions(UserActions);
+export default altUser.createActions(UserActions);
diff --git a/js/actions/wallet_settings_actions.js b/js/actions/wallet_settings_actions.js
index 11a21631..1094c8e2 100644
--- a/js/actions/wallet_settings_actions.js
+++ b/js/actions/wallet_settings_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import WalletSettingsFetcher from '../fetchers/wallet_settings_fetcher';
 
 
diff --git a/js/actions/whitelabel_actions.js b/js/actions/whitelabel_actions.js
index 41ab1421..a1460fb8 100644
--- a/js/actions/whitelabel_actions.js
+++ b/js/actions/whitelabel_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altWhitelabel } from '../alt';
 import WhitelabelFetcher from '../fetchers/whitelabel_fetcher';
 
 
@@ -26,4 +26,4 @@ class WhitelabelActions {
     }
 }
 
-export default alt.createActions(WhitelabelActions);
+export default altWhitelabel.createActions(WhitelabelActions);
diff --git a/js/alt.js b/js/alt.js
index 94786185..141248c1 100644
--- a/js/alt.js
+++ b/js/alt.js
@@ -2,4 +2,7 @@
 
 import Alt from 'alt';
 
-export default new Alt();
+export let alt = new Alt();
+export let altThirdParty = new Alt();
+export let altUser = new Alt();
+export let altWhitelabel = new Alt();
diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js
index 9bf0bd5b..f8e34fda 100644
--- a/js/components/ascribe_detail/further_details_fileuploader.js
+++ b/js/components/ascribe_detail/further_details_fileuploader.js
@@ -43,7 +43,7 @@ let FurtherDetailsFileuploader = React.createClass({
 
         return (
             <Property
-                label="Additional files (max. 50MB per file)">
+                label="Additional files">
                 <ReactS3FineUploader
                     uploadStarted={this.props.uploadStarted}
                     keyRoutine={{
diff --git a/js/components/ascribe_forms/input_checkbox.js b/js/components/ascribe_forms/input_checkbox.js
index 38885441..a0ee1a70 100644
--- a/js/components/ascribe_forms/input_checkbox.js
+++ b/js/components/ascribe_forms/input_checkbox.js
@@ -22,6 +22,7 @@ let InputCheckbox = React.createClass({
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
         ]),
+        name: React.PropTypes.string,
 
         // provided by Property
         disabled: React.PropTypes.bool,
@@ -50,7 +51,7 @@ let InputCheckbox = React.createClass({
 
         // Developer's are used to define defaultValues for inputs via defaultValue, but since this is a
         // input of type checkbox we warn the dev to not do that.
-        if(this.props.defaultValue) {
+        if(this.props.defaultValue) { //eslint-disable-line react/prop-types
             console.warn('InputCheckbox is of type checkbox. Therefore its value is represented by checked and defaultChecked. defaultValue will do nothing!');
         }
 
@@ -102,8 +103,10 @@ let InputCheckbox = React.createClass({
         return (
             <span
                 style={this.props.style}
-                onClick={this.onChange}>
+                onClick={this.onChange}
+                name={this.props.name}>
                 <input
+                    name={this.props.name}
                     type="checkbox"
                     ref="checkbox"
                     onChange={this.onChange}
@@ -119,4 +122,4 @@ let InputCheckbox = React.createClass({
     }
 });
 
-export default InputCheckbox;
\ No newline at end of file
+export default InputCheckbox;
diff --git a/js/components/ascribe_forms/property.js b/js/components/ascribe_forms/property.js
index 93ef05d2..793be538 100644
--- a/js/components/ascribe_forms/property.js
+++ b/js/components/ascribe_forms/property.js
@@ -31,6 +31,7 @@ let Property = React.createClass({
         footer: React.PropTypes.element,
         handleChange: React.PropTypes.func,
         ignoreFocus: React.PropTypes.bool,
+        name: React.PropTypes.string.isRequired,
         className: React.PropTypes.string,
 
         onClick: React.PropTypes.func,
@@ -215,7 +216,8 @@ let Property = React.createClass({
                 onFocus: this.handleFocus,
                 onBlur: this.handleBlur,
                 disabled: !this.props.editable,
-                ref: 'input'
+                ref: 'input',
+                name: this.props.name
             });
         });
     },
@@ -264,4 +266,4 @@ let Property = React.createClass({
     }
 });
 
-export default Property;
\ No newline at end of file
+export default Property;
diff --git a/js/components/logout_container.js b/js/components/logout_container.js
index c7769867..74c16439 100644
--- a/js/components/logout_container.js
+++ b/js/components/logout_container.js
@@ -4,7 +4,7 @@ import React from 'react';
 import Router from 'react-router';
 
 import UserActions from '../actions/user_actions';
-import Alt from '../alt';
+import { alt, altWhitelabel, altUser, altThirdParty } from '../alt';
 
 import AppConstants from '../constants/application_constants';
 let baseUrl = AppConstants.baseUrl;
@@ -16,7 +16,10 @@ let LogoutContainer = React.createClass({
     componentDidMount() {
         UserActions.logoutCurrentUser()
             .then(() => {
-                Alt.flush();
+                alt.flush();
+                altWhitelabel.flush();
+                altUser.flush();
+                altThirdParty.flush();
                 // kill intercom (with fire)
                 window.Intercom('shutdown');
                 this.replaceWith(baseUrl);
diff --git a/js/components/whitelabel/prize/actions/prize_actions.js b/js/components/whitelabel/prize/actions/prize_actions.js
index 5646e2d6..fcd9e91e 100644
--- a/js/components/whitelabel/prize/actions/prize_actions.js
+++ b/js/components/whitelabel/prize/actions/prize_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 import Q from 'q';
 
 import PrizeFetcher from '../fetchers/prize_fetcher';
diff --git a/js/components/whitelabel/prize/actions/prize_jury_actions.js b/js/components/whitelabel/prize/actions/prize_jury_actions.js
index bd0a25af..9bd03f59 100644
--- a/js/components/whitelabel/prize/actions/prize_jury_actions.js
+++ b/js/components/whitelabel/prize/actions/prize_jury_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 import Q from 'q';
 
 import PrizeJuryFetcher from '../fetchers/prize_jury_fetcher';
diff --git a/js/components/whitelabel/prize/actions/prize_rating_actions.js b/js/components/whitelabel/prize/actions/prize_rating_actions.js
index 1e42f8ba..184d84e7 100644
--- a/js/components/whitelabel/prize/actions/prize_rating_actions.js
+++ b/js/components/whitelabel/prize/actions/prize_rating_actions.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 import Q from 'q';
 
 import PrizeRatingFetcher from '../fetchers/prize_rating_fetcher';
diff --git a/js/components/whitelabel/prize/stores/prize_jury_store.js b/js/components/whitelabel/prize/stores/prize_jury_store.js
index 88ed21ac..69d73e3a 100644
--- a/js/components/whitelabel/prize/stores/prize_jury_store.js
+++ b/js/components/whitelabel/prize/stores/prize_jury_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 
 import PrizeJuryActions from '../actions/prize_jury_actions';
 
diff --git a/js/components/whitelabel/prize/stores/prize_rating_store.js b/js/components/whitelabel/prize/stores/prize_rating_store.js
index 9b7a2126..d67fa603 100644
--- a/js/components/whitelabel/prize/stores/prize_rating_store.js
+++ b/js/components/whitelabel/prize/stores/prize_rating_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 
 import PrizeRatingActions from '../actions/prize_rating_actions';
 
diff --git a/js/components/whitelabel/prize/stores/prize_store.js b/js/components/whitelabel/prize/stores/prize_store.js
index f311e1fe..68cc9264 100644
--- a/js/components/whitelabel/prize/stores/prize_store.js
+++ b/js/components/whitelabel/prize/stores/prize_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 
 import PrizeActions from '../actions/prize_actions';
 
diff --git a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
index b00d10cc..3e60c653 100644
--- a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
+++ b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
@@ -49,7 +49,7 @@ let WalletActionPanel = React.createClass({
                     className="text-center ascribe-button-list"
                     availableAcls={availableAcls}
                     editions={this.props.piece}
-                    handleSuccess={this.loadPiece}>
+                    handleSuccess={this.props.loadPiece}>
                     <AclProxy
                         aclObject={this.props.currentUser.acl}
                         aclName="acl_wallet_submit">
@@ -58,7 +58,6 @@ let WalletActionPanel = React.createClass({
                             aclName="acl_wallet_submit">
                             <SubmitButtonType
                                 className="btn-sm"
-                                handleSuccess={this.handleSubmitSuccess}
                                 piece={this.props.piece}/>
                         </AclProxy>
                     </AclProxy>
diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js
similarity index 98%
rename from js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js
rename to js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js
index 3e3676bc..ae96db98 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js
@@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
 import GlobalNotificationModel from '../../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
 
-import CylandSubmitButton from '../ascribe_buttons/cyland_submit_button';
+import CylandSubmitButton from '../cyland_buttons/cyland_submit_button';
 import AclProxy from '../../../../../acl_proxy';
 
 import { getLangText } from '../../../../../../utils/lang_utils';
diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js b/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js
similarity index 99%
rename from js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js
rename to js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js
index 72ff595b..d8a039a3 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js
@@ -10,6 +10,7 @@ import WhitelabelStore from '../../../../../../stores/whitelabel_store';
 
 import { getLangText } from '../../../../../../utils/lang_utils';
 
+
 let CylandSubmitButton = React.createClass({
     propTypes: {
         className: React.PropTypes.string,
diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js
similarity index 92%
rename from js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
rename to js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js
index 59ebe54f..80328870 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js
@@ -7,11 +7,11 @@ import PieceStore from '../../../../../../stores/piece_store';
 
 import UserStore from '../../../../../../stores/user_store';
 
-import CylandSubmitButton from '../ascribe_buttons/cyland_submit_button';
+import CylandSubmitButton from '../cyland_buttons/cyland_submit_button';
 
 import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
 
-import CylandAdditionalDataForm from '../ascribe_forms/cyland_additional_data_form';
+import CylandAdditionalDataForm from '../cyland_forms/cyland_additional_data_form';
 
 import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
 
@@ -21,6 +21,10 @@ import { getLangText } from '../../../../../../utils/lang_utils';
 import { mergeOptions } from '../../../../../../utils/general_utils';
 
 let CylandPieceContainer = React.createClass({
+    propTypes: {
+        params: React.PropTypes.object
+    },
+
     getInitialState() {
         return mergeOptions(
             PieceStore.getState(),
diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js b/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
similarity index 97%
rename from js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
rename to js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
index 0ddbeb56..df143656 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
@@ -35,17 +35,17 @@ let CylandAdditionalDataForm = React.createClass({
         };
     },
 
-    handleSuccess() {
-        let notification = new GlobalNotificationModel('Further details successfully updated', 'success', 10000);
-        GlobalNotificationActions.appendGlobalNotification(notification);
-    },
-
     getInitialState() {
         return {
             isUploadReady: true
         };
     },
 
+    handleSuccess() {
+        let notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+
     getFormData() {
         let extradata = {};
         let formRefs = this.refs.form.refs;
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_hero.js b/js/components/whitelabel/wallet/components/cyland/cyland_hero.js
index c1f6c494..8b144435 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_hero.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_hero.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import constants from '../../../../constants/application_constants';
+import AppConstants from '../../../../constants/application_constants';
 
 
 let Hero = React.createClass({
@@ -9,7 +9,7 @@ let Hero = React.createClass({
         return (
             <div className="hero">
                 <img
-                    className="logo" src={constants.whitelabel.logo}
+                    className="logo" src={AppConstants.whitelabel.logo}
                     alt="Cyland Video Archive"
                     height="200px"/>
             </div>
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js
index 9924f550..29d966cc 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js
@@ -3,7 +3,6 @@
 import React from 'react';
 import Router from 'react-router';
 
-
 import WhitelabelActions from '../../../../../actions/whitelabel_actions';
 import WhitelabelStore from '../../../../../stores/whitelabel_store';
 
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js b/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js
index 3b1c70c0..f5270bcf 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js
@@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
 import UserActions from '../../../../../actions/user_actions';
 import UserStore from '../../../../../stores/user_store';
 
-import CylandAccordionListItem from './ascribe_accordion_list/cyland_accordion_list_item';
+import CylandAccordionListItem from './cyland_accordion_list/cyland_accordion_list_item';
 
 import { getLangText } from '../../../../../utils/lang_utils';
 
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
index 84713bd9..710bef3e 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
@@ -25,7 +25,7 @@ import PieceActions from '../../../../../actions/piece_actions';
 import GlobalNotificationModel from '../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../actions/global_notification_actions';
 
-import CylandAdditionalDataForm from './ascribe_forms/cyland_additional_data_form';
+import CylandAdditionalDataForm from './cyland_forms/cyland_additional_data_form';
 
 import LoanForm from '../../../../ascribe_forms/form_loan';
 
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js
similarity index 98%
rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js
index 8561cfae..00e7f318 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js
@@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
 import GlobalNotificationModel from '../../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
 
-import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button';
+import IkonotvSubmitButton from '../ikonotv_buttons/ikonotv_submit_button';
 
 import AclProxy from '../../../../../acl_proxy';
 
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js
similarity index 96%
rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js
rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js
index 523f9fe2..0a2b46bc 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js
@@ -9,7 +9,6 @@ import { getLangText } from '../../../../../../utils/lang_utils';
 let IkonotvSubmitButton = React.createClass({
     propTypes: {
         className: React.PropTypes.string,
-        handleSuccess: React.PropTypes.func,
         piece: React.PropTypes.object.isRequired
     },
 
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js
similarity index 93%
rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js
rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js
index d8d58ebe..b9d90dde 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js
@@ -7,13 +7,12 @@ import PieceStore from '../../../../../../stores/piece_store';
 
 import UserStore from '../../../../../../stores/user_store';
 
-
-import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button';
+import IkonotvSubmitButton from '../ikonotv_buttons/ikonotv_submit_button';
 
 import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
 
-import IkonotvArtistDetailsForm from '../ascribe_forms/ikonotv_artist_details_form';
-import IkonotvArtworkDetailsForm from '../ascribe_forms/ikonotv_artwork_details_form';
+import IkonotvArtistDetailsForm from '../ikonotv_forms/ikonotv_artist_details_form';
+import IkonotvArtworkDetailsForm from '../ikonotv_forms/ikonotv_artwork_details_form';
 
 import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
 
@@ -22,7 +21,12 @@ import AscribeSpinner from '../../../../../ascribe_spinner';
 import { getLangText } from '../../../../../../utils/lang_utils';
 import { mergeOptions } from '../../../../../../utils/general_utils';
 
+
 let IkonotvPieceContainer = React.createClass({
+    propTypes: {
+        params: React.PropTypes.object
+    },
+
     getInitialState() {
         return mergeOptions(
             PieceStore.getState(),
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
similarity index 100%
rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js
rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
similarity index 100%
rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js
rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js
index 053d21b3..36869fef 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js
@@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
 import UserActions from '../../../../../actions/user_actions';
 import UserStore from '../../../../../stores/user_store';
 
-import IkonotvAccordionListItem from './ascribe_accordion_list/ikonotv_accordion_list_item';
+import IkonotvAccordionListItem from './ikonotv_accordion_list/ikonotv_accordion_list_item';
 
 import { getLangText } from '../../../../../utils/lang_utils';
 
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
index 38078747..4cf1ccfb 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
@@ -22,8 +22,8 @@ import GlobalNotificationActions from '../../../../../actions/global_notificatio
 import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
 import LoanForm from '../../../../ascribe_forms/form_loan';
 
-import IkonotvArtistDetailsForm from './ascribe_forms/ikonotv_artist_details_form';
-import IkonotvArtworkDetailsForm from './ascribe_forms/ikonotv_artwork_details_form';
+import IkonotvArtistDetailsForm from './ikonotv_forms/ikonotv_artist_details_form';
+import IkonotvArtworkDetailsForm from './ikonotv_forms/ikonotv_artwork_details_form';
 
 import SlidesContainer from '../../../../ascribe_slides_container/slides_container';
 
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 7097a88b..44bad476 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -17,7 +17,7 @@ import ContractSettings from '../../../components/ascribe_settings/contract_sett
 import ErrorNotFoundPage from '../../../components/error_not_found_page';
 
 import CylandLanding from './components/cyland/cyland_landing';
-import CylandPieceContainer from './components/cyland/ascribe_detail/cyland_piece_container';
+import CylandPieceContainer from './components/cyland/cyland_detail/cyland_piece_container';
 import CylandRegisterPiece from './components/cyland/cyland_register_piece';
 import CylandPieceList from './components/cyland/cyland_piece_list';
 
@@ -25,7 +25,7 @@ import IkonotvLanding from './components/ikonotv/ikonotv_landing';
 import IkonotvPieceList from './components/ikonotv/ikonotv_piece_list';
 import IkonotvRequestLoan from './components/ikonotv/ikonotv_request_loan';
 import IkonotvRegisterPiece from './components/ikonotv/ikonotv_register_piece';
-import IkonotvPieceContainer from './components/ikonotv/ascribe_detail/ikonotv_piece_container';
+import IkonotvPieceContainer from './components/ikonotv/ikonotv_detail/ikonotv_piece_container';
 import IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_notifications';
 
 import CCRegisterPiece from './components/cc/cc_register_piece';
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index c74fdce9..ce893791 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -61,7 +61,7 @@ let constants = {
         'validation': {
             'additionalData': {
                 'itemLimit': 100,
-                'sizeLimit': '50000000'
+                'sizeLimit': '25000000000'
             },
             'registerWork': {
                 'itemLimit': 1,
diff --git a/js/stores/application_store.js b/js/stores/application_store.js
index 5eb89e24..6fefa573 100644
--- a/js/stores/application_store.js
+++ b/js/stores/application_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ApplicationActions from '../actions/application_actions';
 
 
diff --git a/js/stores/coa_store.js b/js/stores/coa_store.js
index fa71771e..e76e480e 100644
--- a/js/stores/coa_store.js
+++ b/js/stores/coa_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import CoaActions from '../actions/coa_actions';
 
 
diff --git a/js/stores/contract_agreement_list_store.js b/js/stores/contract_agreement_list_store.js
index ca1d8e6b..aef13850 100644
--- a/js/stores/contract_agreement_list_store.js
+++ b/js/stores/contract_agreement_list_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ContractAgreementListActions from '../actions/contract_agreement_list_actions';
 
 
diff --git a/js/stores/contract_list_store.js b/js/stores/contract_list_store.js
index 5bc30d3e..ba35978d 100644
--- a/js/stores/contract_list_store.js
+++ b/js/stores/contract_list_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ContractListActions from '../actions/contract_list_actions';
 
 
diff --git a/js/stores/edition_list_store.js b/js/stores/edition_list_store.js
index b3b152d3..4ccada4e 100644
--- a/js/stores/edition_list_store.js
+++ b/js/stores/edition_list_store.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import EditionsListActions from '../actions/edition_list_actions';
 
 class EditionListStore {
diff --git a/js/stores/edition_store.js b/js/stores/edition_store.js
index 0fa0eb71..14ee4fee 100644
--- a/js/stores/edition_store.js
+++ b/js/stores/edition_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import EditionActions from '../actions/edition_actions';
 
 
diff --git a/js/stores/global_notification_store.js b/js/stores/global_notification_store.js
index bd1bedc6..5a23fe1b 100644
--- a/js/stores/global_notification_store.js
+++ b/js/stores/global_notification_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 
 import GlobalNotificationActions from '../actions/global_notification_actions';
 
diff --git a/js/stores/license_store.js b/js/stores/license_store.js
index 42a6bfb5..29063a91 100644
--- a/js/stores/license_store.js
+++ b/js/stores/license_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import LicenseActions from '../actions/license_actions';
 
 
diff --git a/js/stores/notification_store.js b/js/stores/notification_store.js
index 9f6bdecf..ffb3b0af 100644
--- a/js/stores/notification_store.js
+++ b/js/stores/notification_store.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import alt from '../alt';
+import { alt } from '../alt';
 
 import NotificationActions from '../actions/notification_actions';
 
diff --git a/js/stores/ownership_store.js b/js/stores/ownership_store.js
index eaba7111..6feb2a10 100644
--- a/js/stores/ownership_store.js
+++ b/js/stores/ownership_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import OwnershipActions from '../actions/ownership_actions';
 
 
diff --git a/js/stores/piece_list_store.js b/js/stores/piece_list_store.js
index 488fd0d7..94c57113 100644
--- a/js/stores/piece_list_store.js
+++ b/js/stores/piece_list_store.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import alt from '../alt';
+import { alt } from '../alt';
 
 import PieceListActions from '../actions/piece_list_actions';
 
diff --git a/js/stores/piece_store.js b/js/stores/piece_store.js
index 0bebab10..ccef50b1 100644
--- a/js/stores/piece_store.js
+++ b/js/stores/piece_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import PieceActions from '../actions/piece_actions';
 
 
diff --git a/js/stores/prize_list_store.js b/js/stores/prize_list_store.js
index 99ee5d14..87b94f01 100644
--- a/js/stores/prize_list_store.js
+++ b/js/stores/prize_list_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 
 import PrizeListActions from '../actions/prize_list_actions';
 
diff --git a/js/stores/user_store.js b/js/stores/user_store.js
index 14eb1f90..8ea18eea 100644
--- a/js/stores/user_store.js
+++ b/js/stores/user_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altUser } from '../alt';
 import UserActions from '../actions/user_actions';
 
 
@@ -18,4 +18,4 @@ class UserStore {
     }
 }
 
-export default alt.createStore(UserStore, 'UserStore');
+export default altUser.createStore(UserStore, 'UserStore');
diff --git a/js/stores/wallet_settings_store.js b/js/stores/wallet_settings_store.js
index df4cce99..6449bb24 100644
--- a/js/stores/wallet_settings_store.js
+++ b/js/stores/wallet_settings_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import WalletSettingsActions from '../actions/wallet_settings_actions';
 
 
diff --git a/js/stores/whitelabel_store.js b/js/stores/whitelabel_store.js
index 478b00a2..017fb98e 100644
--- a/js/stores/whitelabel_store.js
+++ b/js/stores/whitelabel_store.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altWhitelabel } from '../alt';
 import WhitelabelActions from '../actions/whitelabel_actions';
 
 
@@ -15,4 +15,4 @@ class WhitelabelStore {
     }
 }
 
-export default alt.createStore(WhitelabelStore, 'WhitelabelStore');
+export default altWhitelabel.createStore(WhitelabelStore, 'WhitelabelStore');
diff --git a/js/third_party/debug.js b/js/third_party/debug.js
index 76178266..23fe4d04 100644
--- a/js/third_party/debug.js
+++ b/js/third_party/debug.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 
@@ -27,4 +27,4 @@ class DebugHandler {
     }
 }
 
-export default alt.createStore(DebugHandler, 'DebugHandler');
+export default altThirdParty.createStore(DebugHandler, 'DebugHandler');
diff --git a/js/third_party/ga.js b/js/third_party/ga.js
index f95450cb..e7929191 100644
--- a/js/third_party/ga.js
+++ b/js/third_party/ga.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 class GoogleAnalyticsHandler {
@@ -23,4 +23,4 @@ class GoogleAnalyticsHandler {
 
 }
 
-export default alt.createStore(GoogleAnalyticsHandler, 'GoogleAnalyticsHandler');
+export default altThirdParty.createStore(GoogleAnalyticsHandler, 'GoogleAnalyticsHandler');
diff --git a/js/third_party/intercom.js b/js/third_party/intercom.js
index 42ecccf7..4ab2ff50 100644
--- a/js/third_party/intercom.js
+++ b/js/third_party/intercom.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 import { getSubdomain } from '../utils/general_utils';
@@ -33,4 +33,4 @@ class IntercomHandler {
 
 }
 
-export default alt.createStore(IntercomHandler, 'IntercomHandler');
+export default altThirdParty.createStore(IntercomHandler, 'IntercomHandler');
diff --git a/js/third_party/notifications.js b/js/third_party/notifications.js
index eeac1bff..90a613b8 100644
--- a/js/third_party/notifications.js
+++ b/js/third_party/notifications.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 import NotificationActions from '../actions/notification_actions';
@@ -35,4 +35,4 @@ class NotificationsHandler {
     }
 }
 
-export default alt.createStore(NotificationsHandler, 'NotificationsHandler');
+export default altThirdParty.createStore(NotificationsHandler, 'NotificationsHandler');
diff --git a/js/third_party/raven.js b/js/third_party/raven.js
index eeb5b390..3d6ff315 100644
--- a/js/third_party/raven.js
+++ b/js/third_party/raven.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 import Raven from 'raven-js';
@@ -25,4 +25,4 @@ class RavenHandler {
     }
 }
 
-export default alt.createStore(RavenHandler, 'RavenHandler');
+export default altThirdParty.createStore(RavenHandler, 'RavenHandler');