diff --git a/js/actions/contract_agreement_list_actions.js b/js/actions/contract_agreement_list_actions.js
index 1eedf5b0..b5337d4c 100644
--- a/js/actions/contract_agreement_list_actions.js
+++ b/js/actions/contract_agreement_list_actions.js
@@ -83,9 +83,9 @@ class ContractAgreementListActions {
                     contractAgreementList in the store is already set to null;
                      */
                 }
-            }).then((publicContracAgreement) => {
-                if (publicContracAgreement) {
-                    this.actions.updateContractAgreementList([publicContracAgreement]);
+            }).then((publicContractAgreement) => {
+                if (publicContractAgreement) {
+                    this.actions.updateContractAgreementList([publicContractAgreement]);
                 }
             }).catch(console.logGlobal);
     }
@@ -93,7 +93,10 @@ class ContractAgreementListActions {
     createContractAgreement(issuer, contract){
         return Q.Promise((resolve, reject) => {
             OwnershipFetcher
-                .createContractAgreement(issuer, contract).then(resolve)
+                .createContractAgreement(issuer, contract)
+                .then((res) => {
+                    resolve(res && res.contractagreement)
+                })
                 .catch((err) => {
                     console.logGlobal(err);
                     reject(err);
diff --git a/js/actions/edition_actions.js b/js/actions/edition_actions.js
index 1727deff..1feee0dd 100644
--- a/js/actions/edition_actions.js
+++ b/js/actions/edition_actions.js
@@ -7,11 +7,11 @@ class EditionActions {
     constructor() {
         this.generateActions(
             'fetchEdition',
-            'successFetchEdition',
             'successFetchCoa',
-            'flushEdition',
+            'successFetchEdition',
             'errorCoa',
-            'errorEdition'
+            'errorEdition',
+            'flushEdition'
         );
     }
 }
diff --git a/js/actions/edition_list_actions.js b/js/actions/edition_list_actions.js
index 6f9881ee..a52e32b9 100644
--- a/js/actions/edition_list_actions.js
+++ b/js/actions/edition_list_actions.js
@@ -17,23 +17,31 @@ class EditionListActions {
         );
     }
 
-    fetchEditionList(pieceId, page, pageSize, orderBy, orderAsc, filterBy) {
-        if((!orderBy && typeof orderAsc === 'undefined') || !orderAsc) {
+    fetchEditionList({ pieceId, page, pageSize, orderBy, orderAsc, filterBy, maxEdition }) {
+        if ((!orderBy && typeof orderAsc === 'undefined') || !orderAsc) {
             orderBy = 'edition_number';
             orderAsc = true;
         }
 
         // Taken from: http://stackoverflow.com/a/519157/1263876
-        if((typeof page === 'undefined' || !page) && (typeof pageSize === 'undefined' || !pageSize)) {
+        if ((typeof page === 'undefined' || !page) && (typeof pageSize === 'undefined' || !pageSize)) {
             page = 1;
             pageSize = 10;
         }
 
+        let itemsToFetch = pageSize;
+        // If we only want to fetch up to a specified edition, fetch all pages up to it
+        // as one page and adjust afterwards
+        if (typeof maxEdition === 'number') {
+            itemsToFetch = Math.ceil(maxEdition / pageSize) * pageSize;
+            page = 1;
+        }
+
         return Q.Promise((resolve, reject) => {
             EditionListFetcher
-                .fetch(pieceId, page, pageSize, orderBy, orderAsc, filterBy)
+                .fetch({ pieceId, page, itemsToFetch, orderBy, orderAsc, filterBy })
                 .then((res) => {
-                    if(res && !res.editions) {
+                    if (res && !res.editions) {
                         throw new Error('Piece has no editions to fetch.');
                     }
 
@@ -44,8 +52,9 @@ class EditionListActions {
                         orderBy,
                         orderAsc,
                         filterBy,
-                        'editionListOfPiece': res.editions,
-                        'count': res.count
+                        maxEdition,
+                        count: res.count,
+                        editionListOfPiece: res.editions
                     });
                     resolve(res);
                 })
@@ -54,7 +63,6 @@ class EditionListActions {
                     reject(err);
                 });
         });
-        
     }
 }
 
diff --git a/js/actions/facebook_actions.js b/js/actions/facebook_actions.js
new file mode 100644
index 00000000..2e784fba
--- /dev/null
+++ b/js/actions/facebook_actions.js
@@ -0,0 +1,14 @@
+'use strict';
+
+import { altThirdParty } from '../alt';
+
+
+class FacebookActions {
+    constructor() {
+        this.generateActions(
+            'sdkReady'
+        );
+    }
+}
+
+export default altThirdParty.createActions(FacebookActions);
diff --git a/js/actions/notification_actions.js b/js/actions/notification_actions.js
index c3a6db93..5d80e1e7 100644
--- a/js/actions/notification_actions.js
+++ b/js/actions/notification_actions.js
@@ -9,10 +9,13 @@ class NotificationActions {
     constructor() {
         this.generateActions(
             'updatePieceListNotifications',
+            'flushPieceListNotifications',
             'updateEditionListNotifications',
+            'flushEditionListNotifications',
             'updateEditionNotifications',
             'updatePieceNotifications',
-            'updateContractAgreementListNotifications'
+            'updateContractAgreementListNotifications',
+            'flushContractAgreementListNotifications'
         );
     }
 
diff --git a/js/actions/piece_actions.js b/js/actions/piece_actions.js
index 9002e8c5..7ad3ae29 100644
--- a/js/actions/piece_actions.js
+++ b/js/actions/piece_actions.js
@@ -1,28 +1,19 @@
 'use strict';
 
 import { alt } from '../alt';
-import PieceFetcher from '../fetchers/piece_fetcher';
 
 
 class PieceActions {
     constructor() {
         this.generateActions(
+            'fetchPiece',
+            'successFetchPiece',
+            'errorPiece',
+            'flushPiece',
             'updatePiece',
-            'updateProperty',
-            'pieceFailed'
+            'updateProperty'
         );
     }
-
-    fetchOne(pieceId) {
-        PieceFetcher.fetchOne(pieceId)
-            .then((res) => {
-                this.actions.updatePiece(res.piece);
-            })
-            .catch((err) => {
-                console.logGlobal(err);
-                this.actions.pieceFailed(err.json);
-            });
-    }
 }
 
 export default alt.createActions(PieceActions);
diff --git a/js/actions/piece_list_actions.js b/js/actions/piece_list_actions.js
index 7ef9cb59..c52ef5e2 100644
--- a/js/actions/piece_list_actions.js
+++ b/js/actions/piece_list_actions.js
@@ -15,7 +15,7 @@ class PieceListActions {
         );
     }
 
-    fetchPieceList(page, pageSize, search, orderBy, orderAsc, filterBy) {
+    fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy }) {
         // To prevent flickering on a pagination request,
         // we overwrite the piecelist with an empty list before
         // pieceListCount === -1 defines the loading state
@@ -34,7 +34,7 @@ class PieceListActions {
         // afterwards, we can load the list
         return Q.Promise((resolve, reject) => {
             PieceListFetcher
-                .fetch(page, pageSize, search, orderBy, orderAsc, filterBy)
+                .fetch({ page, pageSize, search, orderBy, orderAsc, filterBy })
                 .then((res) => {
                     this.actions.updatePieceList({
                         page,
diff --git a/js/actions/prize_list_actions.js b/js/actions/prize_list_actions.js
deleted file mode 100644
index da2f97df..00000000
--- a/js/actions/prize_list_actions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-
-import { alt } from '../alt';
-import Q from 'q';
-
-import PrizeListFetcher from '../fetchers/prize_list_fetcher';
-
-class PrizeListActions {
-    constructor() {
-        this.generateActions(
-            'updatePrizeList'
-        );
-    }
-
-    fetchPrizeList() {
-        return Q.Promise((resolve, reject) => {
-            PrizeListFetcher
-                .fetch()
-                .then((res) => {
-                    this.actions.updatePrizeList({
-                        prizeList: res.prizes,
-                        prizeListCount: res.count
-                    });
-                    resolve(res);
-                })
-                .catch((err) => {
-                    console.logGlobal(err);
-                    reject(err);
-                });
-        });
-    }
-}
-
-export default alt.createActions(PrizeListActions);
\ No newline at end of file
diff --git a/js/app.js b/js/app.js
index 520bedbd..4a8eb7ca 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,14 +1,13 @@
 'use strict';
 
-require('babel/polyfill');
+import 'babel/polyfill';
+import 'classlist-polyfill';
 
 import React from 'react';
 import { Router, Redirect } from 'react-router';
 import history from './history';
 
-/* eslint-disable */
 import fetch from 'isomorphic-fetch';
-/* eslint-enable */
 
 import ApiUrls from './constants/api_urls';
 
@@ -23,15 +22,13 @@ import { getSubdomain } from './utils/general_utils';
 
 import EventActions from './actions/event_actions';
 
-/* eslint-disable */
 // You can comment out the modules you don't need
-// import DebugHandler from './third_party/debug';
-import GoogleAnalyticsHandler from './third_party/ga';
-import RavenHandler from './third_party/raven';
-import IntercomHandler from './third_party/intercom';
-import NotificationsHandler from './third_party/notifications';
-import FacebookHandler from './third_party/facebook';
-/* eslint-enable */
+// import DebugHandler from './third_party/debug_handler';
+import FacebookHandler from './third_party/facebook_handler';
+import GoogleAnalyticsHandler from './third_party/ga_handler';
+import IntercomHandler from './third_party/intercom_handler';
+import NotificationsHandler from './third_party/notifications_handler';
+import RavenHandler from './third_party/raven_handler';
 
 initLogging();
 
@@ -105,4 +102,3 @@ class AppGateway {
 
 let ag = new AppGateway();
 ag.start();
-
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js
index 8033f239..2bb8b2d0 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js
@@ -19,9 +19,10 @@ import { getLangText } from '../../utils/lang_utils';
 
 let AccordionListItemEditionWidget = React.createClass({
     propTypes: {
-        className: React.PropTypes.string,
         piece: React.PropTypes.object.isRequired,
         toggleCreateEditionsDialog: React.PropTypes.func.isRequired,
+
+        className: React.PropTypes.string,
         onPollingSuccess: React.PropTypes.func
     },
 
@@ -50,14 +51,15 @@ let AccordionListItemEditionWidget = React.createClass({
      * Calls the store to either show or hide the editionListTable
      */
     toggleTable() {
-        let pieceId = this.props.piece.id;
-        let isEditionListOpen = this.state.isEditionListOpenForPieceId[pieceId] ? this.state.isEditionListOpenForPieceId[pieceId].show : false;
-        
-        if(isEditionListOpen) {
+        const { piece: { id: pieceId } } = this.props;
+        const { filterBy, isEditionListOpenForPieceId } = this.state;
+        const isEditionListOpen = isEditionListOpenForPieceId[pieceId] ? isEditionListOpenForPieceId[pieceId].show : false;
+
+        if (isEditionListOpen) {
             EditionListActions.toggleEditionList(pieceId);
         } else {
             EditionListActions.toggleEditionList(pieceId);
-            EditionListActions.fetchEditionList(pieceId, null, null, null, null, this.state.filterBy);
+            EditionListActions.fetchEditionList({ pieceId, filterBy });
         }
     },
 
@@ -68,7 +70,7 @@ let AccordionListItemEditionWidget = React.createClass({
     getGlyphicon() {
         let pieceId = this.props.piece.id;
         let isEditionListOpen = this.state.isEditionListOpenForPieceId[pieceId] ? this.state.isEditionListOpenForPieceId[pieceId].show : false;
-        
+
         if(isEditionListOpen) {
             // this is the loading feedback for the editions
             // button.
@@ -118,7 +120,7 @@ let AccordionListItemEditionWidget = React.createClass({
                     <button
                         disabled
                         title={getLangText('All editions for this have been deleted already.')}
-                        className={classNames('btn', 'btn-default', 'btn-secondary', 'btn-sm', 'ascribe-accordion-list-item-edition-widget', this.props.className)}>
+                        className={classNames('btn', 'btn-secondary', 'btn-sm', 'ascribe-accordion-list-item-edition-widget', this.props.className)}>
                         {'0 ' + getLangText('Editions')}
                     </button>
                 );
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_piece.js b/js/components/ascribe_accordion_list/accordion_list_item_piece.js
index 006479c5..9f876388 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_piece.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_piece.js
@@ -12,8 +12,11 @@ import { getLangText } from '../../utils/lang_utils';
 let AccordionListItemPiece = React.createClass({
     propTypes: {
         className: React.PropTypes.string,
-        artistName: React.PropTypes.string,
-        piece: React.PropTypes.object,
+        artistName: React.PropTypes.oneOfType([
+            React.PropTypes.string,
+            React.PropTypes.element
+        ]),
+        piece: React.PropTypes.object.isRequired,
         children: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
@@ -51,17 +54,21 @@ let AccordionListItemPiece = React.createClass({
             piece,
             subsubheading,
             thumbnailPlaceholder: ThumbnailPlaceholder } = this.props;
-        const { url, url_safe } = piece.thumbnail;
+        const { url: thumbnailUrl, url_safe: thumbnailSafeUrl } = piece.thumbnail;
+
+        // Display the 300x300 thumbnail if we have it, otherwise just use the safe url
+        const thumbnailDisplayUrl = (piece.thumbnail.thumbnail_sizes && piece.thumbnail.thumbnail_sizes['300x300']) || thumbnailSafeUrl;
+
         let thumbnail;
 
         // Since we're going to refactor the thumbnail generation anyway at one point,
         // for not use the annoying ascribe_spiral.png, we're matching the url against
         // this name and replace it with a CSS version of the new logo.
-        if (url.match(/https:\/\/.*\/media\/thumbnails\/ascribe_spiral.png/)) {
+        if (thumbnailUrl.match(/https:\/\/.*\/media\/thumbnails\/ascribe_spiral.png/)) {
             thumbnail = (<ThumbnailPlaceholder />);
         } else {
             thumbnail = (
-                <div style={{backgroundImage: 'url("' + url_safe + '")'}}/>
+                <div style={{backgroundImage: 'url("' + thumbnailDisplayUrl + '")'}} />
             );
         }
 
@@ -79,8 +86,7 @@ let AccordionListItemPiece = React.createClass({
                 subsubheading={subsubheading}
                 buttons={buttons}
                 badge={badge}
-                linkData={this.getLinkData()}
-                >
+                linkData={this.getLinkData()}>
                 {children}
             </AccordionListItem>
         );
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
index 23cfb239..3b0bb02e 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
@@ -66,22 +66,34 @@ let AccordionListItemTableEditions = React.createClass({
     },
 
     filterSelectedEditions() {
-        let selectedEditions = this.state.editionList[this.props.parentId]
-            .filter((edition) => edition.selected);
-        return selectedEditions;
+        return this.state
+                   .editionList[this.props.parentId]
+                   .filter((edition) => edition.selected);
     },
 
     loadFurtherEditions() {
+        const { parentId: pieceId } = this.props;
+        const { page, pageSize, orderBy, orderAsc, filterBy } = this.state.editionList[pieceId];
+
         // trigger loading animation
         this.setState({
             showMoreLoading: true
         });
 
-        let editionList = this.state.editionList[this.props.parentId];
-        EditionListActions.fetchEditionList(this.props.parentId, editionList.page + 1, editionList.pageSize,
-                                            editionList.orderBy, editionList.orderAsc, editionList.filterBy);
+        EditionListActions.fetchEditionList({
+            pieceId,
+            pageSize,
+            orderBy,
+            orderAsc,
+            filterBy,
+            page: page + 1
+        });
     },
     render() {
+        const { className, parentId } = this.props;
+        const { editionList, isEditionListOpenForPieceId, showMoreLoading } = this.state;
+        const editionsForPiece = editionList[parentId];
+
         let selectedEditionsCount = 0;
         let allEditionsCount = 0;
         let orderBy;
@@ -89,95 +101,97 @@ let AccordionListItemTableEditions = React.createClass({
         let show = false;
         let showExpandOption = false;
 
-        let editionsForPiece = this.state.editionList[this.props.parentId];
-        let loadingSpinner = <AscribeSpinner size="sm" color="dark-blue" />;
-
         // here we need to check if all editions of a specific
         // piece are already defined. Otherwise .length will throw an error and we'll not
         // be notified about it.
-        if(editionsForPiece) {
+        if (editionsForPiece) {
             selectedEditionsCount = this.filterSelectedEditions().length;
             allEditionsCount = editionsForPiece.length;
             orderBy = editionsForPiece.orderBy;
             orderAsc = editionsForPiece.orderAsc;
         }
 
-        if(this.props.parentId in this.state.isEditionListOpenForPieceId) {
-            show = this.state.isEditionListOpenForPieceId[this.props.parentId].show;
+        if (parentId in isEditionListOpenForPieceId) {
+            show = isEditionListOpenForPieceId[parentId].show;
         }
 
         // if the number of editions in the array is equal to the maximum number of editions,
         // then the "Show me more" dialog should be hidden from the user's view
-        if(editionsForPiece && editionsForPiece.count > editionsForPiece.length) {
+        if (editionsForPiece && editionsForPiece.count > editionsForPiece.length) {
             showExpandOption = true;
         }
 
-        let transition = new TransitionModel('editions', 'editionId', 'bitcoin_id', (e) => e.stopPropagation() );
+        const transition = new TransitionModel({
+            to: 'editions',
+            queryKey: 'editionId',
+            valueKey: 'bitcoin_id',
+            callback: (e) => e.stopPropagation()
+        });
 
-        let columnList = [
-            new ColumnModel(
-                (item) => {
+        const columnList = [
+            new ColumnModel({
+                transformFn: (item) => {
                     return {
                         'editionId': item.id,
-                        'pieceId': this.props.parentId,
+                        'pieceId': parentId,
                         'selectItem': this.selectItem,
                         'selected': item.selected
-                    }; },
-                    '',
+                    };
+                },
+                displayElement: (
                     <AccordionListItemTableSelectAllEditionsCheckbox
                         onChange={this.toggleAllItems}
                         numOfSelectedEditions={selectedEditionsCount}
-                        numOfAllEditions={allEditionsCount}/>,
-                    TableItemCheckbox,
-                    1,
-                    false
-            ),
-            new ColumnModel(
-                (item) => {
+                        numOfAllEditions={allEditionsCount}/>
+                ),
+                displayType: TableItemCheckbox,
+                rowWidth: 1
+            }),
+            new ColumnModel({
+                transition,
+                transformFn: (item) => {
                     return {
                         'content': item.edition_number + ' ' + getLangText('of') + ' ' + item.num_editions
-                    }; },
-                    'edition_number',
-                    getLangText('Edition'),
-                    TableItemText,
-                    1,
-                    false,
-                    transition
-            ),
-            new ColumnModel(
-                (item) => {
+                    };
+                },
+                columnName: 'edition_number',
+                displayElement: getLangText('Edition'),
+                displayType: TableItemText,
+                rowWidth: 1
+            }),
+            new ColumnModel({
+                transition,
+                transformFn: (item) => {
                     return {
                         'content': item.bitcoin_id
-                    }; },
-                    'bitcoin_id',
-                    getLangText('ID'),
-                    TableItemText,
-                    5,
-                    false,
-                    transition,
-                    'hidden-xs visible-sm visible-md visible-lg'
-            ),
-            new ColumnModel(
-                (item) => {
-                    let content = item.acl;
+                    };
+                },
+                columnName: 'bitcoin_id',
+                displayElement: getLangText('ID'),
+                displayType: TableItemText,
+                rowWidth: 5,
+                className: 'hidden-xs visible-sm visible-md visible-lg'
+            }),
+            new ColumnModel({
+                transition,
+                transformFn: (item) => {
                     return {
-                        'content': content,
+                        'content': item.acl,
                         'notifications': item.notifications
-                    }; },
-                    'acl',
-                    getLangText('Actions'),
-                    TableItemAclFiltered,
-                    4,
-                    false,
-                    transition
-            )
+                    };
+                },
+                columnName: 'acl',
+                displayElement: getLangText('Actions'),
+                displayType: TableItemAclFiltered,
+                rowWidth: 4
+            })
         ];
 
-        if(show && editionsForPiece && editionsForPiece.length > 0) {
+        if (show && editionsForPiece && editionsForPiece.length) {
             return (
-                <div className={this.props.className}>
+                <div className={className}>
                     <AccordionListItemTable
-                        parentId={this.props.parentId}
+                        parentId={parentId}
                         itemList={editionsForPiece}
                         columnList={columnList}
                         show={show}
@@ -188,7 +202,14 @@ let AccordionListItemTableEditions = React.createClass({
                     <AccordionListItemTableToggle
                         className="ascribe-accordion-list-table-toggle"
                         onClick={this.loadFurtherEditions}
-                        message={show && showExpandOption ? <span>{this.state.showMoreLoading ? loadingSpinner : <span className="glyphicon glyphicon-option-horizontal" aria-hidden="true" style={{top: 3}} />} Show me more</span> : null} />
+                        message={show && showExpandOption ? (
+                                <span>
+                                    {showMoreLoading ? <AscribeSpinner size="sm" color="dark-blue" />
+                                                     : <span className="glyphicon glyphicon-option-horizontal" aria-hidden="true" style={{top: 3}} />}
+                                    {getLangText('Show me more')}
+                                </span>
+                            ) : null
+                        } />
                 </div>
             );
         } else {
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_wallet.js b/js/components/ascribe_accordion_list/accordion_list_item_wallet.js
index a8cab166..f6712d37 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_wallet.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_wallet.js
@@ -88,11 +88,12 @@ let AccordionListItemWallet = React.createClass({
     },
 
     onPollingSuccess(pieceId) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
         EditionListActions.toggleEditionList(pieceId);
 
-        let notification = new GlobalNotificationModel('Editions successfully created', 'success', 10000);
+        const notification = new GlobalNotificationModel('Editions successfully created', 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
diff --git a/js/components/ascribe_buttons/create_editions_button.js b/js/components/ascribe_buttons/create_editions_button.js
index 08fb76ce..c78b0d63 100644
--- a/js/components/ascribe_buttons/create_editions_button.js
+++ b/js/components/ascribe_buttons/create_editions_button.js
@@ -28,6 +28,12 @@ let CreateEditionsButton = React.createClass({
         EditionListStore.listen(this.onChange);
     },
 
+    componentDidUpdate() {
+        if(this.props.piece.num_editions === 0 && typeof this.state.pollingIntervalIndex === 'undefined') {
+            this.startPolling();
+        }
+    },
+
     componentWillUnmount() {
         EditionListStore.unlisten(this.onChange);
         clearInterval(this.state.pollingIntervalIndex);
@@ -37,28 +43,24 @@ let CreateEditionsButton = React.createClass({
         this.setState(state);
     },
 
-    componentDidUpdate() {
-        if(this.props.piece.num_editions === 0 && typeof this.state.pollingIntervalIndex === 'undefined') {
-            this.startPolling();
-        }
-    },
-
     startPolling() {
         // start polling until editions are defined
         let pollingIntervalIndex = setInterval(() => {
 
             // requests, will try to merge the filterBy parameter with other parameters (mergeOptions).
             // Therefore it can't but null but instead has to be an empty object
-            EditionListActions.fetchEditionList(this.props.piece.id, null, null, null, null, {})
-            .then((res) => {
-
-                clearInterval(this.state.pollingIntervalIndex);
-                this.props.onPollingSuccess(this.props.piece.id, res.editions[0].num_editions);
-
-            })
-            .catch((err) => {
-                /* Ignore and keep going */
-            });
+            EditionListActions
+                .fetchEditionList({
+                    pieceId: this.props.piece.id,
+                    filterBy: {}
+                })
+                .then((res) => {
+                    clearInterval(this.state.pollingIntervalIndex);
+                    this.props.onPollingSuccess(this.props.piece.id, res.editions[0].num_editions);
+                })
+                .catch((err) => {
+                    /* Ignore and keep going */
+                });
         }, 5000);
 
         this.setState({
diff --git a/js/components/ascribe_detail/detail_property.js b/js/components/ascribe_detail/detail_property.js
index 8b0f50b5..0191ffa9 100644
--- a/js/components/ascribe_detail/detail_property.js
+++ b/js/components/ascribe_detail/detail_property.js
@@ -1,9 +1,10 @@
 'use strict';
 
 import React from 'react';
+import classNames from 'classnames';
 
 
-let DetailProperty = React.createClass({
+const DetailProperty = React.createClass({
     propTypes: {
         label: React.PropTypes.string,
         value: React.PropTypes.oneOfType([
@@ -12,6 +13,7 @@ let DetailProperty = React.createClass({
             React.PropTypes.element
         ]),
         separator: React.PropTypes.string,
+        className: React.PropTypes.string,
         labelClassName: React.PropTypes.string,
         valueClassName: React.PropTypes.string,
         ellipsis: React.PropTypes.bool,
@@ -30,31 +32,23 @@ let DetailProperty = React.createClass({
     },
 
     render() {
-        let styles = {};
-        const { labelClassName,
-                label,
-                separator,
-                valueClassName,
-                children,
-                value } = this.props;
-
-        if(this.props.ellipsis) {
-            styles = {
-                whiteSpace: 'nowrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis'
-            };
-        }
+        const {
+            children,
+            className,
+            ellipsis,
+            label,
+            labelClassName,
+            separator,
+            valueClassName,
+            value } = this.props;
 
         return (
-            <div className="row ascribe-detail-property">
+            <div className={classNames('row ascribe-detail-property', className)}>
                 <div className="row-same-height">
                     <div className={labelClassName}>
                         {label} {separator}
                     </div>
-                    <div
-                        className={valueClassName}
-                        style={styles}>
+                    <div className={classNames(valueClassName, {'add-overflow-ellipsis': ellipsis})}>
                         {children || value}
                     </div>
                 </div>
diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js
index 068b526c..803d73bb 100644
--- a/js/components/ascribe_detail/edition.js
+++ b/js/components/ascribe_detail/edition.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import { Link, History } from 'react-router';
+import { Link } from 'react-router';
 import Moment from 'moment';
 
 import Row from 'react-bootstrap/lib/Row';
@@ -16,7 +16,7 @@ import CollapsibleParagraph from './../ascribe_collapsible/collapsible_paragraph
 
 import Form from './../ascribe_forms/form';
 import Property from './../ascribe_forms/property';
-import EditionDetailProperty from './detail_property';
+import DetailProperty from './detail_property';
 import LicenseDetail from './license_detail';
 import FurtherDetails from './further_details';
 
@@ -44,8 +44,6 @@ let Edition = React.createClass({
         loadEdition: React.PropTypes.func
     },
 
-    mixins: [History],
-
     getDefaultProps() {
         return {
             furtherDetailsType: FurtherDetails
@@ -53,98 +51,103 @@ let Edition = React.createClass({
     },
 
     render() {
-        let FurtherDetailsType = this.props.furtherDetailsType;
+        const {
+            actionPanelButtonListType,
+            coaError,
+            currentUser,
+            edition,
+            furtherDetailsType: FurtherDetailsType,
+            loadEdition } = this.props;
 
         return (
             <Row>
-                <Col md={6}>
+                <Col md={6} className="ascribe-print-col-left">
                     <MediaContainer
-                        content={this.props.edition}/>
+                        content={edition}
+                        currentUser={currentUser} />
                 </Col>
-                <Col md={6} className="ascribe-edition-details">
+                <Col md={6} className="ascribe-edition-details ascribe-print-col-right">
                     <div className="ascribe-detail-header">
-                        <hr style={{marginTop: 0}}/>
-                        <h1 className="ascribe-detail-title">{this.props.edition.title}</h1>
-                        <EditionDetailProperty label="BY" value={this.props.edition.artist_name} />
-                        <EditionDetailProperty label="DATE" value={Moment(this.props.edition.date_created, 'YYYY-MM-DD').year()} />
+                        <hr className="hidden-print" style={{marginTop: 0}}/>
+                        <h1 className="ascribe-detail-title">{edition.title}</h1>
+                        <DetailProperty label="BY" value={edition.artist_name} />
+                        <DetailProperty label="DATE" value={Moment(edition.date_created, 'YYYY-MM-DD').year()} />
                         <hr/>
                     </div>
                     <EditionSummary
-                        actionPanelButtonListType={this.props.actionPanelButtonListType}
-                        edition={this.props.edition}
-                        currentUser={this.props.currentUser}
-                        handleSuccess={this.props.loadEdition}/>
+                        actionPanelButtonListType={actionPanelButtonListType}
+                        edition={edition}
+                        currentUser={currentUser}
+                        handleSuccess={loadEdition}/>
                     <CollapsibleParagraph
                         title={getLangText('Certificate of Authenticity')}
-                        show={this.props.edition.acl.acl_coa === true}>
+                        show={edition.acl.acl_coa === true}>
                         <CoaDetails
-                            coa={this.props.edition.coa}
-                            coaError={this.props.coaError}
-                            editionId={this.props.edition.bitcoin_id}/>
+                            coa={edition.coa}
+                            coaError={coaError}
+                            editionId={edition.bitcoin_id}/>
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title={getLangText('Provenance/Ownership History')}
-                        show={this.props.edition.ownership_history && this.props.edition.ownership_history.length > 0}>
+                        show={edition.ownership_history && edition.ownership_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.edition.ownership_history} />
+                            history={edition.ownership_history} />
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title={getLangText('Consignment History')}
-                        show={this.props.edition.consign_history && this.props.edition.consign_history.length > 0}>
+                        show={edition.consign_history && edition.consign_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.edition.consign_history} />
+                            history={edition.consign_history} />
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title={getLangText('Loan History')}
-                        show={this.props.edition.loan_history && this.props.edition.loan_history.length > 0}>
+                        show={edition.loan_history && edition.loan_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.edition.loan_history} />
+                            history={edition.loan_history} />
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title="Notes"
-                        show={!!(this.props.currentUser.username
-                                || this.props.edition.acl.acl_edit
-                                || this.props.edition.public_note)}>
+                        show={!!(currentUser.username || edition.acl.acl_edit || edition.public_note)}>
                         <Note
-                            id={() => {return {'bitcoin_id': this.props.edition.bitcoin_id}; }}
+                            id={() => {return {'bitcoin_id': edition.bitcoin_id}; }}
                             label={getLangText('Personal note (private)')}
-                            defaultValue={this.props.edition.private_note ? this.props.edition.private_note : null}
+                            defaultValue={edition.private_note ? edition.private_note : null}
                             placeholder={getLangText('Enter your comments ...')}
                             editable={true}
                             successMessage={getLangText('Private note saved')}
                             url={ApiUrls.note_private_edition}
-                            currentUser={this.props.currentUser}/>
+                            currentUser={currentUser}/>
                         <Note
-                            id={() => {return {'bitcoin_id': this.props.edition.bitcoin_id}; }}
+                            id={() => {return {'bitcoin_id': edition.bitcoin_id}; }}
                             label={getLangText('Personal note (public)')}
-                            defaultValue={this.props.edition.public_note ? this.props.edition.public_note : null}
+                            defaultValue={edition.public_note ? edition.public_note : null}
                             placeholder={getLangText('Enter your comments ...')}
-                            editable={!!this.props.edition.acl.acl_edit}
-                            show={!!this.props.edition.public_note || !!this.props.edition.acl.acl_edit}
+                            editable={!!edition.acl.acl_edit}
+                            show={!!edition.public_note || !!edition.acl.acl_edit}
                             successMessage={getLangText('Public edition note saved')}
                             url={ApiUrls.note_public_edition}
-                            currentUser={this.props.currentUser}/>
+                            currentUser={currentUser}/>
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Further Details')}
-                        show={this.props.edition.acl.acl_edit
-                            || Object.keys(this.props.edition.extra_data).length > 0
-                            || this.props.edition.other_data.length > 0}>
+                        show={edition.acl.acl_edit ||
+                              Object.keys(edition.extra_data).length > 0 ||
+                              edition.other_data.length > 0}>
                         <FurtherDetailsType
-                            editable={this.props.edition.acl.acl_edit}
-                            pieceId={this.props.edition.parent}
-                            extraData={this.props.edition.extra_data}
-                            otherData={this.props.edition.other_data}
-                            handleSuccess={this.props.loadEdition} />
+                            editable={edition.acl.acl_edit}
+                            pieceId={edition.parent}
+                            extraData={edition.extra_data}
+                            otherData={edition.other_data}
+                            handleSuccess={loadEdition} />
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('SPOOL Details')}>
                         <SpoolDetails
-                            edition={this.props.edition} />
+                            edition={edition} />
                     </CollapsibleParagraph>
                 </Col>
             </Row>
@@ -169,10 +172,10 @@ let EditionSummary = React.createClass({
         let status = null;
         if (this.props.edition.status.length > 0){
             let statusStr = this.props.edition.status.join(', ').replace(/_/g, ' ');
-            status = <EditionDetailProperty label="STATUS" value={ statusStr }/>;
+            status = <DetailProperty label="STATUS" value={ statusStr }/>;
             if (this.props.edition.pending_new_owner && this.props.edition.acl.acl_withdraw_transfer){
                 status = (
-                    <EditionDetailProperty label="STATUS" value={ statusStr } />
+                    <DetailProperty label="STATUS" value={ statusStr } />
                 );
             }
         }
@@ -183,14 +186,14 @@ let EditionSummary = React.createClass({
         let { actionPanelButtonListType, edition, currentUser } = this.props;
         return (
             <div className="ascribe-detail-header">
-                <EditionDetailProperty
+                <DetailProperty
                     label={getLangText('EDITION')}
                     value={ edition.edition_number + ' ' + getLangText('of') + ' ' + edition.num_editions} />
-                <EditionDetailProperty
+                <DetailProperty
                     label={getLangText('ID')}
                     value={ edition.bitcoin_id }
                     ellipsis={true} />
-                <EditionDetailProperty
+                <DetailProperty
                     label={getLangText('OWNER')}
                     value={ edition.owner } />
                 <LicenseDetail license={edition.license_type}/>
@@ -201,14 +204,15 @@ let EditionSummary = React.createClass({
                     `AclInformation` would show up
                 */}
                 <AclProxy show={currentUser && currentUser.email && Object.keys(edition.acl).length > 1}>
-                    <EditionDetailProperty
-                        label={getLangText('ACTIONS')}>
+                    <DetailProperty
+                        label={getLangText('ACTIONS')}
+                        className="hidden-print">
                         <EditionActionPanel
                             actionPanelButtonListType={actionPanelButtonListType}
                             edition={edition}
                             currentUser={currentUser}
                             handleSuccess={this.handleSuccess} />
-                    </EditionDetailProperty>
+                    </DetailProperty>
                 </AclProxy>
                 <hr/>
             </div>
@@ -220,66 +224,76 @@ let EditionSummary = React.createClass({
 let CoaDetails = React.createClass({
     propTypes: {
         editionId: React.PropTypes.string,
-        coa: React.PropTypes.object,
+        coa: React.PropTypes.oneOfType([
+            React.PropTypes.number,
+            React.PropTypes.string,
+            React.PropTypes.object
+        ]),
         coaError: React.PropTypes.object
     },
 
     contactOnIntercom() {
-        window.Intercom('showNewMessage', `Hi, I'm having problems generating a Certificate of Authenticity for Edition: ${this.props.editionId}`);
-        console.logGlobal(new Error(`Coa couldn't be created for edition: ${this.props.editionId}`));
+        const { coaError, editionId } = this.props;
+
+        window.Intercom('showNewMessage', getLangText("Hi, I'm having problems generating a Certificate of Authenticity for Edition: %s", editionId));
+        console.logGlobal(new Error(`Coa couldn't be created for edition: ${editionId}`), coaError);
     },
 
     render() {
-        if(this.props.coaError) {
-            return (
-                <div className="text-center">
-                    <p>{getLangText('There was an error generating your Certificate of Authenticity.')}</p>
-                    <p>
-                        {getLangText('Try to refresh the page. If this happens repeatedly, please ')}
-                        <a style={{ cursor: 'pointer' }} onClick={this.contactOnIntercom}>{getLangText('contact us')}</a>.
-                    </p>
-                </div>
-            );
-        }
-        if(this.props.coa && this.props.coa.url_safe) {
-            return (
-                <div>
-                    <div
-                        className="notification-contract-pdf"
-                        style={{paddingBottom: '1em'}}>
-                        <embed
-                            className="embed-form"
-                            src={this.props.coa.url_safe}
-                            alt="pdf"
-                            pluginspage="http://www.adobe.com/products/acrobat/readstep2.html"/>
-                    </div>
-                    <div className="text-center ascribe-button-list">
-                        <a href={this.props.coa.url_safe} target="_blank">
-                            <button className="btn btn-default btn-xs">
-                                {getLangText('Download')} <Glyphicon glyph="cloud-download"/>
-                            </button>
-                        </a>
-                        <Link to="/coa_verify">
-                            <button className="btn btn-default btn-xs">
-                                {getLangText('Verify')} <Glyphicon glyph="check"/>
-                            </button>
-                        </Link>
+        const { coa, coaError } = this.props;
+        let coaDetailElement;
 
-                    </div>
+        if (coaError) {
+            coaDetailElement = [
+                <p>{getLangText('There was an error generating your Certificate of Authenticity.')}</p>,
+                <p>
+                    {getLangText('Try to refresh the page. If this happens repeatedly, please ')}
+                    <a style={{ cursor: 'pointer' }} onClick={this.contactOnIntercom}>{getLangText('contact us')}</a>.
+                </p>
+            ];
+        } else if (coa && coa.url_safe) {
+            coaDetailElement = [
+                <div
+                    className="notification-contract-pdf"
+                    style={{paddingBottom: '1em'}}>
+                    <embed
+                        className="embed-form"
+                        src={coa.url_safe}
+                        alt="pdf"
+                        pluginspage="http://www.adobe.com/products/acrobat/readstep2.html"/>
+                </div>,
+                <div className="text-center ascribe-button-list">
+                    <a href={coa.url_safe} target="_blank">
+                        <button className="btn btn-default btn-xs">
+                            {getLangText('Download')} <Glyphicon glyph="cloud-download"/>
+                        </button>
+                    </a>
+                    <Link to="/coa_verify">
+                        <button className="btn btn-default btn-xs">
+                            {getLangText('Verify')} <Glyphicon glyph="check"/>
+                        </button>
+                    </Link>
                 </div>
-            );
-        } else if(typeof this.props.coa === 'string'){
-            return (
-                <div className="text-center">
-                    {this.props.coa}
-                </div>
-            );
-        }
-        return (
-            <div className="text-center">
-                <AscribeSpinner color='dark-blue' size='md'/>
-                <p>{getLangText("Just a sec, we\'re generating your COA")}</p>
+            ];
+        } else if (typeof coa === 'string') {
+            coaDetailElement = coa;
+        } else {
+            coaDetailElement = [
+                <AscribeSpinner color='dark-blue' size='md'/>,
+                <p>{getLangText("Just a sec, we're generating your COA")}</p>,
                 <p>{getLangText('(you may leave the page)')}</p>
+            ];
+        }
+
+        return (
+            <div>
+                <div className="text-center hidden-print">
+                    {coaDetailElement}
+                </div>
+                {/* Hide the COA and just show that it's a seperate document when printing */}
+                <div className="visible-print ascribe-coa-print-placeholder">
+                    {getLangText('The COA is available as a seperate document')}
+                </div>
             </div>
         );
     }
@@ -291,16 +305,34 @@ let SpoolDetails = React.createClass({
     },
 
     render() {
-        let bitcoinIdValue = (
-            <a target="_blank" href={'https://www.blocktrail.com/BTC/address/' + this.props.edition.bitcoin_id}>{this.props.edition.bitcoin_id}</a>
+        const { edition: {
+            bitcoin_id: bitcoinId,
+            hash_as_address: hashAsAddress,
+            btc_owner_address_noprefix: bitcoinOwnerAddress
+        } } = this.props;
+
+        const bitcoinIdValue = (
+            <a  className="anchor-no-expand-print"
+                target="_blank"
+                href={'https://www.blocktrail.com/BTC/address/' + bitcoinId}>
+                {bitcoinId}
+            </a>
         );
 
-        let hashOfArtwork = (
-            <a target="_blank" href={'https://www.blocktrail.com/BTC/address/' + this.props.edition.hash_as_address}>{this.props.edition.hash_as_address}</a>
+        const hashOfArtwork = (
+            <a  className="anchor-no-expand-print"
+                target="_blank"
+                href={'https://www.blocktrail.com/BTC/address/' + hashAsAddress}>
+                {hashAsAddress}
+            </a>
         );
 
-        let ownerAddress = (
-            <a target="_blank" href={'https://www.blocktrail.com/BTC/address/' + this.props.edition.btc_owner_address_noprefix}>{this.props.edition.btc_owner_address_noprefix}</a>
+        const ownerAddress = (
+            <a  className="anchor-no-expand-print"
+                target="_blank"
+                href={'https://www.blocktrail.com/BTC/address/' + bitcoinOwnerAddress}>
+                {bitcoinOwnerAddress}
+            </a>
         );
 
         return (
diff --git a/js/components/ascribe_detail/edition_action_panel.js b/js/components/ascribe_detail/edition_action_panel.js
index 36a79e7c..71bf38fe 100644
--- a/js/components/ascribe_detail/edition_action_panel.js
+++ b/js/components/ascribe_detail/edition_action_panel.js
@@ -72,19 +72,20 @@ let EditionActionPanel = React.createClass({
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     refreshCollection() {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
-        EditionListActions.refreshEditionList({pieceId: this.props.edition.parent});
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
+        EditionListActions.refreshEditionList({ pieceId: this.props.edition.parent });
     },
 
-    handleSuccess(response){
+    handleSuccess(response) {
         this.refreshCollection();
         this.props.handleSuccess();
         if (response){
@@ -93,7 +94,7 @@ let EditionActionPanel = React.createClass({
         }
     },
 
-    render(){
+    render() {
         const {
             actionPanelButtonListType: ActionPanelButtonListType,
             edition,
diff --git a/js/components/ascribe_detail/edition_container.js b/js/components/ascribe_detail/edition_container.js
index d70c0601..d0adadf0 100644
--- a/js/components/ascribe_detail/edition_container.js
+++ b/js/components/ascribe_detail/edition_container.js
@@ -35,7 +35,7 @@ let EditionContainer = React.createClass({
 
     getInitialState() {
         return mergeOptions(
-            EditionStore.getState(),
+            EditionStore.getInitialState(),
             UserStore.getState()
         );
     },
@@ -44,27 +44,23 @@ let EditionContainer = React.createClass({
         EditionStore.listen(this.onChange);
         UserStore.listen(this.onChange);
 
-        // Every time we're entering the edition detail page,
-        // just reset the edition that is saved in the edition store
-        // as it will otherwise display wrong/old data once the user loads
-        // the edition detail a second time
-        EditionActions.flushEdition();
-        EditionActions.fetchEdition(this.props.params.editionId);
-
+        this.loadEdition();
         UserActions.fetchCurrentUser();
     },
 
     // This is done to update the container when the user clicks on the prev or next
     // button to update the URL parameter (and therefore to switch pieces)
     componentWillReceiveProps(nextProps) {
-        if(this.props.params.editionId !== nextProps.params.editionId) {
-            EditionActions.fetchEdition(this.props.params.editionId);
+        if (this.props.params.editionId !== nextProps.params.editionId) {
+            EditionActions.flushEdition();
+            this.loadEdition(nextProps.params.editionId);
         }
     },
 
     componentDidUpdate() {
-        const { editionMeta } = this.state;
-        if(editionMeta.err && editionMeta.err.json && editionMeta.err.json.status === 404) {
+        const { err: editionErr } = this.state.editionMeta;
+
+        if (editionErr && editionErr.json && editionErr.json.status === 404) {
             this.throws(new ResourceNotFoundError(getLangText("Oops, the edition you're looking for doesn't exist.")));
         }
     },
@@ -81,18 +77,22 @@ let EditionContainer = React.createClass({
         if(state && state.edition && state.edition.digital_work) {
             let isEncoding = state.edition.digital_work.isEncoding;
             if (state.edition.digital_work.mime === 'video' && typeof isEncoding === 'number' && isEncoding !== 100 && !this.state.timerId) {
-                let timerId = window.setInterval(() => EditionActions.fetchOne(this.props.params.editionId), 10000);
+                let timerId = window.setInterval(() => EditionActions.fetchEdition(this.props.params.editionId), 10000);
                 this.setState({timerId: timerId});
             }
         }
     },
 
+    loadEdition(editionId = this.props.params.editionId) {
+        EditionActions.fetchEdition(editionId);
+    },
+
     render() {
         const { edition, currentUser, coaMeta } = this.state;
         const { actionPanelButtonListType, furtherDetailsType } = this.props;
 
-        if (Object.keys(edition).length && edition.id && currentUser && currentUser.email) {
-            setDocumentTitle([edition.artist_name, edition.title].join(', '));
+        if (edition.id) {
+            setDocumentTitle(`${edition.artist_name}, ${edition.title}`);
 
             return (
                 <Edition
@@ -101,7 +101,7 @@ let EditionContainer = React.createClass({
                     edition={edition}
                     coaError={coaMeta.err}
                     currentUser={currentUser}
-                    loadEdition={() => EditionActions.fetchEdition(this.props.params.editionId)} />
+                    loadEdition={this.loadEdition} />
             );
         } else {
             return (
diff --git a/js/components/ascribe_detail/further_details.js b/js/components/ascribe_detail/further_details.js
index c178fb93..54e696c9 100644
--- a/js/components/ascribe_detail/further_details.js
+++ b/js/components/ascribe_detail/further_details.js
@@ -5,25 +5,27 @@ import React from 'react';
 import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
 
-import Form from './../ascribe_forms/form';
-
-import PieceExtraDataForm from './../ascribe_forms/form_piece_extradata';
-
 import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
 import FurtherDetailsFileuploader from './further_details_fileuploader';
 
+import Form from './../ascribe_forms/form';
+import PieceExtraDataForm from './../ascribe_forms/form_piece_extradata';
+
 import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
 
+import { getLangText } from '../../utils/lang_utils';
+
 
 let FurtherDetails = React.createClass({
     propTypes: {
+        pieceId: React.PropTypes.number.isRequired,
+
         editable: React.PropTypes.bool,
-        pieceId: React.PropTypes.number,
         extraData: React.PropTypes.object,
+        handleSuccess: React.PropTypes.func,
         otherData: React.PropTypes.arrayOf(React.PropTypes.object),
-        handleSuccess: React.PropTypes.func
     },
 
     getInitialState() {
@@ -32,13 +34,18 @@ let FurtherDetails = React.createClass({
         };
     },
 
-    showNotification(){
-        this.props.handleSuccess();
-        let notification = new GlobalNotificationModel('Details updated', 'success');
+    showNotification() {
+        const { handleSuccess } = this.props;
+
+        if (typeof handleSucess === 'function') {
+            handleSuccess();
+        }
+
+        const notification = new GlobalNotificationModel(getLangText('Details updated'), 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
-    submitFile(file){
+    submitFile(file) {
         this.setState({
             otherDataKey: file.key
         });
@@ -60,8 +67,7 @@ let FurtherDetails = React.createClass({
                         handleSuccess={this.showNotification}
                         editable={this.props.editable}
                         pieceId={this.props.pieceId}
-                        extraData={this.props.extraData}
-                        />
+                        extraData={this.props.extraData} />
                     <PieceExtraDataForm
                         name='display_instructions'
                         title='Display Instructions'
diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js
index 60769598..8546e43f 100644
--- a/js/components/ascribe_detail/further_details_fileuploader.js
+++ b/js/components/ascribe_detail/further_details_fileuploader.js
@@ -20,6 +20,7 @@ let FurtherDetailsFileuploader = React.createClass({
         otherData: React.PropTypes.arrayOf(React.PropTypes.object),
         setIsUploadReady: React.PropTypes.func,
         submitFile: React.PropTypes.func,
+        onValidationFailed: React.PropTypes.func,
         isReadyForFormSubmission: React.PropTypes.func,
         editable: React.PropTypes.bool,
         multiple: React.PropTypes.bool,
@@ -62,6 +63,7 @@ let FurtherDetailsFileuploader = React.createClass({
                     }}
                     validation={AppConstants.fineUploader.validation.additionalData}
                     submitFile={this.props.submitFile}
+                    onValidationFailed={this.props.onValidationFailed}
                     setIsUploadReady={this.props.setIsUploadReady}
                     isReadyForFormSubmission={this.props.isReadyForFormSubmission}
                     session={{
diff --git a/js/components/ascribe_detail/history_iterator.js b/js/components/ascribe_detail/history_iterator.js
index 413aeb21..03904863 100644
--- a/js/components/ascribe_detail/history_iterator.js
+++ b/js/components/ascribe_detail/history_iterator.js
@@ -22,7 +22,11 @@ let HistoryIterator = React.createClass({
             return (
                 <span>
                     {historicalEventDescription}
-                    <a href={historicalEvent[2]} target="_blank">{contractName}</a>
+                    <a  className="anchor-no-expand-print"
+                        target="_blank"
+                        href={historicalEvent[2]}>
+                        {contractName}
+                    </a>
                 </span>
             );
         } else if(historicalEvent.length === 2) {
diff --git a/js/components/ascribe_detail/media_container.js b/js/components/ascribe_detail/media_container.js
index c6845a44..e4270132 100644
--- a/js/components/ascribe_detail/media_container.js
+++ b/js/components/ascribe_detail/media_container.js
@@ -14,10 +14,6 @@ import CollapsibleButton from './../ascribe_collapsible/collapsible_button';
 
 import AclProxy from '../acl_proxy';
 
-import UserActions from '../../actions/user_actions';
-import UserStore from '../../stores/user_store';
-
-import { mergeOptions } from '../../utils/general_utils.js';
 import { getLangText } from '../../utils/lang_utils.js';
 
 const EMBED_IFRAME_HEIGHT = {
@@ -28,25 +24,22 @@ const EMBED_IFRAME_HEIGHT = {
 let MediaContainer = React.createClass({
     propTypes: {
         content: React.PropTypes.object,
+        currentUser: React.PropTypes.object,
         refreshObject: React.PropTypes.func
     },
 
     getInitialState() {
-        return mergeOptions(
-            UserStore.getState(),
-            {
-                timerId: null
-            });
+        return {
+            timerId: null
+        };
     },
 
     componentDidMount() {
-        UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
-
         if (!this.props.content.digital_work) {
             return;
         }
-        let isEncoding = this.props.content.digital_work.isEncoding;
+
+        const isEncoding = this.props.content.digital_work.isEncoding;
         if (this.props.content.digital_work.mime === 'video' && typeof isEncoding === 'number' && isEncoding !== 100 && !this.state.timerId) {
             let timerId = window.setInterval(this.props.refreshObject, 10000);
             this.setState({timerId: timerId});
@@ -60,22 +53,16 @@ let MediaContainer = React.createClass({
     },
 
     componentWillUnmount() {
-        UserStore.unlisten(this.onChange);
-
         window.clearInterval(this.state.timerId);
     },
 
-    onChange(state) {
-        this.setState(state);
-    },
-
     render() {
-        const { content } = this.props;
+        const { content, currentUser } = this.props;
         // Pieces and editions are joined to the user by a foreign key in the database, so
         // the information in content will be updated if a user updates their username.
         // We also force uniqueness of usernames, so this check is safe to dtermine if the
         // content was registered by the current user.
-        const didUserRegisterContent = this.state.currentUser && (this.state.currentUser.username === content.user_registered);
+        const didUserRegisterContent = currentUser && (currentUser.username === content.user_registered);
 
         let thumbnail = content.thumbnail.thumbnail_sizes && content.thumbnail.thumbnail_sizes['600x600'] ?
             content.thumbnail.thumbnail_sizes['600x600'] : content.thumbnail.url_safe;
@@ -94,8 +81,11 @@ let MediaContainer = React.createClass({
             embed = (
                 <CollapsibleButton
                     button={
-                        <Button bsSize="xsmall" className="ascribe-margin-1px" disabled={isEmbedDisabled ? '"disabled"' : ''}>
-                            Embed
+                        <Button
+                            bsSize="xsmall"
+                            className="ascribe-margin-1px"
+                            disabled={isEmbedDisabled}>
+                            {getLangText('Embed')}
                         </Button>
                     }
                     panel={
@@ -114,7 +104,7 @@ let MediaContainer = React.createClass({
                     url={content.digital_work.url}
                     extraData={extraData}
                     encodingStatus={content.digital_work.isEncoding} />
-                <p className="text-center">
+                <p className="text-center hidden-print">
                     <span className="ascribe-social-button-list">
                         <FacebookShareButton />
                         <TwitterShareButton
@@ -125,8 +115,12 @@ let MediaContainer = React.createClass({
                         show={['video', 'audio', 'image'].indexOf(mimetype) === -1 || content.acl.acl_download}
                         aclObject={content.acl}
                         aclName="acl_download">
-                        <Button bsSize="xsmall" className="ascribe-margin-1px" href={this.props.content.digital_work.url} target="_blank">
-                            Download .{mimetype} <Glyphicon glyph="cloud-download"/>
+                        <Button
+                            bsSize="xsmall"
+                            className="ascribe-margin-1px"
+                            href={content.digital_work.url}
+                            target="_blank">
+                            {getLangText('Download')} .{mimetype} <Glyphicon glyph="cloud-download"/>
                         </Button>
                     </AclProxy>
                     {embed}
diff --git a/js/components/ascribe_detail/piece.js b/js/components/ascribe_detail/piece.js
index 7481d1fb..e4ff4ea7 100644
--- a/js/components/ascribe_detail/piece.js
+++ b/js/components/ascribe_detail/piece.js
@@ -16,10 +16,10 @@ import MediaContainer from './media_container';
 let Piece = React.createClass({
     propTypes: {
         piece: React.PropTypes.object,
+        currentUser: React.PropTypes.object,
         header: React.PropTypes.object,
         subheader: React.PropTypes.object,
         buttons: React.PropTypes.object,
-        loadPiece: React.PropTypes.func,
         children: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
@@ -28,24 +28,26 @@ let Piece = React.createClass({
 
 
     updateObject() {
-        return PieceActions.fetchOne(this.props.piece.id);
+        return PieceActions.fetchPiece(this.props.piece.id);
     },
 
     render() {
+        const { buttons, children, currentUser, header, piece, subheader } = this.props;
+
         return (
             <Row>
-                <Col md={6}>
+                <Col md={6} className="ascribe-print-col-left">
                     <MediaContainer
-                        refreshObject={this.updateObject}
-                        content={this.props.piece}/>
+                        content={piece}
+                        currentUser={currentUser}
+                        refreshObject={this.updateObject} />
                 </Col>
-                <Col md={6} className="ascribe-edition-details">
-                    {this.props.header}
-                    {this.props.subheader}
-                    {this.props.buttons}
-
-                    {this.props.children}
+                <Col md={6} className="ascribe-edition-details ascribe-print-col-right">
+                    {header}
+                    {subheader}
+                    {buttons}
 
+                    {children}
                 </Col>
             </Row>
         );
diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js
index 74584ba3..f7ef024f 100644
--- a/js/components/ascribe_detail/piece_container.js
+++ b/js/components/ascribe_detail/piece_container.js
@@ -69,7 +69,7 @@ let PieceContainer = React.createClass({
         return mergeOptions(
             UserStore.getState(),
             PieceListStore.getState(),
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             {
                 showCreateEditionsDialog: false
             }
@@ -81,18 +81,24 @@ let PieceContainer = React.createClass({
         PieceListStore.listen(this.onChange);
         PieceStore.listen(this.onChange);
 
-        // Every time we enter the piece detail page, just reset the piece
-        // store as it will otherwise display wrong/old data once the user loads
-        // the piece detail a second time
-        PieceActions.updatePiece({});
         this.loadPiece();
         UserActions.fetchCurrentUser();
     },
 
-    componentDidUpdate() {
-        const { pieceError } = this.state;
+    // This is done to update the container when the user clicks on the prev or next
+    // button to update the URL parameter (and therefore to switch pieces) or
+    // when the user clicks on a notification while being in another piece view
+    componentWillReceiveProps(nextProps) {
+        if (this.props.params.pieceId !== nextProps.params.pieceId) {
+            PieceActions.flushPiece();
+            this.loadPiece(nextProps.params.pieceId);
+        }
+    },
 
-        if(pieceError && pieceError.status === 404) {
+    componentDidUpdate() {
+        const { err: pieceErr } = this.state.pieceMeta;
+
+        if (pieceErr && pieceErr.json && pieceErr.json.status === 404) {
             this.throws(new ResourceNotFoundError(getLangText("Oops, the piece you're looking for doesn't exist.")));
         }
     },
@@ -115,8 +121,7 @@ let PieceContainer = React.createClass({
             ALSO, WE ENABLED THE LOAN BUTTON FOR IKONOTV TO LET THEM LOAN ON A PIECE LEVEL
 
          */
-        if(state && state.piece && state.piece.acl && typeof state.piece.acl.acl_loan !== 'undefined') {
-
+        if (state && state.piece && state.piece.acl && typeof state.piece.acl.acl_loan !== 'undefined') {
             let pieceState = mergeOptions({}, state.piece);
             pieceState.acl.acl_loan = false;
             this.setState({
@@ -128,11 +133,10 @@ let PieceContainer = React.createClass({
         }
     },
 
-    loadPiece() {
-        PieceActions.fetchOne(this.props.params.pieceId);
+    loadPiece(pieceId = this.props.params.pieceId) {
+        PieceActions.fetchPiece(pieceId);
     },
 
-
     toggleCreateEditionsDialog() {
         this.setState({
             showCreateEditionsDialog: !this.state.showCreateEditionsDialog
@@ -140,43 +144,47 @@ let PieceContainer = React.createClass({
     },
 
     handleEditionCreationSuccess() {
-        PieceActions.updateProperty({key: 'num_editions', value: 0});
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceActions.updateProperty({ key: 'num_editions', value: 0 });
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
+
         this.toggleCreateEditionsDialog();
     },
 
     handleDeleteSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         // since we're deleting a piece, we just need to close
         // all editions dialogs and not reload them
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     getCreateEditionsDialog() {
-        if(this.state.piece.num_editions < 1 && this.state.showCreateEditionsDialog) {
+        if (this.state.piece.num_editions < 1 && this.state.showCreateEditionsDialog) {
             return (
                 <div style={{marginTop: '1em'}}>
                     <CreateEditionsForm
                         pieceId={this.state.piece.id}
                         handleSuccess={this.handleEditionCreationSuccess} />
-                    <hr/>
+                    <hr />
                 </div>
             );
         } else {
-            return (<hr/>);
+            return (<hr />);
         }
     },
 
     handlePollingSuccess(pieceId, numEditions) {
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
 
         // we need to refresh the num_editions property of the actual piece we're looking at
         PieceActions.updateProperty({
@@ -188,27 +196,26 @@ let PieceContainer = React.createClass({
         // btw.: It's not sufficient to just set num_editions to numEditions, since a single accordion
         // list item also uses the firstEdition property which we can only get from the server in that case.
         // Therefore we need to at least refetch the changed piece from the server or on our case simply all
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
-        let notification = new GlobalNotificationModel('Editions successfully created', 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Editions successfully created'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     getId() {
-        return {'id': this.state.piece.id};
+        return { 'id': this.state.piece.id };
     },
 
     getActions() {
         const { piece, currentUser } = this.state;
 
-        if (piece && piece.notifications && piece.notifications.length > 0) {
+        if (piece.notifications && piece.notifications.length > 0) {
             return (
                 <ListRequestActions
                     pieceOrEditions={piece}
                     currentUser={currentUser}
                     handleSuccess={this.loadPiece}
-                    notifications={piece.notifications}/>);
+                    notifications={piece.notifications} />);
         } else {
             return (
                 <AclProxy
@@ -218,7 +225,9 @@ let PieceContainer = React.createClass({
                         no more than 1 key, we're hiding the `DetailProperty` actions as otherwise
                         `AclInformation` would show up
                     */}
-                    <DetailProperty label={getLangText('ACTIONS')}>
+                    <DetailProperty
+                        label={getLangText('ACTIONS')}
+                        className="hidden-print">
                         <AclButtonList
                             className="ascribe-button-list"
                             availableAcls={piece.acl}
@@ -232,12 +241,12 @@ let PieceContainer = React.createClass({
                                     onPollingSuccess={this.handlePollingSuccess}/>
                                 <DeleteButton
                                     handleSuccess={this.handleDeleteSuccess}
-                                    piece={piece}/>
+                                    piece={piece} />
                                 <AclInformation
                                     aim="button"
                                     verbs={['acl_share', 'acl_transfer', 'acl_create_editions', 'acl_loan', 'acl_delete',
                                             'acl_consign']}
-                                    aclObject={piece.acl}/>
+                                    aclObject={piece.acl} />
                         </AclButtonList>
                     </DetailProperty>
                 </AclProxy>
@@ -246,76 +255,76 @@ let PieceContainer = React.createClass({
     },
 
     render() {
-        if (this.state.piece && this.state.piece.id) {
-            let FurtherDetailsType = this.props.furtherDetailsType;
-            setDocumentTitle([this.state.piece.artist_name, this.state.piece.title].join(', '));
+        const { furtherDetailsType: FurtherDetailsType } = this.props;
+        const { currentUser, piece } = this.state;
+
+        if (piece.id) {
+            setDocumentTitle(`${piece.artist_name}, ${piece.title}`);
 
             return (
                 <Piece
-                    piece={this.state.piece}
-                    loadPiece={this.loadPiece}
+                    piece={piece}
+                    currentUser={currentUser}
                     header={
                         <div className="ascribe-detail-header">
-                            <hr style={{marginTop: 0}}/>
-                            <h1 className="ascribe-detail-title">{this.state.piece.title}</h1>
-                            <DetailProperty label="BY" value={this.state.piece.artist_name} />
-                            <DetailProperty label="DATE" value={Moment(this.state.piece.date_created, 'YYYY-MM-DD').year() } />
-                            {this.state.piece.num_editions > 0 ? <DetailProperty label="EDITIONS" value={ this.state.piece.num_editions } /> : null}
+                            <hr className="hidden-print" style={{marginTop: 0}} />
+                            <h1 className="ascribe-detail-title">{piece.title}</h1>
+                            <DetailProperty label="BY" value={piece.artist_name} />
+                            <DetailProperty label="DATE" value={Moment(piece.date_created, 'YYYY-MM-DD').year() } />
+                            {piece.num_editions > 0 ? <DetailProperty label="EDITIONS" value={ piece.num_editions } /> : null}
                             <hr/>
                         </div>
                         }
                     subheader={
                         <div className="ascribe-detail-header">
-                            <DetailProperty label={getLangText('REGISTREE')} value={ this.state.piece.user_registered } />
-                            <DetailProperty label={getLangText('ID')} value={ this.state.piece.bitcoin_id } ellipsis={true} />
-                            <LicenseDetail license={this.state.piece.license_type} />
+                            <DetailProperty label={getLangText('REGISTREE')} value={ piece.user_registered } />
+                            <DetailProperty label={getLangText('ID')} value={ piece.bitcoin_id } ellipsis={true} />
+                            <LicenseDetail license={piece.license_type} />
                         </div>
                     }
                     buttons={this.getActions()}>
                     {this.getCreateEditionsDialog()}
                     <CollapsibleParagraph
                         title={getLangText('Loan History')}
-                        show={this.state.piece.loan_history && this.state.piece.loan_history.length > 0}>
+                        show={piece.loan_history && piece.loan_history.length > 0}>
                         <HistoryIterator
-                            history={this.state.piece.loan_history} />
+                            history={piece.loan_history} />
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Notes')}
-                        show={!!(this.state.currentUser.username
-                                || this.state.piece.acl.acl_edit
-                                || this.state.piece.public_note)}>
+                        show={!!(currentUser.username || piece.acl.acl_edit || piece.public_note)}>
                         <Note
                             id={this.getId}
                             label={getLangText('Personal note (private)')}
-                            defaultValue={this.state.piece.private_note || null}
-                            show = {!!this.state.currentUser.username}
+                            defaultValue={piece.private_note || null}
+                            show = {!!currentUser.username}
                             placeholder={getLangText('Enter your comments ...')}
                             editable={true}
                             successMessage={getLangText('Private note saved')}
                             url={ApiUrls.note_private_piece}
-                            currentUser={this.state.currentUser}/>
+                            currentUser={currentUser} />
                         <Note
                             id={this.getId}
                             label={getLangText('Personal note (public)')}
-                            defaultValue={this.state.piece.public_note || null}
+                            defaultValue={piece.public_note || null}
                             placeholder={getLangText('Enter your comments ...')}
-                            editable={!!this.state.piece.acl.acl_edit}
-                            show={!!(this.state.piece.public_note || this.state.piece.acl.acl_edit)}
+                            editable={!!piece.acl.acl_edit}
+                            show={!!(piece.public_note || piece.acl.acl_edit)}
                             successMessage={getLangText('Public note saved')}
                             url={ApiUrls.note_public_piece}
-                            currentUser={this.state.currentUser}/>
+                            currentUser={currentUser} />
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Further Details')}
-                        show={this.state.piece.acl.acl_edit
-                            || Object.keys(this.state.piece.extra_data).length > 0
-                            || this.state.piece.other_data.length > 0}
+                        show={piece.acl.acl_edit
+                            || Object.keys(piece.extra_data).length > 0
+                            || piece.other_data.length > 0}
                         defaultExpanded={true}>
                         <FurtherDetailsType
-                            editable={this.state.piece.acl.acl_edit}
-                            pieceId={this.state.piece.id}
-                            extraData={this.state.piece.extra_data}
-                            otherData={this.state.piece.other_data}
+                            editable={piece.acl.acl_edit}
+                            pieceId={piece.id}
+                            extraData={piece.extra_data}
+                            otherData={piece.other_data}
                             handleSuccess={this.loadPiece} />
                     </CollapsibleParagraph>
 
diff --git a/js/components/ascribe_forms/form.js b/js/components/ascribe_forms/form.js
index a2b7b9bc..91d00f65 100644
--- a/js/components/ascribe_forms/form.js
+++ b/js/components/ascribe_forms/form.js
@@ -178,20 +178,20 @@ let Form = React.createClass({
             let formData = this.getFormData();
 
             // sentry shouldn't post the user's password
-            if(formData.password) {
+            if (formData.password) {
                 delete formData.password;
             }
 
-            console.logGlobal(err, false, formData);
+            console.logGlobal(err, formData);
 
-            if(this.props.isInline) {
+            if (this.props.isInline) {
                 let notification = new GlobalNotificationModel(getLangText('Something went wrong, please try again later'), 'danger');
                 GlobalNotificationActions.appendGlobalNotification(notification);
             } else {
                 this.setState({errors: [getLangText('Something went wrong, please try again later')]});
             }
-
         }
+
         this.setState({submitted: false});
     },
 
diff --git a/js/components/ascribe_forms/form_consign.js b/js/components/ascribe_forms/form_consign.js
index 2f0ebf05..a28d2cff 100644
--- a/js/components/ascribe_forms/form_consign.js
+++ b/js/components/ascribe_forms/form_consign.js
@@ -41,6 +41,14 @@ let ConsignForm = React.createClass({
         };
     },
 
+    componentWillReceiveProps(nextProps) {
+        if (this.props.email !== nextProps.email) {
+            this.setState({
+                email: nextProps.email
+            });
+        }
+    },
+
     getFormData() {
         return this.props.id;
     },
diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js
index a204fb87..861806ae 100644
--- a/js/components/ascribe_forms/form_loan.js
+++ b/js/components/ascribe_forms/form_loan.js
@@ -25,6 +25,7 @@ import { mergeOptions } from '../../utils/general_utils';
 let LoanForm = React.createClass({
     propTypes: {
         loanHeading: React.PropTypes.string,
+        buttons: React.PropTypes.element,
         email: React.PropTypes.string,
         gallery: React.PropTypes.string,
         startDate: React.PropTypes.object,
@@ -60,6 +61,14 @@ let LoanForm = React.createClass({
         };
     },
 
+    componentWillReceiveProps(nextProps) {
+        if (this.props.email !== nextProps.email) {
+            this.setState({
+                email: nextProps.email
+            });
+        }
+    },
+
     onChange(state) {
         this.setState(state);
     },
@@ -80,7 +89,11 @@ let LoanForm = React.createClass({
     },
 
     getButtons() {
-        if(this.props.loanHeading) {
+        const { buttons, loanHeading } = this.props;
+
+        if (buttons) {
+            return buttons;
+        } else if (loanHeading) {
             return (
                 <button
                     type="submit"
diff --git a/js/components/ascribe_forms/form_login.js b/js/components/ascribe_forms/form_login.js
index 8b7c1e23..a604850d 100644
--- a/js/components/ascribe_forms/form_login.js
+++ b/js/components/ascribe_forms/form_login.js
@@ -93,7 +93,6 @@ let LoginForm = React.createClass({
                     <input
                         type="email"
                         placeholder={getLangText('Enter your email')}
-                        name="email"
                         defaultValue={email}
                         required/>
                 </Property>
@@ -103,7 +102,6 @@ let LoginForm = React.createClass({
                     <input
                         type="password"
                         placeholder={getLangText('Enter your password')}
-                        name="password"
                         required/>
                 </Property>
             </Form>
diff --git a/js/components/ascribe_forms/form_piece_extradata.js b/js/components/ascribe_forms/form_piece_extradata.js
index f6ee4177..eb1ab94c 100644
--- a/js/components/ascribe_forms/form_piece_extradata.js
+++ b/js/components/ascribe_forms/form_piece_extradata.js
@@ -13,43 +13,46 @@ import InputTextAreaToggable from './input_textarea_toggable';
 
 let PieceExtraDataForm = React.createClass({
     propTypes: {
-        pieceId: React.PropTypes.number,
+        name: React.PropTypes.string.isRequired,
+        pieceId: React.PropTypes.number.isRequired,
+
+        editable: React.PropTypes.bool,
         extraData: React.PropTypes.object,
         handleSuccess: React.PropTypes.func,
-        name: React.PropTypes.string,
-        title: React.PropTypes.string,
-        editable: React.PropTypes.bool
+        title: React.PropTypes.string
     },
 
     getFormData() {
-        let extradata = {};
-        extradata[this.props.name] = this.refs.form.refs[this.props.name].state.value;
         return {
-            extradata: extradata,
+            extradata: {
+                [this.props.name]: this.refs.form.refs[this.props.name].state.value
+            },
             piece_id: this.props.pieceId
         };
     },
-    
+
     render() {
-        let defaultValue = this.props.extraData[this.props.name] || '';
-        if (defaultValue.length === 0 && !this.props.editable){
+        const { editable, extraData, handleSuccess, name, pieceId, title } = this.props;
+        const defaultValue = (extraData && extraData[name]) || null;
+
+        if (!defaultValue && !editable) {
             return null;
         }
-        let url = requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: this.props.pieceId});
+
         return (
             <Form
                 ref='form'
-                url={url}
-                handleSuccess={this.props.handleSuccess}
+                url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: pieceId })}
+                handleSuccess={handleSuccess}
                 getFormData={this.getFormData}
-                disabled={!this.props.editable}>
+                disabled={!editable}>
                 <Property
-                    name={this.props.name}
-                    label={this.props.title}>
+                    name={name}
+                    label={title}>
                     <InputTextAreaToggable
                         rows={1}
                         defaultValue={defaultValue}
-                        placeholder={getLangText('Fill in%s', ' ') + this.props.title}
+                        placeholder={getLangText('Fill in%s', ' ') + title}
                         required />
                 </Property>
                 <hr />
diff --git a/js/components/ascribe_forms/form_register_piece.js b/js/components/ascribe_forms/form_register_piece.js
index 83d38b50..596f8a56 100644
--- a/js/components/ascribe_forms/form_register_piece.js
+++ b/js/components/ascribe_forms/form_register_piece.js
@@ -109,6 +109,11 @@ let RegisterPieceForm = React.createClass({
         );
     },
 
+    handleThumbnailValidationFailed(thumbnailFile) {
+        // If the validation fails, set the thumbnail as submittable since its optional
+        this.refs.submitButton.setReadyStateForKey('thumbnailKeyReady', true);
+    },
+
     isThumbnailDialogExpanded() {
         const { enableSeparateThumbnail } = this.props;
         const { digitalWorkFile } = this.state;
@@ -194,14 +199,15 @@ let RegisterPieceForm = React.createClass({
                             url: ApiUrls.blob_thumbnails
                         }}
                         handleChangedFile={this.handleChangedThumbnail}
+                        onValidationFailed={this.handleThumbnailValidationFailed}
                         isReadyForFormSubmission={formSubmissionValidation.fileOptional}
                         keyRoutine={{
                             url: AppConstants.serverUrl + 's3/key/',
                             fileClass: 'thumbnail'
                         }}
                         validation={{
-                            itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
-                            sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
+                            itemLimit: AppConstants.fineUploader.validation.workThumbnail.itemLimit,
+                            sizeLimit: AppConstants.fineUploader.validation.workThumbnail.sizeLimit,
                             allowedExtensions: ['png', 'jpg', 'jpeg', 'gif']
                         }}
                         setIsUploadReady={this.setIsUploadReady('thumbnailKeyReady')}
diff --git a/js/components/ascribe_forms/form_send_contract_agreement.js b/js/components/ascribe_forms/form_send_contract_agreement.js
index 74331e09..043c0361 100644
--- a/js/components/ascribe_forms/form_send_contract_agreement.js
+++ b/js/components/ascribe_forms/form_send_contract_agreement.js
@@ -58,11 +58,15 @@ let SendContractAgreementForm = React.createClass({
         notification = new GlobalNotificationModel(notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
-    getFormData(){
-        return {'appendix': {'default': this.refs.form.refs.appendix.state.value}};
+    getFormData() {
+        const appendixValue = this.refs.form.refs.appendix.state.value;
+
+        if (appendixValue) {
+            return { 'appendix': { 'default': appendixValue } };
+        }
     },
 
     getContracts() {
@@ -124,7 +128,8 @@ let SendContractAgreementForm = React.createClass({
                     <Property
                         name='appendix'
                         checkboxLabel={getLangText('Add appendix to the contract')}
-                        expanded={false}>
+                        expanded={false}
+                        style={{paddingBottom: 0}}>
                         <span>{getLangText('Appendix')}</span>
                         {/* We're using disabled on a form here as PropertyCollapsible currently
                         does not support the disabled + overrideForm functionality */}
diff --git a/js/components/ascribe_forms/input_fineuploader.js b/js/components/ascribe_forms/input_fineuploader.js
index db5bae05..fa9c72b6 100644
--- a/js/components/ascribe_forms/input_fineuploader.js
+++ b/js/components/ascribe_forms/input_fineuploader.js
@@ -52,6 +52,7 @@ const InputFineUploader = React.createClass({
             plural: string
         }),
         handleChangedFile: func,
+        onValidationFailed: func,
 
         // Provided by `Property`
         onChange: React.PropTypes.func
@@ -107,6 +108,7 @@ const InputFineUploader = React.createClass({
             isFineUploaderActive,
             isReadyForFormSubmission,
             keyRoutine,
+            onValidationFailed,
             setIsUploadReady,
             uploadMethod,
             validation,
@@ -127,6 +129,7 @@ const InputFineUploader = React.createClass({
                 createBlobRoutine={createBlobRoutine}
                 validation={validation}
                 submitFile={this.submitFile}
+                onValidationFailed={onValidationFailed}
                 setIsUploadReady={setIsUploadReady}
                 isReadyForFormSubmission={isReadyForFormSubmission}
                 areAssetsDownloadable={areAssetsDownloadable}
diff --git a/js/components/ascribe_media/media_player.js b/js/components/ascribe_media/media_player.js
index 2a23f2ed..1552b44c 100644
--- a/js/components/ascribe_media/media_player.js
+++ b/js/components/ascribe_media/media_player.js
@@ -184,7 +184,7 @@ let Video = React.createClass({
             );
         } else {
             return (
-                <Image src={this.props.preview} />
+                <Image preview={this.props.preview} />
             );
         }
     }
diff --git a/js/components/ascribe_modal/modal_wrapper.js b/js/components/ascribe_modal/modal_wrapper.js
index 3f3b4af4..511e7f8c 100644
--- a/js/components/ascribe_modal/modal_wrapper.js
+++ b/js/components/ascribe_modal/modal_wrapper.js
@@ -1,19 +1,20 @@
 'use strict';
 
 import React from 'react';
-import ReactAddons from 'react/addons';
 
 import Modal from 'react-bootstrap/lib/Modal';
 
 let ModalWrapper = React.createClass({
     propTypes: {
-        trigger: React.PropTypes.element,
         title: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element,
             React.PropTypes.string
         ]).isRequired,
-        handleSuccess: React.PropTypes.func.isRequired,
+
+        handleCancel: React.PropTypes.func,
+        handleSuccess: React.PropTypes.func,
+        trigger: React.PropTypes.element,
         children: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
@@ -38,15 +39,32 @@ let ModalWrapper = React.createClass({
         });
     },
 
+    handleCancel() {
+        if (typeof this.props.handleCancel === 'function') {
+            this.props.handleCancel();
+        }
+
+        this.hide();
+    },
+
     handleSuccess(response) {
-        this.props.handleSuccess(response);
+        if (typeof this.props.handleSuccess === 'function') {
+            this.props.handleSuccess(response);
+        }
+
         this.hide();
     },
 
     renderChildren() {
-        return ReactAddons.Children.map(this.props.children, (child) => {
-            return ReactAddons.addons.cloneWithProps(child, {
-                handleSuccess: this.handleSuccess
+        return React.Children.map(this.props.children, (child) => {
+            return React.cloneElement(child, {
+                handleSuccess: (response) => {
+                    if (typeof child.props.handleSuccess === 'function') {
+                        child.props.handleSuccess(response);
+                    }
+
+                    this.handleSuccess(response);
+                }
             });
         });
     },
@@ -54,14 +72,23 @@ let ModalWrapper = React.createClass({
     render() {
         const { trigger, title } = this.props;
 
-        // If the trigger component exists, we add the ModalWrapper's show() as its onClick method.
+        // If the trigger component exists, we add the ModalWrapper's show() to its onClick method.
         // The trigger component should, in most cases, be a button.
-        const clonedTrigger = React.isValidElement(trigger) ? React.cloneElement(trigger, {onClick: this.show})
-                                                            : null;
+        const clonedTrigger = React.isValidElement(trigger) ?
+            React.cloneElement(trigger, {
+                onClick: (...params) => {
+                    if (typeof trigger.props.onClick === 'function') {
+                        trigger.props.onClick(...params);
+                    }
+
+                    this.show();
+                }
+            }) : null;
+
         return (
             <span>
                 {clonedTrigger}
-                <Modal show={this.state.showModal} onHide={this.hide}>
+                <Modal show={this.state.showModal} onHide={this.handleCancel}>
                     <Modal.Header closeButton>
                         <Modal.Title>
                             {title}
diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
index 60370431..bcc15603 100644
--- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
+++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
@@ -39,30 +39,6 @@ let PieceListToolbar = React.createClass({
         ])
     },
 
-    getFilterWidget(){
-        if (this.props.filterParams){
-            return (
-                <PieceListToolbarFilterWidget
-                    filterParams={this.props.filterParams}
-                    filterBy={this.props.filterBy}
-                    applyFilterBy={this.props.applyFilterBy} />
-            );
-        }
-        return null;
-    },
-
-    getOrderWidget(){
-        if (this.props.orderParams){
-            return (
-                <PieceListToolbarOrderWidget
-                    orderParams={this.props.orderParams}
-                    orderBy={this.props.orderBy}
-                    applyOrderBy={this.props.applyOrderBy}/>
-            );
-        }
-        return null;
-    },
-
     render() {
         const { className, children, searchFor, searchQuery } = this.props;
 
@@ -75,8 +51,14 @@ let PieceListToolbar = React.createClass({
                                 {children}
                             </span>
                             <span className="pull-right">
-                                {this.getOrderWidget()}
-                                {this.getFilterWidget()}
+                                <PieceListToolbarOrderWidget
+                                    orderParams={this.props.orderParams}
+                                    orderBy={this.props.orderBy}
+                                    applyOrderBy={this.props.applyOrderBy}/>
+                                <PieceListToolbarFilterWidget
+                                    filterParams={this.props.filterParams}
+                                    filterBy={this.props.filterBy}
+                                    applyFilterBy={this.props.applyFilterBy} />
                             </span>
                             <SearchBar
                                 className="pull-right search-bar ascribe-input-glyph"
diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js
index c463330c..edb29e85 100644
--- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js
+++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js
@@ -30,15 +30,15 @@ let PieceListToolbarFilterWidget = React.createClass({
     generateFilterByStatement(param) {
         const filterBy = Object.assign({}, this.props.filterBy);
 
-        if(filterBy) {
+        if (filterBy) {
             // we need hasOwnProperty since the values are all booleans
-            if(filterBy.hasOwnProperty(param)) {
+            if (filterBy.hasOwnProperty(param)) {
                 filterBy[param] = !filterBy[param];
 
                 // if the parameter is false, then we want to remove it again
                 // from the list of queryParameters as this component is only about
                 // which actions *CAN* be done and not what *CANNOT*
-                if(!filterBy[param]) {
+                if (!filterBy[param]) {
                     delete filterBy[param];
                 }
 
@@ -66,7 +66,7 @@ let PieceListToolbarFilterWidget = React.createClass({
 
         // We're hiding the star in that complicated matter so that,
         // the surrounding button is not resized up on appearance
-        if(trueValuesOnly.length > 0) {
+        if (trueValuesOnly.length) {
             return { visibility: 'visible'};
         } else {
             return { visibility: 'hidden' };
@@ -81,62 +81,66 @@ let PieceListToolbarFilterWidget = React.createClass({
             </span>
         );
 
-        return (
-            <DropdownButton
-                pullRight={true}
-                title={filterIcon}
-                className="ascribe-piece-list-toolbar-filter-widget">
-                {/* We iterate over filterParams, to receive the label and then for each
-                    label also iterate over its items, to get all filterable options */}
-                {this.props.filterParams.map(({ label, items }, i) => {
-                    return (
-                        <div>
-                            <li
-                                style={{'textAlign': 'center'}}
-                                key={i}>
-                                <em>{label}:</em>
-                            </li>
-                            {items.map((param, j) => {
+        if (this.props.filterParams && this.props.filterParams.length) {
+            return (
+                <DropdownButton
+                    pullRight={true}
+                    title={filterIcon}
+                    className="ascribe-piece-list-toolbar-filter-widget">
+                    {/* We iterate over filterParams, to receive the label and then for each
+                        label also iterate over its items, to get all filterable options */}
+                    {this.props.filterParams.map(({ label, items }, i) => {
+                        return (
+                            <div key={label}>
+                                <li style={{'textAlign': 'center'}}>
+                                    <em>{label}:</em>
+                                </li>
+                                {items.map((paramItem) => {
+                                    let itemLabel;
+                                    let param;
 
-                                // As can be seen in the PropTypes, a param can either
-                                // be a string or an object of the shape:
-                                //
-                                // {
-                                //     key: <String>,
-                                //     label: <String>
-                                // }
-                                //
-                                // This is why we need to distinguish between both here.
-                                if(typeof param !== 'string') {
-                                    label = param.label;
-                                    param = param.key;
-                                } else {
-                                    param = param;
-                                    label = param.split('acl_')[1].replace(/_/g, ' ');
-                                }
+                                    // As can be seen in the PropTypes, a param can either
+                                    // be a string or an object of the shape:
+                                    //
+                                    // {
+                                    //     key: <String>,
+                                    //     label: <String>
+                                    // }
+                                    //
+                                    // This is why we need to distinguish between both here.
+                                    if (typeof paramItem !== 'string') {
+                                        param = paramItem.key;
+                                        itemLabel = paramItem.label;
+                                    } else {
+                                        param = paramItem;
+                                        itemLabel = paramItem.split('acl_')[1].replace(/_/g, ' ');
+                                    }
 
-                                return (
-                                    <li
-                                        key={j}
-                                        onClick={this.filterBy(param)}
-                                        className="filter-widget-item">
-                                        <div className="checkbox-line">
-                                            <span>
-                                                {getLangText(label)}
-                                            </span>
-                                            <input
-                                                readOnly
-                                                type="checkbox"
-                                                checked={this.props.filterBy[param]} />
-                                        </div>
-                                    </li>
-                                );
-                            })}
-                        </div>
-                    );
-                })}
-            </DropdownButton>
-        );
+                                    return (
+                                        <li
+                                            key={itemLabel}
+                                            onClick={this.filterBy(param)}
+                                            className="filter-widget-item">
+                                            <div className="checkbox-line">
+                                                <span>
+                                                    {getLangText(itemLabel)}
+                                                </span>
+                                                <input
+                                                    readOnly
+                                                    type="checkbox"
+                                                    checked={this.props.filterBy[param]} />
+                                            </div>
+                                        </li>
+                                    );
+                                })}
+                            </div>
+                        );
+                    })}
+                </DropdownButton>
+            );
+        } else {
+            return null;
+        }
     }
 });
 
diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js
index c38144b0..5257cc07 100644
--- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js
+++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js
@@ -37,7 +37,7 @@ let PieceListToolbarOrderWidget = React.createClass({
     isOrderActive() {
         // We're hiding the star in that complicated matter so that,
         // the surrounding button is not resized up on appearance
-        if(this.props.orderBy.length > 0) {
+        if (this.props.orderBy && this.props.orderBy.length) {
             return { visibility: 'visible'};
         } else {
             return { visibility: 'hidden' };
@@ -51,18 +51,18 @@ let PieceListToolbarOrderWidget = React.createClass({
                 <span style={this.isOrderActive()}>&middot;</span>
             </span>
         );
-        return (
 
-            <DropdownButton
-                pullRight={true}
-                title={filterIcon}
-                className="ascribe-piece-list-toolbar-filter-widget">
-                <li style={{'textAlign': 'center'}}>
-                    <em>{getLangText('Sort by')}:</em>
-                </li>
-                {this.props.orderParams.map((param) => {
-                    return (
-                        <div>
+        if (this.props.orderParams && this.props.orderParams.length) {
+            return (
+                <DropdownButton
+                    pullRight={true}
+                    title={filterIcon}
+                    className="ascribe-piece-list-toolbar-filter-widget">
+                    <li style={{'textAlign': 'center'}}>
+                        <em>{getLangText('Sort by')}:</em>
+                    </li>
+                    {this.props.orderParams.map((param) => {
+                        return (
                             <li
                                 key={param}
                                 onClick={this.orderBy(param)}
@@ -77,12 +77,14 @@ let PieceListToolbarOrderWidget = React.createClass({
                                         checked={param.indexOf(this.props.orderBy) > -1} />
                                 </div>
                             </li>
-                        </div>
-                    );
-                })}
-            </DropdownButton>
-        );
+                        );
+                    })}
+                </DropdownButton>
+            );
+        } else {
+            return null;
+        }
     }
 });
 
-export default PieceListToolbarOrderWidget;
\ No newline at end of file
+export default PieceListToolbarOrderWidget;
diff --git a/js/components/ascribe_routes/proxy_handler.js b/js/components/ascribe_routes/proxy_handler.js
new file mode 100644
index 00000000..7752912a
--- /dev/null
+++ b/js/components/ascribe_routes/proxy_handler.js
@@ -0,0 +1,132 @@
+'use strict';
+
+import React from 'react';
+import { RouteContext } from 'react-router';
+import history from '../../history';
+
+import UserStore from '../../stores/user_store';
+import UserActions from '../../actions/user_actions';
+
+import AppConstants from '../../constants/application_constants';
+
+
+const { object } = React.PropTypes;
+const WHEN_ENUM = ['loggedIn', 'loggedOut'];
+
+/**
+ * Redirects the user conditionally according to his authentication
+ *
+ * @param {enum/string} options.when ('loggedIn' || 'loggedOut')
+ */
+export function AuthRedirect({to, when}) {
+    // validate `when`, must be contained in `WHEN_ENUM`.
+    // Throw an error otherwise.
+    if(WHEN_ENUM.indexOf(when) === -1) {
+        let whenValues = WHEN_ENUM.join(', ');
+        throw new Error(`"when" must be one of: [${whenValues}] got "${when}" instead`);
+    }
+
+    return function(currentUser, query) {
+        const { redirectAuthenticated, redirect } = query;
+
+        // The user of this handler specifies with `when`, what kind of status
+        // needs to be checked to conditionally do - if that state is `true` -
+        // a redirect.
+        //
+        // So if when === 'loggedIn', we're checking if the user is logged in (and
+        // vice versa)
+        let exprToValidate = when === 'loggedIn' ? currentUser && currentUser.email
+                                                 : currentUser && !currentUser.email;
+
+        // and redirect if `true`.
+        if(exprToValidate) {
+            window.setTimeout(() => history.replace({ query, pathname: to }));
+            return true;
+
+            // Otherwise there can also be the case that the backend
+            // wants to redirect the user to a specific route when the user is logged out already
+        } else if(!exprToValidate && when === 'loggedIn' && redirect) {
+
+            delete query.redirect;
+            window.setTimeout(() => history.replace({ query, pathname: '/' + redirect }));
+            return true;
+
+        } else if(!exprToValidate && when === 'loggedOut' && redirectAuthenticated) {
+            /*
+             * redirectAuthenticated contains an arbitrary path
+             * eg pieces/<id>, editions/<bitcoin_id>, collection, settings, ...
+             * hence transitionTo cannot be used directly.
+             *
+             * While we're getting rid of `query.redirect` explicitly in the
+             * above `else if` statement, here it's sufficient to just call
+             * `baseUrl` + `redirectAuthenticated`, as it gets rid of queries as well.
+             */
+            window.location = AppConstants.baseUrl + redirectAuthenticated;
+            return true;
+        }
+        return false;
+    };
+}
+
+/**
+ * Can be used in combination with `Route` as an intermediate Handler
+ * between the actual component we want to display dependent on a certain state
+ * that is required to display that component.
+ *
+ * @param {[function]} redirectFn A function that conditionally redirects
+ */
+export function ProxyHandler(...redirectFunctions) {
+    return (Component) => {
+        return React.createClass({
+            displayName: 'ProxyHandler',
+
+            propTypes: {
+                location: object
+            },
+
+            // We need insert `RouteContext` here in order to be able
+            // to use the `Lifecycle` widget in further down nested components
+            mixins: [RouteContext],
+
+            getInitialState() {
+                return UserStore.getState();
+            },
+
+            componentDidMount() {
+                UserStore.listen(this.onChange);
+                UserActions.fetchCurrentUser();
+            },
+
+            componentDidUpdate() {
+                if(!UserStore.isLoading()) {
+                    const { currentUser } = this.state;
+                    const { query } = this.props.location;
+
+                    for(let i = 0; i < redirectFunctions.length; i++) {
+                        // if a redirectFunction redirects the user,
+                        // it should return `true` and therefore
+                        // stop/avoid the execution of all functions
+                        // that follow
+                        if(redirectFunctions[i](currentUser, query)) {
+                            break;
+                        }
+                    }
+                }
+            },
+
+            componentWillUnmount() {
+                UserStore.unlisten(this.onChange);
+            },
+
+            onChange(state) {
+                this.setState(state);
+            },
+
+            render() {
+                return (
+                    <Component {...this.props}/>
+                );
+            }
+        });
+    };
+}
diff --git a/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js b/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js
deleted file mode 100644
index 0eb4ad8f..00000000
--- a/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js
+++ /dev/null
@@ -1,115 +0,0 @@
-'use strict';
-
-import React from 'react';
-import { History, RouteContext } from 'react-router';
-
-import UserStore from '../../../stores/user_store';
-import UserActions from '../../../actions/user_actions';
-
-import AppConstants from '../../../constants/application_constants';
-
-
-const { object } = React.PropTypes;
-const WHEN_ENUM = ['loggedIn', 'loggedOut'];
-
-/**
- * Can be used in combination with `Route` as an intermediate Handler
- * between the actual component we want to display dependent on a certain state
- * that is required to display that component.
- *
- * @param {string} options.to   Any type of route path that is defined in routes.js
- * @param {enum/string} options.when ('loggedIn' || 'loggedOut')
- */
-export default function AuthProxyHandler({to, when}) {
-
-    // validate `when`, must be contained in `WHEN_ENUM`.
-    // Throw an error otherwise.
-    if(WHEN_ENUM.indexOf(when) === -1) {
-        let whenValues = WHEN_ENUM.join(', ');
-        throw new Error(`"when" must be one of: [${whenValues}] got "${when}" instead`);
-    }
-
-    return (Component) => {
-        return React.createClass({
-            displayName: 'AuthProxyHandler',
-
-            propTypes: {
-                location: object
-            },
-
-            // We need insert `RouteContext` here in order to be able
-            // to use the `Lifecycle` widget in further down nested components
-            mixins: [History, RouteContext],
-
-            getInitialState() {
-                return UserStore.getState();
-            },
-
-            componentDidMount() {
-                UserStore.listen(this.onChange);
-                UserActions.fetchCurrentUser();
-            },
-
-            componentDidUpdate() {
-                // Only refresh this component, when UserSources are not loading
-                // data from the server
-                if(!UserStore.isLoading()) {
-                    this.redirectConditionally();
-                }
-            },
-
-            componentWillUnmount() {
-                UserStore.unlisten(this.onChange);
-            },
-
-            redirectConditionally() {
-                const { query } = this.props.location;
-                const { redirectAuthenticated, redirect } = query;
-
-                // The user of this handler specifies with `when`, what kind of status
-                // needs to be checked to conditionally do - if that state is `true` -
-                // a redirect.
-                //
-                // So if when === 'loggedIn', we're checking if the user is logged in (and
-                // vice versa)
-                let exprToValidate = when === 'loggedIn' ?
-                    this.state.currentUser && this.state.currentUser.email :
-                    this.state.currentUser && !this.state.currentUser.email;
-
-                // and redirect if `true`.
-                if(exprToValidate) {
-                    window.setTimeout(() => this.history.replaceState(null, to, query));
-
-                    // Otherwise there can also be the case that the backend
-                    // wants to redirect the user to a specific route when the user is logged out already
-                } else if(!exprToValidate && when === 'loggedIn' && redirect) {
-
-                    delete query.redirect;
-                    window.setTimeout(() => this.history.replaceState(null, '/' + redirect, query));
-
-                } else if(!exprToValidate && when === 'loggedOut' && redirectAuthenticated) {
-                    /*
-                     * redirectAuthenticated contains an arbirary path
-                     * eg pieces/<id>, editions/<bitcoin_id>, collection, settings, ...
-                     * hence transitionTo cannot be used directly.
-                     *
-                     * While we're getting rid of `query.redirect` explicitly in the
-                     * above `else if` statement, here it's sufficient to just call
-                     * `baseUrl` + `redirectAuthenticated`, as it gets rid of queries as well.
-                     */
-                    window.location = AppConstants.baseUrl + redirectAuthenticated;
-                }
-            },
-
-            onChange(state) {
-                this.setState(state);
-            },
-
-            render() {
-                return (
-                    <Component {...this.props}/>
-                );
-            }
-        });
-    };
-}
diff --git a/js/components/ascribe_settings/webhook_settings.js b/js/components/ascribe_settings/webhook_settings.js
index 9deecbcd..4928c408 100644
--- a/js/components/ascribe_settings/webhook_settings.js
+++ b/js/components/ascribe_settings/webhook_settings.js
@@ -34,7 +34,6 @@ let WebhookSettings = React.createClass({
     componentDidMount() {
         WebhookStore.listen(this.onChange);
         WebhookActions.fetchWebhooks();
-        WebhookActions.fetchWebhookEvents();
     },
 
     componentWillUnmount() {
@@ -49,7 +48,7 @@ let WebhookSettings = React.createClass({
         return (event) => {
             WebhookActions.removeWebhook(webhookId);
 
-            let notification = new GlobalNotificationModel(getLangText('Webhook deleted'), 'success', 2000);
+            const notification = new GlobalNotificationModel(getLangText('Webhook deleted'), 'success', 2000);
             GlobalNotificationActions.appendGlobalNotification(notification);
         };
     },
@@ -57,16 +56,16 @@ let WebhookSettings = React.createClass({
     handleCreateSuccess() {
         this.refs.webhookCreateForm.reset();
         WebhookActions.fetchWebhooks(true);
-        let notification = new GlobalNotificationModel(getLangText('Webhook successfully created'), 'success', 5000);
+
+        const notification = new GlobalNotificationModel(getLangText('Webhook successfully created'), 'success', 5000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
-    getWebhooks(){
-        let content = <AscribeSpinner color='dark-blue' size='lg'/>;
-
+    getWebhooks() {
         if (this.state.webhooks) {
-            content = this.state.webhooks.map(function(webhook, i) {
+            return this.state.webhooks.map(function(webhook, i) {
                 const event = webhook.event.split('.')[0];
+
                 return (
                     <ActionPanel
                         name={webhook.event}
@@ -91,11 +90,14 @@ let WebhookSettings = React.createClass({
                                     </button>
                                 </div>
                             </div>
-                        }/>
+                        } />
                     );
             }, this);
+        } else {
+            return (
+                <AscribeSpinner color='dark-blue' size='lg'/>
+            );
         }
-        return content;
     },
 
     getEvents() {
@@ -110,18 +112,18 @@ let WebhookSettings = React.createClass({
                                 <option
                                     name={i}
                                     key={i}
-                                    value={ event + '.webhook' }>
-                                    { event.toUpperCase() }
+                                    value={event + '.webhook'}>
+                                    {event.toUpperCase()}
                                 </option>
                             );
                         })}
                     </select>
                 </Property>);
+        } else {
+            return null;
         }
-        return null;
     },
 
-    
     render() {
         return (
             <CollapsibleParagraph
@@ -138,20 +140,19 @@ let WebhookSettings = React.createClass({
                         a target url.
                     </p>
                 </div>
-                <AclProxy
-                    show={this.state.webhookEvents && this.state.webhookEvents.length}>
+                <AclProxy show={this.state.webhookEvents && this.state.webhookEvents.length}>
                     <Form
                         ref="webhookCreateForm"
                         url={ApiUrls.webhooks}
                         handleSuccess={this.handleCreateSuccess}>
-                        { this.getEvents() }
+                        {this.getEvents()}
                         <Property
                             name='target'
                             label={getLangText('Redirect Url')}>
                             <input
                                 type="text"
                                 placeholder={getLangText('Enter the url to be triggered')}
-                                required/>
+                                required />
                         </Property>
                         <hr />
                     </Form>
@@ -162,4 +163,4 @@ let WebhookSettings = React.createClass({
     }
 });
 
-export default WebhookSettings;
\ No newline at end of file
+export default WebhookSettings;
diff --git a/js/components/ascribe_slides_container/slides_container.js b/js/components/ascribe_slides_container/slides_container.js
index 39d515a3..109bbae7 100644
--- a/js/components/ascribe_slides_container/slides_container.js
+++ b/js/components/ascribe_slides_container/slides_container.js
@@ -57,21 +57,21 @@ const SlidesContainer = React.createClass({
     // When the start_from parameter is used, this.setSlideNum can not simply be used anymore.
     nextSlide(additionalQueryParams) {
         const slideNum = parseInt(this.props.location.query.slide_num, 10) || 0;
-        let nextSlide = slideNum + 1;
-        this.setSlideNum(nextSlide, additionalQueryParams);
+        this.setSlideNum(slideNum + 1, additionalQueryParams);
     },
 
     setSlideNum(nextSlideNum, additionalQueryParams = {}) {
-        let queryParams = Object.assign(this.props.location.query, additionalQueryParams);
-        queryParams.slide_num = nextSlideNum;
-        this.history.pushState(null, this.props.location.pathname, queryParams);
+        const { location: { pathname } } = this.props;
+        const query = Object.assign({}, this.props.location.query, additionalQueryParams, { slide_num: nextSlideNum });
+
+        this.history.push({ pathname, query });
     },
 
     // breadcrumbs are defined as attributes of the slides.
     // To extract them we have to read the DOM element's attributes
     extractBreadcrumbs() {
         const startFrom = parseInt(this.props.location.query.start_from, 10) || -1;
-        let breadcrumbs = [];
+        const breadcrumbs = [];
 
         React.Children.map(this.props.children, (child, i) => {
             if(child && i >= startFrom && child.props['data-slide-title']) {
@@ -179,4 +179,4 @@ const SlidesContainer = React.createClass({
     }
 });
 
-export default SlidesContainer;
\ No newline at end of file
+export default SlidesContainer;
diff --git a/js/components/ascribe_social_share/facebook_share_button.js b/js/components/ascribe_social_share/facebook_share_button.js
index aa0b6691..d5fbf699 100644
--- a/js/components/ascribe_social_share/facebook_share_button.js
+++ b/js/components/ascribe_social_share/facebook_share_button.js
@@ -2,6 +2,8 @@
 
 import React from 'react';
 
+import FacebookHandler from '../../third_party/facebook_handler';
+
 import AppConstants from '../../constants/application_constants';
 
 import { InjectInHeadUtils } from '../../utils/inject_utils';
@@ -17,24 +19,40 @@ let FacebookShareButton = React.createClass({
         };
     },
 
-    componentDidMount() {
-        /**
-         * Ideally we would only use FB.XFBML.parse() on the component that we're
-         * mounting, but doing this when we first load the FB sdk causes unpredictable behaviour.
-         * The button sometimes doesn't get initialized, likely because FB hasn't properly
-         * been initialized yet.
-         *
-         * To circumvent this, we always have the sdk parse the entire DOM on the initial load
-         * (see FacebookHandler) and then use FB.XFBML.parse() on the mounting component later.
-         */
-
-        InjectInHeadUtils
-            .inject(AppConstants.facebook.sdkUrl)
-            .then(() => { FB.XFBML.parse(this.refs.fbShareButton.getDOMNode().parentElement) });
+    getInitialState() {
+        return FacebookHandler.getState();
     },
 
-    shouldComponentUpdate(nextProps) {
-        return this.props.type !== nextProps.type;
+    componentDidMount() {
+        FacebookHandler.listen(this.onChange);
+
+        this.loadFacebook();
+    },
+
+    shouldComponentUpdate(nextProps, nextState) {
+        // Don't update if the props haven't changed or the FB SDK loading status is still the same
+        return this.props.type !== nextProps.type || nextState.loaded !== this.state.loaded;
+    },
+
+    componentDidUpdate() {
+        // If the component changes, we need to reparse the share button's XFBML.
+        // To prevent cases where the Facebook SDK hasn't been loaded yet at this stage,
+        // let's make sure that it's injected before trying to reparse.
+        this.loadFacebook();
+    },
+
+    onChange(state) {
+        this.setState(state);
+    },
+
+    loadFacebook() {
+        InjectInHeadUtils
+            .inject(AppConstants.facebook.sdkUrl)
+            .then(() => {
+                if (this.state.loaded) {
+                    FB.XFBML.parse(this.refs.fbShareButton.getDOMNode().parent)
+                }
+            });
     },
 
     render() {
diff --git a/js/components/ascribe_table/models/table_models.js b/js/components/ascribe_table/models/table_models.js
index b675d14e..99cf7e64 100644
--- a/js/components/ascribe_table/models/table_models.js
+++ b/js/components/ascribe_table/models/table_models.js
@@ -2,15 +2,15 @@
 
 export class ColumnModel {
     // ToDo: Add validation for all passed-in parameters
-    constructor(transformFn, columnName, displayName, displayType, rowWidth, canBeOrdered, transition, className) {
+    constructor({ transformFn, columnName = '', displayElement, displayType, rowWidth, canBeOrdered, transition, className = '' }) {
         this.transformFn = transformFn;
         this.columnName = columnName;
-        this.displayName = displayName;
+        this.displayElement = displayElement;
         this.displayType = displayType;
         this.rowWidth = rowWidth;
         this.canBeOrdered = canBeOrdered;
         this.transition = transition;
-        this.className = className ? className : '';
+        this.className = className;
     }
 }
 
@@ -28,7 +28,7 @@ export class ColumnModel {
  * our selfes, using this TransitionModel.
  */
 export class TransitionModel {
-    constructor(to, queryKey, valueKey, callback) {
+    constructor({ to, queryKey, valueKey, callback }) {
         this.to = to;
         this.queryKey = queryKey;
         this.valueKey = valueKey;
@@ -38,4 +38,4 @@ export class TransitionModel {
     toReactRouterLink(queryValue) {
         return '/' + this.to + '/' + queryValue;
     }
-}
\ No newline at end of file
+}
diff --git a/js/components/ascribe_table/table_header.js b/js/components/ascribe_table/table_header.js
index f807627b..78a31681 100644
--- a/js/components/ascribe_table/table_header.js
+++ b/js/components/ascribe_table/table_header.js
@@ -1,5 +1,5 @@
-'use strict';
 
+'use strict';
 import React from 'react';
 
 import TableHeaderItem from './table_header_item';
@@ -29,7 +29,7 @@ let TableHeader = React.createClass({
                             <TableHeaderItem
                                 className={column.className}
                                 key={i}
-                                displayName={column.displayName}
+                                displayElement={column.displayElement}
                                 columnName={columnName}
                                 canBeOrdered={canBeOrdered}
                                 orderAsc={this.props.orderAsc}
diff --git a/js/components/ascribe_table/table_header_item.js b/js/components/ascribe_table/table_header_item.js
index 8a4113ad..6116c26d 100644
--- a/js/components/ascribe_table/table_header_item.js
+++ b/js/components/ascribe_table/table_header_item.js
@@ -7,7 +7,7 @@ import TableHeaderItemCarret from './table_header_item_carret';
 let TableHeaderItem = React.createClass({
 
     propTypes: {
-        displayName: React.PropTypes.oneOfType([
+        displayElement: React.PropTypes.oneOfType([
             React.PropTypes.string,
             React.PropTypes.element
         ]).isRequired,
@@ -24,29 +24,31 @@ let TableHeaderItem = React.createClass({
     },
 
     render() {
-        if(this.props.canBeOrdered && this.props.changeOrder && this.props.orderAsc != null && this.props.orderBy) {
-            if(this.props.columnName === this.props.orderBy) {
+        const { canBeOrdered, changeOrder, className, columnName, displayElement, orderAsc, orderBy } = this.props;
+
+        if (canBeOrdered && changeOrder && orderAsc != null && orderBy) {
+            if (columnName === orderBy) {
                 return (
                     <th
-                        className={'ascribe-table-header-column ' + this.props.className}
+                        className={'ascribe-table-header-column ' + className}
                         onClick={this.changeOrder}>
-                        <span>{this.props.displayName} <TableHeaderItemCarret orderAsc={this.props.orderAsc} /></span>
+                        <span>{displayElement} <TableHeaderItemCarret orderAsc={orderAsc} /></span>
                     </th>
                 );
             } else {
                 return (
                     <th
-                        className={'ascribe-table-header-column ' + this.props.className}
+                        className={'ascribe-table-header-column ' + className}
                         onClick={this.changeOrder}>
-                        <span>{this.props.displayName}</span>
+                        <span>{displayElement}</span>
                     </th>
                 );
             }
         } else {
             return (
-                <th className={'ascribe-table-header-column ' + this.props.className}>
+                <th className={'ascribe-table-header-column ' + className}>
                     <span>
-                        {this.props.displayName}
+                        {displayElement}
                     </span>
                 </th>
             );
diff --git a/js/components/ascribe_table/table_item_acl_filtered.js b/js/components/ascribe_table/table_item_acl_filtered.js
index 22a28130..9ca91bcf 100644
--- a/js/components/ascribe_table/table_item_acl_filtered.js
+++ b/js/components/ascribe_table/table_item_acl_filtered.js
@@ -3,15 +3,15 @@
 import React from 'react';
 
 
-let TableItemAclFiltered = React.createClass({
+const TableItemAclFiltered = React.createClass({
     propTypes: {
         content: React.PropTypes.object,
-        notifications: React.PropTypes.string
+        notifications: React.PropTypes.array
     },
 
     render() {
-        var availableAcls = ['acl_consign', 'acl_loan', 'acl_transfer', 'acl_view', 'acl_share', 'acl_unshare', 'acl_delete'];
-        if (this.props.notifications && this.props.notifications.length > 0){
+        const availableAcls = ['acl_consign', 'acl_loan', 'acl_transfer', 'acl_view', 'acl_share', 'acl_unshare', 'acl_delete'];
+        if (this.props.notifications && this.props.notifications.length) {
             return (
                 <span>
                     {this.props.notifications[0].action_str}
@@ -19,15 +19,14 @@ let TableItemAclFiltered = React.createClass({
             );
         }
 
-        let filteredAcls = Object.keys(this.props.content).filter((key) => {
-            return availableAcls.indexOf(key) > -1 && this.props.content[key];
-        });
-
-        filteredAcls = filteredAcls.map((acl) => acl.split('acl_')[1]);
+        const filteredAcls = Object.keys(this.props.content)
+            .filter((key) => availableAcls.indexOf(key) > -1 && this.props.content[key])
+            .map((acl) => acl.split('acl_')[1])
+            .join('/');
 
         return (
             <span>
-                {filteredAcls.join('/')}
+                {filteredAcls}
             </span>
         );
     }
diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
index 25552819..db28846b 100644
--- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
+++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
@@ -26,7 +26,7 @@ let FileDragAndDropDialog = React.createClass({
     getDragDialog(fileClass) {
         if (dragAndDropAvailable) {
             return [
-                <p>{getLangText('Drag %s here', fileClass)}</p>,
+                <p className="file-drag-and-drop-dialog-title">{getLangText('Drag %s here', fileClass)}</p>,
                 <p>{getLangText('or')}</p>
             ];
         } else {
@@ -46,6 +46,8 @@ let FileDragAndDropDialog = React.createClass({
         if (hasFiles) {
             return null;
         } else {
+            let dialogElement;
+
             if (enableLocalHashing && !uploadMethod) {
                 const currentQueryParams = getCurrentQueryParams();
 
@@ -55,9 +57,9 @@ let FileDragAndDropDialog = React.createClass({
                 const queryParamsUpload = Object.assign({}, currentQueryParams);
                 queryParamsUpload.method = 'upload';
 
-                return (
-                    <div className="file-drag-and-drop-dialog present-options">
-                        <p>{getLangText('Would you rather')}</p>
+                dialogElement = (
+                    <div className="present-options">
+                        <p className="file-drag-and-drop-dialog-title">{getLangText('Would you rather')}</p>
                         {/*
                             The frontend in live is hosted under /app,
                             Since `Link` is appending that base url, if its defined
@@ -85,32 +87,40 @@ let FileDragAndDropDialog = React.createClass({
                 );
             } else {
                 if (multipleFiles) {
-                    return (
-                        <span className="file-drag-and-drop-dialog">
-                            {this.getDragDialog(fileClassToUpload.plural)}
-                            <span
-                                className="btn btn-default"
-                                onClick={onClick}>
-                                    {getLangText('choose %s to upload', fileClassToUpload.plural)}
-                            </span>
+                    dialogElement = [
+                        this.getDragDialog(fileClassToUpload.plural),
+                        <span
+                            className="btn btn-default"
+                            onClick={onClick}>
+                                {getLangText('choose %s to upload', fileClassToUpload.plural)}
                         </span>
-                    );
+                    ];
                 } else {
                     const dialog = uploadMethod === 'hash' ? getLangText('choose a %s to hash', fileClassToUpload.singular)
                                                            : getLangText('choose a %s to upload', fileClassToUpload.singular);
 
-                    return (
-                        <span className="file-drag-and-drop-dialog">
-                            {this.getDragDialog(fileClassToUpload.singular)}
-                            <span
-                                className="btn btn-default"
-                                onClick={onClick}>
-                                    {dialog}
-                            </span>
+                    dialogElement = [
+                        this.getDragDialog(fileClassToUpload.singular),
+                        <span
+                            className="btn btn-default"
+                            onClick={onClick}>
+                                {dialog}
                         </span>
-                    );
+                    ];
                 }
             }
+
+            return (
+                <div className="file-drag-and-drop-dialog">
+                    <div className="hidden-print">
+                        {dialogElement}
+                    </div>
+                    {/* Hide the uploader and just show that there's been on files uploaded yet when printing */}
+                    <p className="text-align-center visible-print">
+                        {getLangText('No files uploaded')}
+                    </p>
+                </div>
+            );
         }
     }
 });
diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js
index 0d8d366c..5c757121 100644
--- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js
+++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_image.js
@@ -68,7 +68,7 @@ const FileDragAndDropPreviewImage = React.createClass({
 
         return (
             <div
-                className="file-drag-and-drop-preview-image"
+                className="file-drag-and-drop-preview-image hidden-print"
                 style={imageStyle}>
                     <AclProxy
                         show={showProgress}>
diff --git a/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js b/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js
index 5848bca1..6612f968 100644
--- a/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js
+++ b/js/components/ascribe_uploader/ascribe_upload_button/upload_button.js
@@ -71,17 +71,9 @@ export default function UploadButton({ className = 'btn btn-default btn-sm' } =
         handleOnClick() {
             if(!this.state.disabled) {
                 let evt;
-                const uploadingFiles = this.getUploadingFiles();
-                const uploadedFile = this.getUploadedFile();
 
-                this.clearSelection();
-                if(uploadingFiles.length) {
-                    this.props.handleCancelFile(uploadingFiles[0].id);
-                } else if(uploadedFile && !uploadedFile.s3UrlSafe) {
-                    this.props.handleCancelFile(uploadedFile.id);
-                } else if(uploadedFile && uploadedFile.s3UrlSafe) {
-                    this.props.handleDeleteFile(uploadedFile.id);
-                }
+                // First, remove any currently uploading or uploaded items
+                this.onClickRemove();
 
                 try {
                     evt = new MouseEvent('click', {
@@ -99,18 +91,19 @@ export default function UploadButton({ className = 'btn btn-default btn-sm' } =
             }
         },
 
-        onClickCancel() {
-            this.clearSelection();
-            const uploadingFile = this.getUploadingFiles()[0];
-            this.props.handleCancelFile(uploadingFile.id);
-        },
-
         onClickRemove() {
-            this.clearSelection();
+            const uploadingFiles = this.getUploadingFiles();
             const uploadedFile = this.getUploadedFile();
-            this.props.handleDeleteFile(uploadedFile.id);
-        },
 
+            this.clearSelection();
+            if(uploadingFiles.length) {
+                this.props.handleCancelFile(uploadingFiles[0].id);
+            } else if(uploadedFile && !uploadedFile.s3UrlSafe) {
+                this.props.handleCancelFile(uploadedFile.id);
+            } else if(uploadedFile && uploadedFile.s3UrlSafe) {
+                this.props.handleDeleteFile(uploadedFile.id);
+            }
+        },
 
         getButtonLabel() {
             let { filesToUpload, fileClassToUpload } = this.props;
@@ -133,7 +126,7 @@ export default function UploadButton({ className = 'btn btn-default btn-sm' } =
                 return (
                     <span>
                         {' ' + truncateTextAtCharIndex(uploadingFiles[0].name, 40) + ' '}
-                        [<a onClick={this.onClickCancel}>{getLangText('cancel upload')}</a>]
+                        [<a onClick={this.onClickRemove}>{getLangText('cancel upload')}</a>]
                     </span>
                 );
             } else if(uploadedFile) {
@@ -193,4 +186,4 @@ export default function UploadButton({ className = 'btn btn-default btn-sm' } =
             );
         }
     });
-}
\ No newline at end of file
+}
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index 67b19e02..feb0479d 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -36,20 +36,15 @@ const ReactS3FineUploader = React.createClass({
         keyRoutine: shape({
             url: string,
             fileClass: string,
-            pieceId: oneOfType([
-                string,
-                number
-            ])
+            pieceId: number
         }),
         createBlobRoutine: shape({
             url: string,
-            pieceId: oneOfType([
-                string,
-                number
-            ])
+            pieceId: number
         }),
         handleChangedFile: func, // is for when a file is dropped or selected
         submitFile: func, // is for when a file has been successfully uploaded, TODO: rename to handleSubmitFile
+        onValidationFailed: func,
         autoUpload: bool,
         debug: bool,
         objectProperties: shape({
@@ -344,6 +339,7 @@ const ReactS3FineUploader = React.createClass({
                 // still we warn the user of this component
                 console.warn('createBlobRoutine was not defined for ReactS3FineUploader. Continuing without creating the blob on the server.');
                 resolve();
+                return;
             }
 
             window.fetch(createBlobRoutine.url, {
@@ -439,7 +435,7 @@ const ReactS3FineUploader = React.createClass({
     onComplete(id, name, res, xhr) {
         // There has been an issue with the server's connection
         if (xhr && xhr.status === 0 && res.success) {
-            console.logGlobal(new Error('Upload succeeded with a status code 0'), false, {
+            console.logGlobal(new Error('Upload succeeded with a status code 0'), {
                 files: this.state.filesToUpload,
                 chunks: this.state.chunks,
                 xhr: this.getXhrErrorComment(xhr)
@@ -497,7 +493,7 @@ const ReactS3FineUploader = React.createClass({
     },
 
     onError(id, name, errorReason, xhr) {
-        console.logGlobal(errorReason, false, {
+        console.logGlobal(errorReason, {
             files: this.state.filesToUpload,
             chunks: this.state.chunks,
             xhr: this.getXhrErrorComment(xhr)
@@ -522,13 +518,16 @@ const ReactS3FineUploader = React.createClass({
     },
 
     isFileValid(file) {
-        if(file.size > this.props.validation.sizeLimit) {
+        if (file.size > this.props.validation.sizeLimit) {
+            const fileSizeInMegaBytes = this.props.validation.sizeLimit / 1000000;
 
-            let fileSizeInMegaBytes = this.props.validation.sizeLimit / 1000000;
-
-            let notification = new GlobalNotificationModel(getLangText('A file you submitted is bigger than ' + fileSizeInMegaBytes + 'MB.'), 'danger', 5000);
+            const notification = new GlobalNotificationModel(getLangText('A file you submitted is bigger than ' + fileSizeInMegaBytes + 'MB.'), 'danger', 5000);
             GlobalNotificationActions.appendGlobalNotification(notification);
 
+            if (typeof this.props.onValidationFailed === 'function') {
+                this.props.onValidationFailed(file);
+            }
+
             return false;
         } else {
             return true;
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader_utils.js b/js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
index ed76c5e8..78fc0591 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
@@ -1,11 +1,13 @@
 'use strict';
 
+import MimeTypes from '../../constants/mime_types';
+
 export const formSubmissionValidation = {
     /**
      * Returns a boolean if there has been at least one file uploaded
      * successfully without it being deleted or canceled.
      * @param  {array of files}  files provided by react fine uploader
-     * @return {boolean}       
+     * @return {boolean}
      */
     atLeastOneUploadedFile(files) {
         files = files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled');
@@ -69,12 +71,15 @@ export function displayValidProgressFilesFilter(file) {
  *
  * Takes an array of file extensions (['pdf', 'png', ...]) and transforms them into a string
  * that can be passed into an html5 input via its 'accept' prop.
- * @param  {array} allowedExtensions Array of strings without a dot prefixed
+ * @param  {array}  allowedExtensions Array of strings without a dot prefixed
  * @return {string}                   Joined string (comma-separated) of the passed-in array
  */
 export function transformAllowedExtensionsToInputAcceptProp(allowedExtensions) {
-    // add a dot in front of the extension
-    let prefixedAllowedExtensions = allowedExtensions.map((ext) => '.' + ext);
+    // Get the mime type of the extension if it's defined or add a dot in front of the extension
+    // This is important for Safari as it doesn't understand just the extension.
+    let prefixedAllowedExtensions = allowedExtensions.map((ext) => {
+        return MimeTypes[ext] || ('.' + ext);
+    });
 
     // generate a comma separated list to add them to the DOM element
     // See: http://stackoverflow.com/questions/4328947/limit-file-format-when-using-input-type-file
diff --git a/js/components/footer.js b/js/components/footer.js
index 31145d4b..f2e35dfc 100644
--- a/js/components/footer.js
+++ b/js/components/footer.js
@@ -7,7 +7,7 @@ import { getLangText } from '../utils/lang_utils';
 let Footer = React.createClass({
     render() {
         return (
-            <div className="ascribe-footer">
+            <div className="ascribe-footer hidden-print">
                 <p className="ascribe-sub-sub-statement">
                   <br />
                   <a href="http://docs.ascribe.apiary.io/" target="_blank">api</a> |
diff --git a/js/components/global_action.js b/js/components/global_action.js
deleted file mode 100644
index 80df0c75..00000000
--- a/js/components/global_action.js
+++ /dev/null
@@ -1,43 +0,0 @@
-'use strict';
-
-import React from 'react';
-
-let GlobalAction = React.createClass({
-    propTypes: {
-        requestActions: React.PropTypes.object
-    },
-
-    render() {
-        let pieceActions = null;
-        if (this.props.requestActions && this.props.requestActions.pieces){
-            pieceActions = this.props.requestActions.pieces.map((item) => {
-                return (
-                    <div className="ascribe-global-action">
-                        {item}
-                    </div>);
-            });
-        }
-        let editionActions = null;
-        if (this.props.requestActions && this.props.requestActions.editions){
-            editionActions = Object.keys(this.props.requestActions.editions).map((pieceId) => {
-                return this.props.requestActions.editions[pieceId].map((item) => {
-                    return (
-                        <div className="ascribe-global-action">
-                            {item}
-                        </div>);
-                });
-            });
-        }
-
-        if (pieceActions || editionActions) {
-            return (
-                <div className="ascribe-global-action-wrapper">
-                    {pieceActions}
-                    {editionActions}
-                </div>);
-        }
-        return null;
-    }
-});
-
-export default GlobalAction;
\ No newline at end of file
diff --git a/js/components/header.js b/js/components/header.js
index b3fd543e..c16cba86 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -16,12 +16,13 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
 
 import AclProxy from './acl_proxy';
 
+import EventActions from '../actions/event_actions';
+
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
 
 import WhitelabelActions from '../actions/whitelabel_actions';
 import WhitelabelStore from '../stores/whitelabel_store';
-import EventActions from '../actions/event_actions';
 
 import HeaderNotifications from './header_notification';
 
@@ -37,16 +38,9 @@ import { constructHead } from '../utils/dom_utils';
 
 let Header = React.createClass({
     propTypes: {
-        showAddWork: React.PropTypes.bool,
         routes: React.PropTypes.arrayOf(React.PropTypes.object)
     },
 
-    getDefaultProps() {
-        return {
-            showAddWork: true
-        };
-    },
-
     getInitialState() {
         return mergeOptions(
             WhitelabelStore.getState(),
@@ -55,15 +49,29 @@ let Header = React.createClass({
     },
 
     componentDidMount() {
-        UserActions.fetchCurrentUser();
         UserStore.listen(this.onChange);
-        WhitelabelActions.fetchWhitelabel();
+        UserActions.fetchCurrentUser.defer();
+
         WhitelabelStore.listen(this.onChange);
+        WhitelabelActions.fetchWhitelabel.defer();
 
         // react-bootstrap 0.25.1 has a bug in which it doesn't
         // close the mobile expanded navigation after a click by itself.
         // To get rid of this, we set the state of the component ourselves.
         history.listen(this.onRouteChange);
+
+        if (this.state.currentUser && this.state.currentUser.email) {
+            EventActions.profileDidLoad.defer(this.state.currentUser);
+        }
+    },
+
+    componentWillUpdate(nextProps, nextState) {
+        const { currentUser: { email: curEmail } = {} } = this.state;
+        const { currentUser: { email: nextEmail } = {} } = nextState;
+
+        if (nextEmail && curEmail !== nextEmail) {
+            EventActions.profileDidLoad.defer(nextState.currentUser);
+        }
     },
 
     componentWillUnmount() {
@@ -111,10 +119,6 @@ let Header = React.createClass({
 
     onChange(state) {
         this.setState(state);
-
-        if(this.state.currentUser && this.state.currentUser.email) {
-            EventActions.profileDidLoad.defer(this.state.currentUser);
-        }
     },
 
     onMenuItemClick() {
@@ -146,7 +150,9 @@ let Header = React.createClass({
     // the collapsibleNav by itself on click. setState() isn't available on a ref so
     // doing this explicitly is the only way for now.
     onRouteChange() {
-        this.refs.navbar.state.navExpanded = false;
+        if (this.refs.navbar) {
+            this.refs.navbar.state.navExpanded = false;
+        }
     },
 
     render() {
@@ -213,17 +219,18 @@ let Header = React.createClass({
         return (
             <div>
                 <Navbar
+                    ref="navbar"
                     brand={this.getLogo()}
                     toggleNavKey={0}
                     fixedTop={true}
-                    ref="navbar">
+                    className="hidden-print">
                     <CollapsibleNav
                         eventKey={0}>
                         <Nav navbar left>
                             {this.getPoweredBy()}
                         </Nav>
                         <Nav navbar right>
-                            <HeaderNotificationDebug show = {false}/>
+                            <HeaderNotificationDebug show={false}/>
                             {account}
                             {signup}
                         </Nav>
@@ -231,6 +238,9 @@ let Header = React.createClass({
                         {navRoutesLinks}
                     </CollapsibleNav>
                 </Navbar>
+                <p className="ascribe-print-header visible-print">
+                    <span className="icon-ascribe-logo" />
+                </p>
             </div>
         );
     }
diff --git a/js/components/password_reset_container.js b/js/components/password_reset_container.js
index 31275a08..6d2d089e 100644
--- a/js/components/password_reset_container.js
+++ b/js/components/password_reset_container.js
@@ -130,8 +130,9 @@ let PasswordResetForm = React.createClass({
     },
 
     handleSuccess() {
-        this.history.pushState(null, '/collection');
-        let notification = new GlobalNotificationModel(getLangText('password successfully updated'), 'success', 10000);
+        this.history.push('/collection');
+
+        const notification = new GlobalNotificationModel(getLangText('password successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
diff --git a/js/components/piece_list.js b/js/components/piece_list.js
index 9424117c..666d1b54 100644
--- a/js/components/piece_list.js
+++ b/js/components/piece_list.js
@@ -37,6 +37,7 @@ let PieceList = React.createClass({
         bulkModalButtonListType: React.PropTypes.func,
         canLoadPieceList: React.PropTypes.bool,
         redirectTo: React.PropTypes.string,
+        shouldRedirect: React.PropTypes.func,
         customSubmitButton: React.PropTypes.element,
         customThumbnailPlaceholder: React.PropTypes.func,
         filterParams: React.PropTypes.array,
@@ -114,9 +115,13 @@ let PieceList = React.createClass({
     },
 
     componentDidUpdate() {
-        if (this.props.redirectTo && this.state.unfilteredPieceListCount === 0) {
+        const { location: { query }, redirectTo, shouldRedirect } = this.props;
+        const { unfilteredPieceListCount } = this.state;
+
+        if (redirectTo && unfilteredPieceListCount === 0 &&
+            (typeof shouldRedirect === 'function' && shouldRedirect(unfilteredPieceListCount))) {
             // FIXME: hack to redirect out of the dispatch cycle
-            window.setTimeout(() => this.history.pushState(null, this.props.redirectTo, this.props.location.query), 0);
+            window.setTimeout(() => this.history.push({ query, pathname: redirectTo }), 0);
         }
     },
 
@@ -169,15 +174,16 @@ let PieceList = React.createClass({
         }
     },
 
-    searchFor(searchTerm) {
-        this.loadPieceList({
-            page: 1,
-            search: searchTerm
-        });
-        this.history.pushState(null, this.props.location.pathname, {page: 1});
+    searchFor(search) {
+        const { location: { pathname } } = this.props;
+
+        this.loadPieceList({ search, page: 1 });
+        this.history.push({ pathname, query: { page: 1 } });
     },
 
-    applyFilterBy(filterBy){
+    applyFilterBy(filterBy) {
+        const { location: { pathname } } = this.props;
+
         this.setState({
             isFilterDirty: true
         });
@@ -190,31 +196,32 @@ let PieceList = React.createClass({
                 this.state.pieceList
                     .forEach((piece) => {
                         // but only if they're actually open
-                        if(this.state.isEditionListOpenForPieceId[piece.id].show) {
+                        const isEditionListOpenForPiece = this.state.isEditionListOpenForPieceId[piece.id];
+
+                        if (isEditionListOpenForPiece && isEditionListOpenForPiece.show) {
                             EditionListActions.refreshEditionList({
                                 pieceId: piece.id,
                                 filterBy
                             });
                         }
-
                     });
             });
 
         // we have to redirect the user always to page one as it could be that there is no page two
         // for filtered pieces
-        this.history.pushState(null, this.props.location.pathname, {page: 1});
+        this.history.push({ pathname, query: { page: 1 } });
     },
 
     applyOrderBy(orderBy) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, page, pageSize, search } = this.state;
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     loadPieceList({ page, filterBy = this.state.filterBy, search = this.state.search }) {
+        const { orderAsc, pageSize } = this.state;
         const orderBy = this.state.orderBy || this.props.orderBy;
 
-        return PieceListActions.fetchPieceList(page, this.state.pageSize, search,
-                                               orderBy, this.state.orderAsc, filterBy);
+        return PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     fetchSelectedPieceEditionList() {
@@ -240,8 +247,9 @@ let PieceList = React.createClass({
     },
 
     handleAclSuccess() {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderBy, orderAsc, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         this.fetchSelectedPieceEditionList()
             .forEach((pieceId) => {
diff --git a/js/components/register_piece.js b/js/components/register_piece.js
index 8211e91e..19a340ba 100644
--- a/js/components/register_piece.js
+++ b/js/components/register_piece.js
@@ -65,26 +65,21 @@ let RegisterPiece = React.createClass( {
         this.setState(state);
     },
 
-    handleSuccess(response){
-        let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
+    handleSuccess(response) {
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
         // once the user was able to register a piece successfully, we need to make sure to keep
         // the piece list up to date
-        PieceListActions.fetchPieceList(
-            this.state.page,
-            this.state.pageSize,
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
-        this.history.pushState(null, `/pieces/${response.piece.id}`);
+        this.history.push(`/pieces/${response.piece.id}`);
     },
 
     getSpecifyEditions() {
-        if(this.state.whitelabel && this.state.whitelabel.acl_create_editions || Object.keys(this.state.whitelabel).length === 0) {
+        if (this.state.whitelabel && this.state.whitelabel.acl_create_editions || Object.keys(this.state.whitelabel).length === 0) {
             return (
                 <Property
                     name="num_editions"
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js b/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
index 41f2c25a..271901bb 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
@@ -19,8 +19,10 @@ import ApiUrls from '../../../../../../constants/api_urls';
 
 import requests from '../../../../../../utils/requests';
 
-import { getLangText } from '../../../../../../utils/lang_utils';
+import { getErrorNotificationMessage } from '../../../../../../utils/error_utils';
 import { setCookie } from '../../../../../../utils/fetch_api_utils';
+import { validateForms } from '../../../../../../utils/form_utils';
+import { getLangText } from '../../../../../../utils/lang_utils';
 import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils';
 
 
@@ -35,7 +37,7 @@ const PRRegisterPieceForm = React.createClass({
 
     mixins: [History],
 
-    getInitialState(){
+    getInitialState() {
         return {
             digitalWorkKeyReady: true,
             thumbnailKeyReady: true,
@@ -54,16 +56,16 @@ const PRRegisterPieceForm = React.createClass({
      * second adding all the additional details
      */
     submit() {
-        if(!this.validateForms()) {
+        if (!this.validateForms()) {
             return;
-        } else {
-            // disable the submission button right after the user
-            // clicks on it to avoid double submission
-            this.setState({
-                submitted: true
-            });
         }
 
+        // disable the submission button right after the user
+        // clicks on it to avoid double submission
+        this.setState({
+            submitted: true
+        });
+
         const { currentUser } = this.props;
         const { registerPieceForm,
                 additionalDataForm,
@@ -75,7 +77,7 @@ const PRRegisterPieceForm = React.createClass({
         const additionalDataFormData = additionalDataForm.getFormData();
 
         // composing data for piece registration
-        let registerPieceFormData = registerPieceForm.getFormData();
+        const registerPieceFormData = registerPieceForm.getFormData();
         registerPieceFormData.digital_work_key = digitalWorkKey.state.value;
         registerPieceFormData.thumbnail_file = thumbnailKey.state.value;
         registerPieceFormData.terms = true;
@@ -83,33 +85,41 @@ const PRRegisterPieceForm = React.createClass({
         // submitting the piece
         requests
             .post(ApiUrls.pieces_list, { body: registerPieceFormData })
-            .then(({ success, piece, notification }) => {
-                if(success) {
-                    this.setState({
-                        piece
-                    }, () => {
-                        supportingMaterials.refs.input.createBlobRoutine();
-                        proofOfPayment.refs.input.createBlobRoutine();
-                    });
+            .then(({ piece, notification }) => {
+                this.setState({piece}, () => {
+                    supportingMaterials.refs.input.createBlobRoutine();
+                    proofOfPayment.refs.input.createBlobRoutine();
+                });
 
-                    setCookie(currentUser.email, piece.id);
+                setCookie(currentUser.email, piece.id);
 
-                    return requests.post(ApiUrls.piece_extradata, {
+                return requests
+                    .post(ApiUrls.piece_extradata, {
                         body: {
                             extradata: additionalDataFormData,
                             piece_id: piece.id
                         },
                         piece_id: piece.id
+                    })
+                    .then(() => {
+                        const notificationMessage = new GlobalNotificationModel(notification || getLangText('You have successfully submitted "%s" to Portfolio Review 2015', piece.title), 'success', 5000);
+                        GlobalNotificationActions.appendGlobalNotification(notificationMessage);
                     });
-                } else {
-                    const notificationMessage = new GlobalNotificationModel(notification, 'danger', 5000);
-                    GlobalNotificationActions.appendGlobalNotification(notificationMessage);
-                }
             })
-            .then(() => this.history.pushState(null, `/pieces/${this.state.piece.id}`))
-            .catch(() => {
-                const notificationMessage = new GlobalNotificationModel(getLangText("Ups! We weren't able to send your submission. Contact: support@ascribe.io"), 'danger', 5000);
+            .then(() => this.history.push(`/pieces/${this.state.piece.id}`))
+            .catch((err) => {
+                const errMessage = (getErrorNotificationMessage(err) || getLangText("Oops! We weren't able to send your submission.")) +
+                                        getLangText(' Please contact support@ascribe.io');
+
+                const notificationMessage = new GlobalNotificationModel(errMessage, 'danger', 10000);
                 GlobalNotificationActions.appendGlobalNotification(notificationMessage);
+
+                console.logGlobal(new Error('Portfolio Review piece registration failed'), err);
+
+                // Reset the submit button
+                this.setState({
+                    submitted: false
+                });
             });
     },
 
@@ -118,11 +128,7 @@ const PRRegisterPieceForm = React.createClass({
                 additionalDataForm,
                 uploadersForm } = this.refs;
 
-        const registerPieceFormValidation = registerPieceForm.validate();
-        const additionalDataFormValidation = additionalDataForm.validate();
-        const uploaderFormValidation = uploadersForm.validate();
-
-        return registerPieceFormValidation && additionalDataFormValidation && uploaderFormValidation;
+        return validateForms([registerPieceForm, additionalDataForm, uploadersForm], true);
     },
 
     getCreateBlobRoutine() {
@@ -139,7 +145,7 @@ const PRRegisterPieceForm = React.createClass({
     },
 
     /**
-     * This method is overloaded so that we can track the ready-state
+     * These two methods are overloaded so that we can track the ready-state
      * of each uploader in the component
      * @param {string} uploaderKey Name of the uploader's key to track
      */
@@ -151,6 +157,14 @@ const PRRegisterPieceForm = React.createClass({
         };
     },
 
+    handleOptionalFileValidationFailed(uploaderKey) {
+        return () => {
+            this.setState({
+                [uploaderKey]: true
+            });
+        };
+    },
+
     getSubmitButton() {
         const { digitalWorkKeyReady,
                 thumbnailKeyReady,
@@ -167,7 +181,7 @@ const PRRegisterPieceForm = React.createClass({
         } else {
             return (
                 <button
-                    type="submit"
+                    type="button"
                     className="btn btn-default btn-wide"
                     disabled={!(digitalWorkKeyReady && thumbnailKeyReady && proofOfPaymentReady && supportingMaterialsReady)}
                     onClick={this.submit}>
@@ -191,7 +205,7 @@ const PRRegisterPieceForm = React.createClass({
                         label={getLangText('Full name')}>
                         <input
                             type="text"
-                            placeholder="(e.g. Andy Warhol)"
+                            placeholder={getLangText('(e.g. Andy Warhol)')}
                             required/>
                     </Property>
                     <Property
@@ -199,7 +213,7 @@ const PRRegisterPieceForm = React.createClass({
                         label={getLangText('Title of the Work')}>
                         <input
                             type="text"
-                            placeholder="(e.g. 32 Campbell's Soup Cans)"
+                            placeholder={getLangText("(e.g. 32 Campbell's Soup Cans)")}
                             required/>
                     </Property>
                     <Property
@@ -207,7 +221,7 @@ const PRRegisterPieceForm = React.createClass({
                         label={getLangText('Year of creation')}>
                         <input
                             type="number"
-                            placeholder="(e.g. 1962)"
+                            placeholder={getLangText('(e.g. 1962)')}
                             min={1}
                             required/>
                     </Property>
@@ -224,25 +238,51 @@ const PRRegisterPieceForm = React.createClass({
                     className="ascribe-form-bordered"
                     ref="additionalDataForm">
                     <Property
-                        name='artist_bio'
+                        name='1-date_of_birth'
+                        label={getLangText('Date of Birth')}>
+                        <input
+                            type="number"
+                            placeholder={getLangText('(e.g. 1962)')}
+                            min={1900}
+                            required/>
+                    </Property>
+                    <Property
+                        name='2-artist_bio'
                         label={getLangText('Biography')}>
                         <InputTextAreaToggable
                             rows={1}
                             placeholder={getLangText('Enter your biography')}/>
                     </Property>
                     <Property
-                        name='exhibition'
+                        name='3-exhibition'
                         label={getLangText('Exhibition / Publication history (optional)')}>
                         <InputTextAreaToggable
                             rows={1}
                             placeholder={getLangText('Enter exhibitions and publication history')}/>
                     </Property>
                     <Property
-                        name='contact_information'
-                        label={getLangText('Contact information')}>
-                        <InputTextAreaToggable
-                            rows={1}
-                            placeholder={getLangText('Enter your contact information (phone/website)')}/>
+                        name='4-phone_number'
+                        label={getLangText('Phone Number')}>
+                        <input
+                            type="tel"
+                            placeholder={getLangText('Enter your phone number')}
+                            required/>
+                    </Property>
+                    <Property
+                        name='5-email'
+                        label={getLangText('Email Address')}>
+                        <input
+                            type="email"
+                            placeholder={getLangText('Enter your email')}
+                            required/>
+                    </Property>
+                    <Property
+                        name='6-website'
+                        label={getLangText('Website')}>
+                        <input
+                            type="url"
+                            placeholder={getLangText('Enter your website')}
+                            required/>
                     </Property>
                 </Form>
                 <Form
@@ -277,7 +317,7 @@ const PRRegisterPieceForm = React.createClass({
                     </Property>
                     <Property
                         name="thumbnailKey"
-                        label={getLangText('Featured Cover photo')}>
+                        label={getLangText('Featured Cover photo (max 5MB)')}>
                         <InputFineuploader
                             fileInputElement={UploadButton()}
                             createBlobRoutine={{
@@ -290,8 +330,8 @@ const PRRegisterPieceForm = React.createClass({
                                 fileClass: 'thumbnail'
                             }}
                             validation={{
-                                itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
-                                sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
+                                itemLimit: AppConstants.fineUploader.validation.workThumbnail.itemLimit,
+                                sizeLimit: AppConstants.fineUploader.validation.workThumbnail.sizeLimit,
                                 allowedExtensions: ['png', 'jpg', 'jpeg', 'gif']
                             }}
                             location={location}
@@ -308,10 +348,11 @@ const PRRegisterPieceForm = React.createClass({
                             fileInputElement={UploadButton()}
                             isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
                             setIsUploadReady={this.setIsUploadReady('supportingMaterialsReady')}
+                            onValidationFailed={this.handleOptionalFileValidationFailed('supportingMaterialsReady')}
                             createBlobRoutine={this.getCreateBlobRoutine()}
                             keyRoutine={{
                                 url: AppConstants.serverUrl + 's3/key/',
-                                fileClass: 'other_data'
+                                fileClass: 'otherdata'
                             }}
                             validation={{
                                 itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
@@ -333,7 +374,7 @@ const PRRegisterPieceForm = React.createClass({
                             createBlobRoutine={this.getCreateBlobRoutine()}
                             keyRoutine={{
                                 url: AppConstants.serverUrl + 's3/key/',
-                                fileClass: 'other_data'
+                                fileClass: 'otherdata'
                             }}
                             validation={{
                                 itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
@@ -372,4 +413,4 @@ const PRRegisterPieceForm = React.createClass({
     }
 });
 
-export default PRRegisterPieceForm;
\ No newline at end of file
+export default PRRegisterPieceForm;
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_hero.js b/js/components/whitelabel/prize/portfolioreview/components/pr_hero.js
index a0fa0811..15d32b84 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_hero.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_hero.js
@@ -1,42 +1,33 @@
 'use strict';
 
 import React from 'react';
-
-import UserStore from '../../../../../stores/user_store';
-import UserActions from '../../../../../actions/user_actions';
+import { Link } from 'react-router';
 
 import Glyphicon from 'react-bootstrap/lib/Glyphicon';
 
+import { getLangText } from '../../../../../utils/lang_utils';
+
 
 const PRHero = React.createClass({
-    getInitialState() {
-        return UserStore.getState();
-    },
-
-    componentDidMount() {
-        UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
-    },
-
-    componentWillUnmount() {
-        UserStore.unlisten(this.onChange);
-    },
-
-    onChange(state) {
-        this.setState(state);
+    propTypes: {
+        currentUser: React.PropTypes.shape({
+            email: React.PropTypes.object
+        })
     },
 
     render() {
-        const { currentUser } = this.state;
+        const { currentUser } = this.props;
 
         return (
             <div className="piece--hero">
-                <h2><Glyphicon glyph="ok" /> Congratulations {currentUser.email}!</h2>
-                <h1>You have successfully submitted to Portfolio Review 2016</h1>
-                <p>See below, your uploaded portfolio:</p>
+                <h2><Glyphicon glyph="ok" />
+                    &nbsp;{getLangText('Congratulations') + (currentUser.email ? ` ${currentUser.email}!` : '!')}
+                </h2>
+                <h1>{getLangText('You have successfully submitted to Portfolio Review 2016.')}</h1>
+                <p>Not you? <Link to="/logout">{getLangText('Change account.')}</Link></p>
             </div>
         );
     }
 });
 
-export default PRHero;
\ No newline at end of file
+export default PRHero;
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js b/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js
index cdada68b..9e86ecf9 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js
@@ -14,7 +14,7 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
 import UserStore from '../../../../../stores/user_store';
 import UserActions from '../../../../../actions/user_actions';
 
-import { mergeOptions } from '../../../../../utils/general_utils';
+import { mergeOptions, omitFromObject } from '../../../../../utils/general_utils';
 import { getLangText } from '../../../../../utils/lang_utils';
 
 
@@ -34,15 +34,18 @@ const PRLanding = React.createClass({
 
     componentDidMount() {
         const { location } = this.props;
+
         UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
         PrizeStore.listen(this.onChange);
+
+        UserActions.fetchCurrentUser();
         PrizeActions.fetchPrize();
 
-        if(location && location.query && location.query.redirect) {
-            let queryCopy = JSON.parse(JSON.stringify(location.query));
-            delete queryCopy.redirect;
-            window.setTimeout(() => this.history.replaceState(null, `/${location.query.redirect}`, queryCopy));
+        if (location && location.query && location.query.redirect) {
+            window.setTimeout(() => this.history.replace({
+                pathname: `/${location.query.redirect}`,
+                query: omitFromObject(location.query, ['redirect'])
+            }));
         }
     },
 
@@ -125,4 +128,4 @@ const PRLanding = React.createClass({
     }
 });
 
-export default PRLanding;
\ No newline at end of file
+export default PRLanding;
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_login_container.js b/js/components/whitelabel/prize/portfolioreview/components/pr_login_container.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js
index 0fbca419..99c9a401 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js
@@ -39,7 +39,7 @@ const PRRegisterPiece = React.createClass({
         if(currentUser && currentUser.email) {
             const submittedPieceId = getCookie(currentUser.email);
             if(submittedPieceId) {
-                this.history.pushState(null, `/pieces/${submittedPieceId}`);
+                this.history.push(`/pieces/${submittedPieceId}`);
             }
         }
     },
@@ -62,7 +62,7 @@ const PRRegisterPiece = React.createClass({
                 <Col xs={6}>
                     <div className="register-piece--info">
                         <h1>Portfolio Review</h1>
-                        <h2>{getLangText('Submission closing on %s', ' 22 Dec 2015')}</h2>
+                        <h2>{getLangText('Submission closing on %s', ' 27 Dec 2015')}</h2>
                         <p>For more information, visit:&nbsp;
                             <a href="http://www.portfolio-review.de/submission/" target="_blank">
                                 portfolio-review.de
@@ -84,4 +84,4 @@ const PRRegisterPiece = React.createClass({
     }
 });
 
-export default PRRegisterPiece;
\ No newline at end of file
+export default PRRegisterPiece;
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js b/js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js
new file mode 100644
index 00000000..f81c4539
--- /dev/null
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js
@@ -0,0 +1,26 @@
+'use strict';
+
+import history from '../../../../../../history';
+
+
+export function AuthPrizeRoleRedirect({ to, when }) {
+    if (when.constructor !== Array || !when.length) {
+        throw new Error('`when` of AuthPrizeRoleRedirect must be an array containing values');
+    }
+    if (!to || to.indexOf('/') === -1) {
+        throw new Error('`to` of AuthPrizeRoleRedirect must be defined and contain a valid route');
+    }
+
+    return function(currentUser, query) {
+        const exprToValidate = when
+            .map(role => currentUser[role])
+            .reduce((a, b) => a || b);
+
+        if (exprToValidate) {
+            window.setTimeout(() => history.replace({ query, pathname: to }));
+            return true;
+        } else {
+            return false;
+        }
+    };
+}
diff --git a/js/components/whitelabel/prize/portfolioreview/pr_app.js b/js/components/whitelabel/prize/portfolioreview/pr_app.js
index 7e66c43c..c672bdf5 100644
--- a/js/components/whitelabel/prize/portfolioreview/pr_app.js
+++ b/js/components/whitelabel/prize/portfolioreview/pr_app.js
@@ -4,6 +4,9 @@ import React from 'react';
 import GlobalNotification from '../../../global_notification';
 
 import Hero from './components/pr_hero';
+import Header from '../../../header';
+
+import EventActions from '../../../../actions/event_actions';
 
 import UserStore from '../../../../stores/user_store';
 import UserActions from '../../../../actions/user_actions';
@@ -29,6 +32,19 @@ let PRApp = React.createClass({
     componentDidMount() {
         UserStore.listen(this.onChange);
         UserActions.fetchCurrentUser();
+
+        if (this.state.currentUser && this.state.currentUser.email) {
+            EventActions.profileDidLoad.defer(this.state.currentUser);
+        }
+    },
+
+    componentWillUpdate(nextProps, nextState) {
+        const { currentUser: { email: curEmail } = {} } = this.state;
+        const { currentUser: { email: nextEmail } = {} } = nextState;
+
+        if (nextEmail && curEmail !== nextEmail) {
+            EventActions.profileDidLoad.defer(nextState.currentUser);
+        }
     },
 
     componentWillUnmount() {
@@ -40,19 +56,28 @@ let PRApp = React.createClass({
     },
 
     render() {
-        const { history, children } = this.props;
+        const { history, children, routes } = this.props;
         const { currentUser } = this.state;
+        let style = {};
         let subdomain = getSubdomain();
         let header;
 
+
         if (currentUser && currentUser.email && history.isActive(`/pieces/${getCookie(currentUser.email)}`)) {
-            header = <Hero />;
+            header = <Hero currentUser={currentUser} />;
+            style = { paddingTop: '0 !important' };
+        } else if(currentUser && (currentUser.is_admin || currentUser.is_jury || currentUser.is_judge)) {
+            header = <Header routes={routes} />;
+        } else {
+            style = { paddingTop: '0 !important' };
         }
 
         return (
             <div>
                 {header}
-                <div className={'container ascribe-prize-app client--' + subdomain}>
+                <div
+                    style={style}
+                    className={'container ascribe-prize-app client--' + subdomain}>
                     {children}
                     <GlobalNotification />
                     <div id="modal" className="container"></div>
diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js
index ec0269a5..5f80b30c 100644
--- a/js/components/whitelabel/prize/prize_routes.js
+++ b/js/components/whitelabel/prize/prize_routes.js
@@ -12,6 +12,8 @@ import SPPieceContainer from './simple_prize/components/ascribe_detail/prize_pie
 import SPSettingsContainer from './simple_prize/components/prize_settings_container';
 import SPApp from './simple_prize/prize_app';
 
+import SluicePieceContainer from './sluice/components/sluice_detail/sluice_piece_container';
+
 import PRApp from './portfolioreview/pr_app';
 import PRLanding from './portfolioreview/components/pr_landing';
 import PRRegisterPiece from './portfolioreview/components/pr_register_piece';
@@ -22,7 +24,8 @@ import PasswordResetContainer from '../../password_reset_container';
 import CoaVerifyContainer from '../../coa_verify_container';
 import ErrorNotFoundPage from '../../error_not_found_page';
 
-import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler';
+import { ProxyHandler, AuthRedirect } from '../../../components/ascribe_routes/proxy_handler';
+import { AuthPrizeRoleRedirect } from './portfolioreview/components/pr_routes/pr_proxy_handler';
 
 
 const ROUTES = {
@@ -31,29 +34,28 @@ const ROUTES = {
             <IndexRoute component={SPLanding} />
             <Route
                 path='login'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SPLoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)} />
             <Route
                 path='logout'
-                component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}/>
             <Route
                 path='signup'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SPSignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)} />
             <Route
                 path='password_reset'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SPSettingsContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}/>
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SPRegisterPiece)}
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPRegisterPiece)}
                 headerTitle='+ NEW WORK'/>
             <Route
                 path='collection'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SPPieceList)}
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
                 headerTitle='COLLECTION'/>
-
-            <Route path='pieces/:pieceId' component={SPPieceContainer} />
+            <Route path='pieces/:pieceId' component={SluicePieceContainer} />
             <Route path='editions/:editionId' component={EditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
             <Route path='*' component={ErrorNotFoundPage} />
@@ -61,24 +63,41 @@ const ROUTES = {
     ),
     portfolioreview: (
         <Route path='/' component={PRApp}>
-            <IndexRoute component={PRLanding} />
+        <IndexRoute component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)} />
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(PRRegisterPiece)}
-                headerTitle='+ NEW WORK'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}/>
+            <Route
+                path='collection'
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
+                headerTitle='SUBMISSIONS'/>
             <Route
                 path='login'
-                component={AuthProxyHandler({to: '/register_piece', when: 'loggedIn'})(SPLoginContainer)} />
+                component={ProxyHandler(
+                    AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
+                    AuthRedirect({to: '/register_piece', when: 'loggedIn'})
+                )(SPLoginContainer)} />
             <Route
                 path='logout'
-                component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={AuthProxyHandler({to: '/register_piece', when: 'loggedIn'})(SPSignupContainer)} />
+                component={ProxyHandler(
+                    AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
+                    AuthRedirect({to: '/register_piece', when: 'loggedIn'})
+                )(SPSignupContainer)} />
             <Route
                 path='password_reset'
-                component={AuthProxyHandler({to: '/register_piece', when: 'loggedIn'})(PasswordResetContainer)} />
+                component={ProxyHandler(
+                    AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
+                    AuthRedirect({to: '/register_piece', when: 'loggedIn'})
+                )(PasswordResetContainer)} />
+            <Route
+                path='settings'
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}/>
             <Route path='pieces/:pieceId' component={SPPieceContainer} />
+            <Route path='editions/:editionId' component={EditionContainer} />
+            <Route path='verify' component={CoaVerifyContainer} />
             <Route path='*' component={ErrorNotFoundPage} />
         </Route>
     )
diff --git a/js/components/whitelabel/prize/simple_prize/actions/prize_actions.js b/js/components/whitelabel/prize/simple_prize/actions/prize_actions.js
index dbca1b5d..242bb846 100644
--- a/js/components/whitelabel/prize/simple_prize/actions/prize_actions.js
+++ b/js/components/whitelabel/prize/simple_prize/actions/prize_actions.js
@@ -16,7 +16,7 @@ class PrizeActions {
             .fetch()
             .then((res) => {
                 this.actions.updatePrize({
-                    prize: res.prize
+                    prize: res
                 });
             })
             .catch((err) => {
diff --git a/js/components/whitelabel/prize/simple_prize/actions/prize_rating_actions.js b/js/components/whitelabel/prize/simple_prize/actions/prize_rating_actions.js
index 68b5334b..91852704 100644
--- a/js/components/whitelabel/prize/simple_prize/actions/prize_rating_actions.js
+++ b/js/components/whitelabel/prize/simple_prize/actions/prize_rating_actions.js
@@ -10,14 +10,15 @@ class PrizeRatingActions {
         this.generateActions(
             'updatePrizeRatings',
             'updatePrizeRatingAverage',
-            'updatePrizeRating'
+            'updatePrizeRating',
+            'resetPrizeRatings'
         );
     }
 
-    fetchAverage(pieceId) {
+    fetchAverage(pieceId, round) {
         return Q.Promise((resolve, reject) => {
             PrizeRatingFetcher
-                .fetchAverage(pieceId)
+                .fetchAverage(pieceId, round)
                 .then((res) => {
                     this.actions.updatePrizeRatingAverage(res.data);
                     resolve(res);
@@ -29,10 +30,10 @@ class PrizeRatingActions {
         });
     }
 
-    fetchOne(pieceId) {
+    fetchOne(pieceId, round) {
         return Q.Promise((resolve, reject) => {
             PrizeRatingFetcher
-                .fetchOne(pieceId)
+                .fetchOne(pieceId, round)
                 .then((res) => {
                     this.actions.updatePrizeRating(res.rating.rating);
                     resolve(res);
@@ -43,10 +44,10 @@ class PrizeRatingActions {
         });
     }
 
-    createRating(pieceId, rating) {
+    createRating(pieceId, rating, round) {
         return Q.Promise((resolve, reject) => {
             PrizeRatingFetcher
-                .rate(pieceId, rating)
+                .rate(pieceId, rating, round)
                 .then((res) => {
                     this.actions.updatePrizeRating(res.rating.rating);
                     resolve(res);
@@ -70,10 +71,6 @@ class PrizeRatingActions {
                 });
         });
     }
-
-    updateRating(rating) {
-        this.actions.updatePrizeRating(rating);
-    }
 }
 
-export default alt.createActions(PrizeRatingActions);
\ No newline at end of file
+export default alt.createActions(PrizeRatingActions);
diff --git a/js/components/whitelabel/prize/simple_prize/components/ascribe_accordion_list/accordion_list_item_prize.js b/js/components/whitelabel/prize/simple_prize/components/ascribe_accordion_list/accordion_list_item_prize.js
index 965b9012..e34f8347 100644
--- a/js/components/whitelabel/prize/simple_prize/components/ascribe_accordion_list/accordion_list_item_prize.js
+++ b/js/components/whitelabel/prize/simple_prize/components/ascribe_accordion_list/accordion_list_item_prize.js
@@ -58,8 +58,9 @@ let AccordionListItemPrize = React.createClass({
     },
 
     handleSubmitPrizeSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
@@ -138,8 +139,9 @@ let AccordionListItemPrize = React.createClass({
     },
 
     refreshPieceData() {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     onSelectChange(){
@@ -171,23 +173,25 @@ let AccordionListItemPrize = React.createClass({
     },
 
     render() {
+        const { children, className, content } = this.props;
+        const { currentUser } = this.state;
+
         // Only show the artist name if you are the participant or if you are a judge and the piece is shortlisted
-        let artistName = ((this.state.currentUser.is_jury && !this.state.currentUser.is_judge) ||
-                (this.state.currentUser.is_judge && !this.props.content.selected )) ?
-                <span className="glyphicon glyphicon-eye-close" aria-hidden="true"/> : this.props.content.artist_name;
+        let artistName = ((currentUser.is_jury && !currentUser.is_judge) || (currentUser.is_judge && !content.selected )) ?
+                <span className="glyphicon glyphicon-eye-close" aria-hidden="true"/> : content.artist_name;
         return (
             <div>
                 <AccordionListItemPiece
-                    className={this.props.className}
-                    piece={this.props.content}
+                    className={className}
+                    piece={content}
                     artistName={artistName}
                     subsubheading={
                         <div>
-                            <span>{Moment(this.props.content.date_created, 'YYYY-MM-DD').year()}</span>
+                            <span>{Moment(content.date_created, 'YYYY-MM-DD').year()}</span>
                         </div>}
                     buttons={this.getPrizeButtons()}
                     badge={this.getPrizeBadge()}>
-                    {this.props.children}
+                    {children}
                 </AccordionListItemPiece>
             </div>
         );
diff --git a/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js b/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js
index 982af7b0..5b6897d5 100644
--- a/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js
+++ b/js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js
@@ -6,15 +6,19 @@ import Moment from 'moment';
 
 import StarRating from 'react-star-rating';
 
-import PieceActions from '../../../../../../actions/piece_actions';
-import PieceStore from '../../../../../../stores/piece_store';
-
-import PieceListStore from '../../../../../../stores/piece_list_store';
-import PieceListActions from '../../../../../../actions/piece_list_actions';
+import ReactError from '../../../../../../mixins/react_error';
+import { ResourceNotFoundError } from '../../../../../../models/errors';
 
+import PrizeActions from '../../actions/prize_actions';
+import PrizeStore from '../../stores/prize_store';
 import PrizeRatingActions from '../../actions/prize_rating_actions';
 import PrizeRatingStore from '../../stores/prize_rating_store';
 
+import PieceActions from '../../../../../../actions/piece_actions';
+import PieceStore from '../../../../../../stores/piece_store';
+import PieceListStore from '../../../../../../stores/piece_list_store';
+import PieceListActions from '../../../../../../actions/piece_list_actions';
+
 import UserStore from '../../../../../../stores/user_store';
 import UserActions from '../../../../../../actions/user_actions';
 
@@ -31,9 +35,7 @@ import CollapsibleParagraph from '../../../../../../components/ascribe_collapsib
 import FurtherDetailsFileuploader from '../../../../../ascribe_detail/further_details_fileuploader';
 
 import InputCheckbox from '../../../../../ascribe_forms/input_checkbox';
-import LoanForm from '../../../../../ascribe_forms/form_loan';
 import ListRequestActions from '../../../../../ascribe_forms/list_form_request_actions';
-import ModalWrapper from '../../../../../ascribe_modal/modal_wrapper';
 
 import GlobalNotificationModel from '../../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
@@ -49,36 +51,44 @@ import { setDocumentTitle } from '../../../../../../utils/dom_utils';
 /**
  * This is the component that implements resource/data specific functionality
  */
-let PieceContainer = React.createClass({
+let PrizePieceContainer = React.createClass({
     propTypes: {
-        params: React.PropTypes.object
+        params: React.PropTypes.object,
+        selectedPrizeActionButton: React.PropTypes.func
     },
 
+    mixins: [ReactError],
+
     getInitialState() {
         return mergeOptions(
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             UserStore.getState()
         );
     },
 
     componentDidMount() {
         PieceStore.listen(this.onChange);
-        PieceActions.fetchOne(this.props.params.pieceId);
         UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
 
-        // Every time we enter the piece detail page, just reset the piece
-        // store as it will otherwise display wrong/old data once the user loads
-        // the piece detail a second time
-        PieceActions.updatePiece({});
+        UserActions.fetchCurrentUser();
+        this.loadPiece();
     },
 
     // This is done to update the container when the user clicks on the prev or next
-    // button to update the URL parameter (and therefore to switch pieces)
+    // button to update the URL parameter (and therefore to switch pieces) or
+    // when the user clicks on a notification while being in another piece view
     componentWillReceiveProps(nextProps) {
-        if(this.props.params.pieceId !== nextProps.params.pieceId) {
-            PieceActions.updatePiece({});
-            PieceActions.fetchOne(nextProps.params.pieceId);
+        if (this.props.params.pieceId !== nextProps.params.pieceId) {
+            PieceActions.flushPiece();
+            this.loadPiece(nextProps.params.pieceId);
+        }
+    },
+
+    componentDidUpdate() {
+        const { pieceMeta: { err: pieceErr } } = this.state;
+
+        if (pieceErr && pieceErr.status === 404) {
+            this.throws(new ResourceNotFoundError(getLangText("Oops, the piece you're looking for doesn't exist.")));
         }
     },
 
@@ -87,81 +97,82 @@ let PieceContainer = React.createClass({
         UserStore.unlisten(this.onChange);
     },
 
-
     onChange(state) {
         this.setState(state);
     },
 
-    loadPiece() {
-        PieceActions.fetchOne(this.props.params.pieceId);
-    },
-
     getActions() {
-        if (this.state.piece &&
-            this.state.piece.notifications &&
-            this.state.piece.notifications.length > 0) {
+        const { currentUser, piece } = this.state;
+
+        if (piece.notifications && piece.notifications.length > 0) {
             return (
                 <ListRequestActions
-                    pieceOrEditions={this.state.piece}
-                    currentUser={this.state.currentUser}
+                    pieceOrEditions={piece}
+                    currentUser={currentUser}
                     handleSuccess={this.loadPiece}
-                    notifications={this.state.piece.notifications}/>);
+                    notifications={piece.notifications} />);
         }
     },
 
+    loadPiece(pieceId = this.props.params.pieceId) {
+        PieceActions.fetchPiece(pieceId);
+    },
+
     render() {
-        if(this.state.piece && this.state.piece.id) {
+        const { selectedPrizeActionButton } = this.props;
+        const { currentUser, piece } = this.state;
+
+        if (piece.id) {
             /*
-            
+
                 This really needs a refactor!
 
                     - Tim
 
              */
             // Only show the artist name if you are the participant or if you are a judge and the piece is shortlisted
-            let artistName = ((this.state.currentUser.is_jury && !this.state.currentUser.is_judge) ||
-                (this.state.currentUser.is_judge && !this.state.piece.selected )) ?
-                null : this.state.piece.artist_name;
-            
-            // Only show the artist email if you are a judge and the piece is shortlisted
-            let artistEmail = (this.state.currentUser.is_judge && this.state.piece.selected ) ?
-                <DetailProperty label={getLangText('REGISTREE')} value={ this.state.piece.user_registered } /> : null;
-
-            if (artistName === null) {
-                setDocumentTitle(this.state.piece.title);
+            let artistName;
+            if ((currentUser.is_jury && !currentUser.is_judge) || (currentUser.is_judge && !piece.selected )) {
+                artistName = <span className="glyphicon glyphicon-eye-close" aria-hidden="true" />;
+                setDocumentTitle(piece.title);
             } else {
-                setDocumentTitle([artistName, this.state.piece.title].join(', '));
+                artistName = piece.artist_name;
+                setDocumentTitle(`${artistName}, ${piece.title}`);
             }
 
-            if (artistName === null) {
-                artistName = <span className="glyphicon glyphicon-eye-close" aria-hidden="true"/>;
-            }
+            // Only show the artist email if you are a judge and the piece is shortlisted
+            const artistEmail = currentUser.is_judge && piece.selected ? (
+                <DetailProperty
+                    label={getLangText('REGISTREE')}
+                    value={piece.user_registered} />
+            ) : null;
 
             return (
                 <Piece
-                    piece={this.state.piece}
-                    loadPiece={this.loadPiece}
+                    piece={piece}
+                    currentUser={currentUser}
                     header={
                         <div className="ascribe-detail-header">
                             <NavigationHeader
-                                piece={this.state.piece}
-                                currentUser={this.state.currentUser}/>
-                            
-                            <h1 className="ascribe-detail-title">{this.state.piece.title}</h1>
+                                piece={piece}
+                                currentUser={currentUser} />
+
+                            <h1 className="ascribe-detail-title">{piece.title}</h1>
                             <DetailProperty label={getLangText('BY')} value={artistName} />
-                            <DetailProperty label={getLangText('DATE')} value={Moment(this.state.piece.date_created, 'YYYY-MM-DD').year()} />
+                            <DetailProperty label={getLangText('DATE')} value={Moment(piece.date_created, 'YYYY-MM-DD').year()} />
                             {artistEmail}
                             {this.getActions()}
-                            <hr/>
+                            <hr />
                         </div>
-                        }
+                    }
                     subheader={
                         <PrizePieceRatings
                             loadPiece={this.loadPiece}
-                            piece={this.state.piece}
-                            currentUser={this.state.currentUser}/>
+                            piece={piece}
+                            currentUser={currentUser}
+                            selectedPrizeActionButton={selectedPrizeActionButton} />
                     }>
-                    <PrizePieceDetails piece={this.state.piece} />
+                    <PrizePieceDetails piece={piece} />
                 </Piece>
             );
         } else {
@@ -183,9 +194,8 @@ let NavigationHeader = React.createClass({
     render() {
         const { currentUser, piece } = this.props;
 
-        if (currentUser && currentUser.email && currentUser.is_judge && currentUser.is_jury &&
-            !currentUser.is_admin && piece && piece.navigation) {
-            let nav = piece.navigation;
+        if (currentUser.email && currentUser.is_judge && currentUser.is_jury && !currentUser.is_admin && piece.navigation) {
+            const nav = piece.navigation;
 
             return (
                 <div style={{marginBottom: '1em'}}>
@@ -205,8 +215,9 @@ let NavigationHeader = React.createClass({
                     <hr/>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     }
 });
 
@@ -215,31 +226,31 @@ let PrizePieceRatings = React.createClass({
     propTypes: {
         loadPiece: React.PropTypes.func,
         piece: React.PropTypes.object,
-        currentUser: React.PropTypes.object
+        currentUser: React.PropTypes.object,
+        selectedPrizeActionButton: React.PropTypes.func
     },
 
     getInitialState() {
         return mergeOptions(
             PieceListStore.getState(),
-            PrizeRatingStore.getState()
+            PrizeStore.getState(),
+            PrizeRatingStore.getInitialState()
         );
     },
 
     componentDidMount() {
-        PrizeRatingStore.listen(this.onChange);
-        PrizeRatingActions.fetchOne(this.props.piece.id);
-        PrizeRatingActions.fetchAverage(this.props.piece.id);
         PieceListStore.listen(this.onChange);
+        PrizeStore.listen(this.onChange);
+        PrizeRatingStore.listen(this.onChange);
+
+        PrizeActions.fetchPrize();
+        this.fetchPrizeRatings();
     },
 
     componentWillUnmount() {
-        // Every time we're leaving the piece detail page,
-        // just reset the piece that is saved in the piece store
-        // as it will otherwise display wrong/old data once the user loads
-        // the piece detail a second time
-        PrizeRatingActions.updateRating({});
-        PrizeRatingStore.unlisten(this.onChange);
         PieceListStore.unlisten(this.onChange);
+        PrizeStore.unlisten(this.onChange);
+        PrizeRatingStore.unlisten(this.onChange);
     },
 
     // The StarRating component does not have a property that lets us set
@@ -247,7 +258,12 @@ let PrizePieceRatings = React.createClass({
     // every mouseover be overridden, we need to set it ourselves initially to deal
     // with the problem.
     onChange(state) {
+        if (state.prize && state.prize.active_round != this.state.prize.active_round) {
+            this.fetchPrizeRatings(state);
+        }
+
         this.setState(state);
+
         if (this.refs.rating) {
             this.refs.rating.state.ratingCache = {
                 pos: this.refs.rating.state.pos,
@@ -258,74 +274,54 @@ let PrizePieceRatings = React.createClass({
         }
     },
 
+    fetchPrizeRatings(state = this.state) {
+        PrizeRatingActions.fetchOne(this.props.piece.id, state.prize.active_round);
+        PrizeRatingActions.fetchAverage(this.props.piece.id, state.prize.active_round);
+    },
+
     onRatingClick(event, args) {
         event.preventDefault();
-        PrizeRatingActions.createRating(this.props.piece.id, args.rating).then(
-            this.refreshPieceData()
-        );
+        PrizeRatingActions
+            .createRating(this.props.piece.id, args.rating, this.state.prize.active_round)
+            .then(this.refreshPieceData);
     },
 
-    handleLoanRequestSuccess(message){
-        let notification = new GlobalNotificationModel(message, 'success', 4000);
-        GlobalNotificationActions.appendGlobalNotification(notification);
-    },
+    getSelectedActionButton() {
+        const { currentUser, piece, selectedPrizeActionButton: SelectedPrizeActionButton } = this.props;
 
-    getLoanButton(){
-        let today = new Moment();
-        let endDate = new Moment();
-        endDate.add(6, 'months');
-        return (
-            <ModalWrapper
-                trigger={
-                    <button className='btn btn-default btn-sm'>
-                        {getLangText('SEND LOAN REQUEST')}
-                    </button>
-                }
-                handleSuccess={this.handleLoanRequestSuccess}
-                title='REQUEST LOAN'>
-                    <LoanForm
-                        loanHeading={null}
-                        message={getLangText('Congratulations,\nYou have been selected for the prize.\n' +
-                         'Please accept the loan request to proceed.')}
-                        id={{piece_id: this.props.piece.id}}
-                        url={ApiUrls.ownership_loans_pieces_request}
-                        email={this.props.currentUser.email}
-                        gallery={this.props.piece.prize.name}
-                        startDate={today}
-                        endDate={endDate}
-                        showPersonalMessage={true}
-                        showPassword={false}
-                        handleSuccess={this.handleLoanSuccess} />
-            </ModalWrapper>);
-    },
-
-    handleShortlistSuccess(message){
-        let notification = new GlobalNotificationModel(message, 'success', 2000);
-        GlobalNotificationActions.appendGlobalNotification(notification);
+        if (piece.selected && SelectedPrizeActionButton) {
+            return (
+                <span className="pull-right">
+                    <SelectedPrizeActionButton
+                        piece={piece}
+                        currentUser={currentUser} />
+                </span>
+            );
+        }
     },
 
     refreshPieceData() {
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
         this.props.loadPiece();
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     onSelectChange() {
-        PrizeRatingActions.toggleShortlist(this.props.piece.id)
-        .then(
-            (res) => {
+        PrizeRatingActions
+            .toggleShortlist(this.props.piece.id)
+            .then((res) => {
                 this.refreshPieceData();
-                return res;
-            })
-        .then(
-            (res) => {
-                this.handleShortlistSuccess(res.notification);
-            }
-        );
+
+                if (res && res.notification) {
+                    const notification = new GlobalNotificationModel(res.notification, 'success', 2000);
+                    GlobalNotificationActions.appendGlobalNotification(notification);
+                }
+            });
     },
 
-    render(){
-        if (this.props.piece && this.props.currentUser && this.props.currentUser.is_judge && this.state.average) {
+    render() {
+        if (this.props.piece.id && this.props.currentUser.is_judge && this.state.average) {
             // Judge sees shortlisting, average and per-jury notes
             return (
                 <div>
@@ -342,9 +338,7 @@ let PrizePieceRatings = React.createClass({
                                     </span>
                                 </InputCheckbox>
                             </span>
-                            <span className="pull-right">
-                                {this.props.piece.selected ? this.getLoanButton() : null}
-                            </span>
+                            {this.getSelectedActionButton()}
                         </div>
                         <hr />
                     </CollapsibleParagraph>
@@ -359,17 +353,23 @@ let PrizePieceRatings = React.createClass({
                                 size='md'
                                 step={0.5}
                                 rating={this.state.average}
-                                ratingAmount={5}/>
+                                ratingAmount={5} />
                         </div>
                         <hr />
                         {this.state.ratings.map((item, i) => {
-                            let note = item.note ?
+                            let note = item.note ? (
                                 <div className="rating-note">
                                     note: {item.note}
-                                </div> : null;
+                                </div>
+                            ) : null;
+
                             return (
-                                <div className="rating-list">
-                                    <div id="list-rating" className="row no-margin">
+                                <div
+                                    key={item.user}
+                                    className="rating-list">
+                                    <div
+                                        id="list-rating"
+                                        className="row no-margin">
                                     <span className="pull-right">
                                         <StarRating
                                             ref={'rating' + i}
@@ -378,7 +378,7 @@ let PrizePieceRatings = React.createClass({
                                             size='sm'
                                             step={0.5}
                                             rating={item.rating}
-                                            ratingAmount={5}/>
+                                            ratingAmount={5} />
                                     </span>
                                     <span> {item.user}</span>
                                         {note}
@@ -389,8 +389,7 @@ let PrizePieceRatings = React.createClass({
                         <hr />
                     </CollapsibleParagraph>
                 </div>);
-        }
-        else if (this.props.currentUser && this.props.currentUser.is_jury) {
+        } else if (this.props.currentUser.is_jury) {
             // Jury can set rating and note
             return (
                 <CollapsibleParagraph
@@ -408,17 +407,18 @@ let PrizePieceRatings = React.createClass({
                             ratingAmount={5} />
                         </div>
                     <Note
-                        id={() => {return {'piece_id': this.props.piece.id}; }}
+                        id={() => ({ 'piece_id': this.props.piece.id })}
                         label={getLangText('Jury note')}
-                        defaultValue={this.props.piece && this.props.piece.note_from_user ? this.props.piece.note_from_user.note : null}
+                        defaultValue={this.props.piece.note_from_user || null}
                         placeholder={getLangText('Enter your comments ...')}
                         editable={true}
                         successMessage={getLangText('Jury note saved')}
                         url={ApiUrls.notes}
-                        currentUser={this.props.currentUser}/>
+                        currentUser={this.props.currentUser} />
                 </CollapsibleParagraph>);
+        } else {
+            return null;
         }
-        return null;
     }
 });
 
@@ -429,46 +429,52 @@ let PrizePieceDetails = React.createClass({
     },
 
     render() {
-        if (this.props.piece
-            && this.props.piece.prize
-            && this.props.piece.prize.name
-            && Object.keys(this.props.piece.extra_data).length !== 0){
+        const { piece } = this.props;
+
+        if (piece.prize && piece.prize.name && Object.keys(piece.extra_data).length) {
             return (
                 <CollapsibleParagraph
                     title={getLangText('Prize Details')}
                     defaultExpanded={true}>
-                    <Form ref='form'>
-                        {Object.keys(this.props.piece.extra_data).map((data) => {
-                            let label = data.replace('_', ' ');
-                            const value = this.props.piece.extra_data[data] || 'N/A';
+                    <Form>
+                        {Object
+                            .keys(piece.extra_data)
+                            .sort()
+                            .map((data) => {
+                                // Remove leading number (for sorting), if any, and underscores with spaces
+                                const label = data.replace(/^\d-/, '').replace(/_/g, ' ');
+                                const value = piece.extra_data[data] || 'N/A';
 
-                            return (
-                                <Property
-                                    name={data}
-                                    label={label}
-                                    editable={false}
-                                    overrideForm={true}>
-                                    <InputTextAreaToggable
-                                        rows={1}
-                                        defaultValue={value}/>
-                                </Property>
-                            );
-                        })}
+                                return (
+                                    <Property
+                                        key={label}
+                                        name={data}
+                                        label={label}
+                                        editable={false}
+                                        overrideForm={true}>
+                                        <InputTextAreaToggable
+                                            rows={1}
+                                            defaultValue={value} />
+                                    </Property>
+                                );
+                            })
+                        }
                         <FurtherDetailsFileuploader
                             submitFile={() => {}}
                             setIsUploadReady={() => {}}
                             isReadyForFormSubmission={() => {}}
                             editable={false}
                             overrideForm={true}
-                            pieceId={this.props.piece.id}
-                            otherData={this.props.piece.other_data}
+                            pieceId={piece.id}
+                            otherData={piece.other_data}
                             multiple={true} />
                     </Form>
                 </CollapsibleParagraph>
             );
+        } else {
+            return null;
         }
-        return null;
     }
 });
 
-export default PieceContainer;
+export default PrizePieceContainer;
diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_landing.js b/js/components/whitelabel/prize/simple_prize/components/prize_landing.js
index e26a05b5..82a21eab 100644
--- a/js/components/whitelabel/prize/simple_prize/components/prize_landing.js
+++ b/js/components/whitelabel/prize/simple_prize/components/prize_landing.js
@@ -46,7 +46,7 @@ let Landing = React.createClass({
         // if user is already logged in, redirect him to piece list
         if(this.state.currentUser && this.state.currentUser.email) {
             // FIXME: hack to redirect out of the dispatch cycle
-            window.setTimeout(() => this.history.replaceState(null, '/collection'), 0);
+            window.setTimeout(() => this.history.replace('/collection'), 0);
         }
     },
 
diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js b/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js
index 8e602012..23cdbb23 100644
--- a/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js
+++ b/js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js
@@ -48,7 +48,8 @@ let PrizePieceList = React.createClass({
     },
 
     getButtonSubmit() {
-        if (this.state.prize && this.state.prize.active && !this.state.currentUser.is_jury){
+        const { currentUser, prize } = this.state;
+        if (prize && prize.active && !currentUser.is_jury && !currentUser.is_admin && !currentUser.is_judge) {
             return (
                 <LinkContainer to="/register_piece">
                     <Button>
@@ -57,9 +58,6 @@ let PrizePieceList = React.createClass({
                 </LinkContainer>
             );
         }
-        else if (this.state.prize && this.state.currentUser.is_judge){
-            return null;
-        }
         return null;
     },
 
diff --git a/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js b/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js
index 145a9d24..b91f9789 100644
--- a/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js
+++ b/js/components/whitelabel/prize/simple_prize/components/prize_settings_container.js
@@ -135,14 +135,15 @@ let PrizeJurySettings = React.createClass({
 
     handleCreateSuccess(response) {
         PrizeJuryActions.fetchJury();
-        let notification = new GlobalNotificationModel(response.notification, 'success', 5000);
-        GlobalNotificationActions.appendGlobalNotification(notification);
+        this.displayNotification(response);
         this.refs.form.refs.email.refs.input.getDOMNode().value = null;
     },
 
     handleActivate(event) {
         let email = event.target.getAttribute('data-id');
-        PrizeJuryActions.activateJury(email).then((response) => {
+        PrizeJuryActions
+            .activateJury(email)
+            .then((response) => {
                 PrizeJuryActions.fetchJury();
                 this.displayNotification(response);
             });
diff --git a/js/components/whitelabel/prize/simple_prize/fetchers/prize_rating_fetcher.js b/js/components/whitelabel/prize/simple_prize/fetchers/prize_rating_fetcher.js
index 38d0576e..e2f20d93 100644
--- a/js/components/whitelabel/prize/simple_prize/fetchers/prize_rating_fetcher.js
+++ b/js/components/whitelabel/prize/simple_prize/fetchers/prize_rating_fetcher.js
@@ -4,16 +4,41 @@ import requests from '../../../../../utils/requests';
 
 
 let PrizeRatingFetcher = {
-    fetchAverage(pieceId) {
-        return requests.get('rating_average', {'piece_id': pieceId});
+    fetchAverage(pieceId, round) {
+        const params = {
+            'piece_id': pieceId
+        };
+
+        if (typeof round === 'number') {
+            params['prize_round'] = round;
+        }
+
+        return requests.get('rating_average', params);
     },
 
-    fetchOne(pieceId) {
-        return requests.get('rating', {'piece_id': pieceId});
+    fetchOne(pieceId, round) {
+        const params = {
+            'piece_id': pieceId
+        };
+
+        if (typeof round === 'number') {
+            params['prize_round'] = round;
+        }
+
+        return requests.get('rating', params);
     },
 
-    rate(pieceId, rating) {
-        return requests.post('ratings', {body: {'piece_id': pieceId, 'note': rating}});
+    rate(pieceId, rating, round) {
+        const body = {
+            'piece_id': pieceId,
+            'note': rating
+        };
+
+        if (typeof round === 'number') {
+            body['prize_round'] = round;
+        }
+
+        return requests.post('ratings', { body });
     },
 
     select(pieceId) {
diff --git a/js/components/whitelabel/prize/simple_prize/prize_app.js b/js/components/whitelabel/prize/simple_prize/prize_app.js
index d95d7772..d5b55d5f 100644
--- a/js/components/whitelabel/prize/simple_prize/prize_app.js
+++ b/js/components/whitelabel/prize/simple_prize/prize_app.js
@@ -32,7 +32,7 @@ let PrizeApp = React.createClass({
         if (!path || history.isActive('/login') || history.isActive('/signup')) {
             header = <Hero />;
         } else {
-            header = <Header showAddWork={false} routes={routes}/>;
+            header = <Header routes={routes}/>;
         }
 
         return (
diff --git a/js/components/whitelabel/prize/simple_prize/stores/prize_rating_store.js b/js/components/whitelabel/prize/simple_prize/stores/prize_rating_store.js
index 9f1552bb..d3544f71 100644
--- a/js/components/whitelabel/prize/simple_prize/stores/prize_rating_store.js
+++ b/js/components/whitelabel/prize/simple_prize/stores/prize_rating_store.js
@@ -6,10 +6,24 @@ import PrizeRatingActions from '../actions/prize_rating_actions';
 
 class PrizeRatingStore {
     constructor() {
+        this.getInitialState();
+
+        this.bindActions(PrizeRatingActions);
+        this.exportPublicMethods({
+            getInitialState: this.getInitialState.bind(this)
+        });
+    }
+
+    getInitialState() {
         this.ratings = [];
         this.currentRating = null;
         this.average = null;
-        this.bindActions(PrizeRatingActions);
+
+        return {
+            ratings: this.ratings,
+            currentRating: this.currentRating,
+            average: this.average
+        };
     }
 
     onUpdatePrizeRatings(ratings) {
@@ -24,6 +38,10 @@ class PrizeRatingStore {
         this.average = data.average;
         this.ratings = data.ratings;
     }
+
+    onResetPrizeRatings() {
+        this.getInitialState();
+    }
 }
 
-export default alt.createStore(PrizeRatingStore, 'PrizeRatingStore');
\ No newline at end of file
+export default alt.createStore(PrizeRatingStore, 'PrizeRatingStore');
diff --git a/js/components/whitelabel/prize/simple_prize/stores/prize_store.js b/js/components/whitelabel/prize/simple_prize/stores/prize_store.js
index 8d9c4bbe..d54ab549 100644
--- a/js/components/whitelabel/prize/simple_prize/stores/prize_store.js
+++ b/js/components/whitelabel/prize/simple_prize/stores/prize_store.js
@@ -6,7 +6,7 @@ import PrizeActions from '../actions/prize_actions';
 
 class PrizeStore {
     constructor() {
-        this.prize = [];
+        this.prize = {};
         this.bindActions(PrizeActions);
     }
 
@@ -15,4 +15,4 @@ class PrizeStore {
     }
 }
 
-export default alt.createStore(PrizeStore, 'PrizeStore');
\ No newline at end of file
+export default alt.createStore(PrizeStore, 'PrizeStore');
diff --git a/js/components/whitelabel/prize/sluice/components/sluice_buttons/sluice_selected_prize_action_button.js b/js/components/whitelabel/prize/sluice/components/sluice_buttons/sluice_selected_prize_action_button.js
new file mode 100644
index 00000000..7778a8de
--- /dev/null
+++ b/js/components/whitelabel/prize/sluice/components/sluice_buttons/sluice_selected_prize_action_button.js
@@ -0,0 +1,70 @@
+'use strict'
+
+import React from 'react';
+import Moment from 'moment';
+
+import ModalWrapper from '../../../../../ascribe_modal/modal_wrapper';
+
+import LoanForm from '../../../../../ascribe_forms/form_loan';
+
+import GlobalNotificationModel from '../../../../../../models/global_notification_model';
+import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
+
+import ApiUrls from '../../../../../../constants/api_urls';
+
+import { getLangText } from '../../../../../../utils/lang_utils';
+
+const SluiceSelectedPrizeActionButton = React.createClass({
+    propTypes: {
+        piece: React.PropTypes.object,
+        currentUser: React.PropTypes.object,
+        startLoanDate: React.PropTypes.object,
+        endLoanDate: React.PropTypes.object,
+        className: React.PropTypes.string,
+        handleSuccess: React.PropTypes.func
+    },
+
+    handleSuccess(res) {
+        const notification = new GlobalNotificationModel(res && res.notification || getLangText('You have successfully requested the loan, pending their confirmation.'), 'success', 4000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+
+        if (typeof this.props.handleSuccess === 'function') {
+            this.props.handleSuccess(res);
+        }
+    },
+
+    render() {
+        const { currentUser, piece } = this.props;
+
+        // Can't use default props since those are only created once
+        const startLoanDate = this.props.startLoanDate || new Moment();
+        const endLoanDate = this.props.endLoanDate || (new Moment()).add(6, 'months');
+
+        return (
+            <ModalWrapper
+                trigger={
+                    <button className='btn btn-default btn-sm'>
+                        {getLangText('SEND LOAN REQUEST')}
+                    </button>
+                }
+                handleSuccess={this.handleSuccess}
+                title={getLangText('REQUEST LOAN')}>
+                    <LoanForm
+                        loanHeading={null}
+                        message={getLangText('Congratulations,\nYou have been selected for the prize.\n' +
+                                             'Please accept the loan request to proceed.')}
+                        id={{ piece_id: piece.id }}
+                        url={ApiUrls.ownership_loans_pieces_request}
+                        email={currentUser.email}
+                        gallery={piece.prize.name}
+                        startDate={startLoanDate}
+                        endDate={endLoanDate}
+                        showPersonalMessage={true}
+                        showPassword={false} />
+            </ModalWrapper>
+        );
+    }
+});
+
+export default SluiceSelectedPrizeActionButton;
+
diff --git a/js/components/whitelabel/prize/sluice/components/sluice_detail/sluice_piece_container.js b/js/components/whitelabel/prize/sluice/components/sluice_detail/sluice_piece_container.js
new file mode 100644
index 00000000..2d9debca
--- /dev/null
+++ b/js/components/whitelabel/prize/sluice/components/sluice_detail/sluice_piece_container.js
@@ -0,0 +1,23 @@
+'use strict';
+
+import React from 'react';
+
+import SluiceSelectedPrizeActionButton from '../sluice_buttons/sluice_selected_prize_action_button';
+
+import PrizePieceContainer from '../../../simple_prize/components/ascribe_detail/prize_piece_container';
+
+const SluicePieceContainer = React.createClass({
+    propTypes: {
+        params: React.PropTypes.object
+    },
+
+    render() {
+        return (
+            <PrizePieceContainer
+                {...this.props}
+                selectedPrizeActionButton={SluiceSelectedPrizeActionButton} />
+        );
+    }
+});
+
+export default SluicePieceContainer;
diff --git a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
index 302495a0..f6b2d50c 100644
--- a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
+++ b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
@@ -47,7 +47,7 @@ let Vivi23Landing = React.createClass({
                             </div>
                         </div>
                         <div className="row vivi23-landing--content">
-                            <div className="col-sm-6">
+                            <div className="col-xs-6">
                                 <p>
                                     {getLangText('Existing ascribe user?')}
                                 </p>
@@ -57,7 +57,7 @@ let Vivi23Landing = React.createClass({
                                     </Button>
                                 </LinkContainer>
                             </div>
-                            <div className="col-sm-6">
+                            <div className="col-xs-6">
                                 <p>
                                     {getLangText('Do you need an account?')}
                                 </p>
diff --git a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js
index 26a186ca..ed8da83b 100644
--- a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js
+++ b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js
@@ -25,63 +25,72 @@ let WalletPieceContainer = React.createClass({
         currentUser: React.PropTypes.object.isRequired,
         loadPiece: React.PropTypes.func.isRequired,
         handleDeleteSuccess: React.PropTypes.func.isRequired,
-        submitButtonType: React.PropTypes.func.isRequired
+        submitButtonType: React.PropTypes.func.isRequired,
+        children: React.PropTypes.oneOfType([
+            React.PropTypes.object,
+            React.PropTypes.array
+        ])
     },
 
-    
     render() {
-        if(this.props.piece && this.props.piece.id) {
+        const {
+            children,
+            currentUser,
+            handleDeleteSuccess,
+            loadPiece,
+            piece,
+            submitButtonType } = this.props;
+
+        if (piece && piece.id) {
             return (
                 <Piece
-                    piece={this.props.piece}
-                    loadPiece={this.props.loadPiece}
+                    piece={piece}
+                    currentUser={currentUser}
                     header={
                         <div className="ascribe-detail-header">
                             <hr style={{marginTop: 0}}/>
-                            <h1 className="ascribe-detail-title">{this.props.piece.title}</h1>
-                            <DetailProperty label="BY" value={this.props.piece.artist_name} />
-                            <DetailProperty label="DATE" value={Moment(this.props.piece.date_created, 'YYYY-MM-DD').year()} />
+                            <h1 className="ascribe-detail-title">{piece.title}</h1>
+                            <DetailProperty label="BY" value={piece.artist_name} />
+                            <DetailProperty label="DATE" value={Moment(piece.date_created, 'YYYY-MM-DD').year()} />
                             <hr/>
                         </div>
                     }
                     subheader={
-                    <div className="ascribe-detail-header">
-                        <DetailProperty label={getLangText('REGISTREE')} value={ this.props.piece.user_registered } />
-                        <DetailProperty label={getLangText('ID')} value={ this.props.piece.bitcoin_id } ellipsis={true} />
-                        <hr/>
-                    </div>
-                }>
+                        <div className="ascribe-detail-header">
+                            <DetailProperty label={getLangText('REGISTREE')} value={ piece.user_registered } />
+                            <DetailProperty label={getLangText('ID')} value={ piece.bitcoin_id } ellipsis={true} />
+                            <hr/>
+                        </div>
+                    }>
                     <WalletActionPanel
-                        piece={this.props.piece}
-                        currentUser={this.props.currentUser}
-                        loadPiece={this.props.loadPiece}
-                        handleDeleteSuccess={this.props.handleDeleteSuccess}
-                        submitButtonType={this.props.submitButtonType}/>
+                        piece={piece}
+                        currentUser={currentUser}
+                        loadPiece={loadPiece}
+                        handleDeleteSuccess={handleDeleteSuccess}
+                        submitButtonType={submitButtonType}/>
                     <CollapsibleParagraph
                         title={getLangText('Loan History')}
-                        show={this.props.piece.loan_history && this.props.piece.loan_history.length > 0}>
+                        show={piece.loan_history && piece.loan_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.piece.loan_history}/>
+                            history={piece.loan_history}/>
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Notes')}
-                        show={!!(this.props.currentUser.username || this.props.piece.public_note)}>
+                        show={!!(currentUser.username || piece.public_note)}>
                         <Note
-                            id={() => {return {'id': this.props.piece.id}; }}
+                            id={() => {return {'id': piece.id}; }}
                             label={getLangText('Personal note (private)')}
-                            defaultValue={this.props.piece.private_note || null}
+                            defaultValue={piece.private_note || null}
                             placeholder={getLangText('Enter your comments ...')}
                             editable={true}
                             successMessage={getLangText('Private note saved')}
                             url={ApiUrls.note_private_piece}
-                            currentUser={this.props.currentUser}/>
+                            currentUser={currentUser}/>
                     </CollapsibleParagraph>
-
-                    {this.props.children}
+                    {children}
                 </Piece>
             );
-        }
-        else {
+        } else {
             return (
                 <div className="fullpage-spinner">
                     <AscribeSpinner color='dark-blue' size='lg' />
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js
index 9d88408f..ebdef4f4 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js
@@ -52,8 +52,9 @@ let CylandAccordionListItem = React.createClass({
     },
 
     handleSubmitSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js
index d211d3e8..5fc3901f 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js
@@ -40,7 +40,7 @@ let CylandPieceContainer = React.createClass({
 
     getInitialState() {
         return mergeOptions(
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             UserStore.getState(),
             PieceListStore.getState()
         );
@@ -51,14 +51,17 @@ let CylandPieceContainer = React.createClass({
         UserStore.listen(this.onChange);
         PieceListStore.listen(this.onChange);
 
-        // Every time we enter the piece detail page, just reset the piece
-        // store as it will otherwise display wrong/old data once the user loads
-        // the piece detail a second time
-        PieceActions.updatePiece({});
-
         this.loadPiece();
     },
 
+    // We need this for when the user clicks on a notification while being in another piece view
+    componentWillReceiveProps(nextProps) {
+        if (this.props.params.pieceId !== nextProps.params.pieceId) {
+            PieceActions.flushPiece();
+            this.loadPiece();
+        }
+    },
+
     componentWillUnmount() {
         PieceStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
@@ -70,31 +73,34 @@ let CylandPieceContainer = React.createClass({
     },
 
     loadPiece() {
-        PieceActions.fetchOne(this.props.params.pieceId);
+        PieceActions.fetchPiece(this.props.params.pieceId);
     },
 
     handleDeleteSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         // since we're deleting a piece, we just need to close
         // all editions dialogs and not reload them
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     render() {
-        if(this.state.piece && this.state.piece.id) {
-            setDocumentTitle([this.state.piece.artist_name, this.state.piece.title].join(', '));
+        const { piece } = this.state;
+
+        if (piece.id) {
+            setDocumentTitle(`${piece.artist_name}, ${piece.title}`);
 
             return (
                 <WalletPieceContainer
-                    piece={this.state.piece}
+                    piece={piece}
                     currentUser={this.state.currentUser}
                     loadPiece={this.loadPiece}
                     handleDeleteSuccess={this.handleDeleteSuccess}
@@ -103,14 +109,13 @@ let CylandPieceContainer = React.createClass({
                         title={getLangText('Further Details')}
                         defaultExpanded={true}>
                         <CylandAdditionalDataForm
-                            piece={this.state.piece}
-                            disabled={!this.state.piece.acl.acl_edit}
+                            piece={piece}
+                            disabled={!piece.acl.acl_edit}
                             isInline={true} />
                     </CollapsibleParagraph>
                 </WalletPieceContainer>
             );
-        }
-        else {
+        } else {
             return (
                 <div className="fullpage-spinner">
                     <AscribeSpinner color='dark-blue' size='lg' />
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js b/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
index 93cc515a..6e643134 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
@@ -23,9 +23,10 @@ import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_
 
 let CylandAdditionalDataForm = React.createClass({
     propTypes: {
-        handleSuccess: React.PropTypes.func,
         piece: React.PropTypes.object.isRequired,
+
         disabled: React.PropTypes.bool,
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool
     },
 
@@ -42,13 +43,13 @@ let CylandAdditionalDataForm = React.createClass({
     },
 
     handleSuccess() {
-        let notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     getFormData() {
-        let extradata = {};
-        let formRefs = this.refs.form.refs;
+        const extradata = {};
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -71,10 +72,13 @@ let CylandAdditionalDataForm = React.createClass({
     },
 
     render() {
-        let { piece, isInline, disabled, handleSuccess, location } = this.props;
-        let buttons, spinner, heading;
+        const { disabled, handleSuccess, isInline, piece } = this.props;
 
-        if(!isInline) {
+        let buttons;
+        let spinner;
+        let heading;
+
+        if (!isInline) {
             buttons = (
                 <button
                     type="submit"
@@ -87,7 +91,7 @@ let CylandAdditionalDataForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        <AscribeSpinner color='dark-blue' size='md'/>
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -101,13 +105,15 @@ let CylandAdditionalDataForm = React.createClass({
             );
         }
 
-        if(piece && piece.id) {
+        if (piece.id) {
+            const { extra_data: extraData = {} } = piece;
+
             return (
                 <Form
                     disabled={disabled}
                     className="ascribe-form-bordered"
                     ref='form'
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: piece.id })}
                     handleSuccess={handleSuccess || this.handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
@@ -116,65 +122,65 @@ let CylandAdditionalDataForm = React.createClass({
                     <Property
                         name='artist_bio'
                         label={getLangText('Artist Biography')}
-                        expanded={!disabled || !!piece.extra_data.artist_bio}>
+                        expanded={!disabled || !!extraData.artist_bio}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.artist_bio}
-                            placeholder={getLangText('Enter the artist\'s biography...')}/>
+                            defaultValue={extraData.artist_bio}
+                            placeholder={getLangText('Enter the artist\'s biography...')} />
                     </Property>
                     <Property
                         name='artist_contact_information'
                         label={getLangText('Artist Contact Information')}
-                        expanded={!disabled || !!piece.extra_data.artist_contact_information}>
+                        expanded={!disabled || !!extraData.artist_contact_information}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.artist_contact_information}
-                            placeholder={getLangText('Enter the artist\'s contact information...')}/>
+                            defaultValue={extraData.artist_contact_information}
+                            placeholder={getLangText('Enter the artist\'s contact information...')} />
                     </Property>
                     <Property
                         name='conceptual_overview'
                         label={getLangText('Conceptual Overview')}
-                        expanded={!disabled || !!piece.extra_data.conceptual_overview}>
+                        expanded={!disabled || !!extraData.conceptual_overview}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.conceptual_overview}
-                            placeholder={getLangText('Enter a conceptual overview...')}/>
+                            defaultValue={extraData.conceptual_overview}
+                            placeholder={getLangText('Enter a conceptual overview...')} />
                     </Property>
                     <Property
                         name='medium'
                         label={getLangText('Medium (technical specifications)')}
-                        expanded={!disabled || !!piece.extra_data.medium}>
+                        expanded={!disabled || !!extraData.medium}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.medium}
-                            placeholder={getLangText('Enter the medium (and other technical specifications)...')}/>
+                            defaultValue={extraData.medium}
+                            placeholder={getLangText('Enter the medium (and other technical specifications)...')} />
                     </Property>
                     <Property
                         name='size_duration'
                         label={getLangText('Size / Duration')}
-                        expanded={!disabled || !!piece.extra_data.size_duration}>
+                        expanded={!disabled || !!extraData.size_duration}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.size_duration}
-                            placeholder={getLangText('Enter the size / duration...')}/>
+                            defaultValue={extraData.size_duration}
+                            placeholder={getLangText('Enter the size / duration...')} />
                     </Property>
                     <Property
                         name='display_instructions'
                         label={getLangText('Display instructions')}
-                        expanded={!disabled || !!piece.extra_data.display_instructions}>
+                        expanded={!disabled || !!extraData.display_instructions}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.display_instructions}
-                            placeholder={getLangText('Enter the display instructions...')}/>
+                            defaultValue={extraData.display_instructions}
+                            placeholder={getLangText('Enter the display instructions...')} />
                     </Property>
                     <Property
                         name='additional_details'
                         label={getLangText('Additional details')}
-                        expanded={!disabled || !!piece.extra_data.additional_details}>
+                        expanded={!disabled || !!extraData.additional_details}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.additional_details}
-                            placeholder={getLangText('Enter additional details...')}/>
+                            defaultValue={extraData.additional_details}
+                            placeholder={getLangText('Enter additional details...')} />
                     </Property>
                     <FurtherDetailsFileuploader
                         label={getLangText('Additional files (e.g. still images, pdf)')}
@@ -189,7 +195,7 @@ let CylandAdditionalDataForm = React.createClass({
         } else {
             return (
                 <div className="ascribe-loading-position">
-                    <AscribeSpinner color='dark-blue' size='md'/>
+                    <AscribeSpinner color='dark-blue' size='md' />
                 </div>
             );
         }
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js
index dc6420f4..0a8dadd1 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js
@@ -49,7 +49,7 @@ let CylandLanding = React.createClass({
         // if user is already logged in, redirect him to piece list
         if(this.state.currentUser && this.state.currentUser.email) {
             // FIXME: hack to redirect out of the dispatch cycle
-            window.setTimeout(() => this.history.replaceState(null, '/collection'), 0);
+            window.setTimeout(() => this.history.replace('/collection'), 0);
         }
     },
 
@@ -70,7 +70,7 @@ let CylandLanding = React.createClass({
                             </div>
                         </div>
                         <div className="row" style={{border: '1px solid #CCC', borderTop: 'none', padding: '2em'}}>
-                            <div className="col-sm-6">
+                            <div className="col-xs-6">
                                 <p>
                                     {getLangText('Existing ascribe user?')}
                                 </p>
@@ -80,7 +80,7 @@ let CylandLanding = React.createClass({
                                     </Button>
                                 </LinkContainer>
                             </div>
-                            <div className="col-sm-6">
+                            <div className="col-xs-6">
                                 <p>
                                     {getLangText('Do you need an account?')}
                                 </p>
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 42b7c1ad..88088e9d 100644
--- a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
+++ b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js
@@ -8,6 +8,8 @@ import Moment from 'moment';
 import Col from 'react-bootstrap/lib/Col';
 import Row from 'react-bootstrap/lib/Row';
 
+import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
+
 import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
 
 import WhitelabelActions from '../../../../../actions/whitelabel_actions';
@@ -50,7 +52,7 @@ let CylandRegisterPiece = React.createClass({
         return mergeOptions(
             UserStore.getState(),
             PieceListStore.getState(),
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             WhitelabelStore.getState(),
             {
                 step: 0
@@ -65,7 +67,7 @@ let CylandRegisterPiece = React.createClass({
         UserActions.fetchCurrentUser();
         WhitelabelActions.fetchWhitelabel();
 
-        let queryParams = this.props.location.query;
+        const queryParams = this.props.location.query;
 
         // Since every step of this register process is atomic,
         // we may need to enter the process at step 1 or 2.
@@ -74,8 +76,8 @@ let CylandRegisterPiece = React.createClass({
         //
         // We're using 'in' here as we want to know if 'piece_id' is present in the url,
         // we don't care about the value.
-        if(queryParams && 'piece_id' in queryParams) {
-            PieceActions.fetchOne(queryParams.piece_id);
+        if ('piece_id' in queryParams) {
+            PieceActions.fetchPiece(queryParams.piece_id);
         }
     },
 
@@ -90,79 +92,78 @@ let CylandRegisterPiece = React.createClass({
         this.setState(state);
     },
 
-    handleRegisterSuccess(response){
-
+    handleRegisterSuccess(response) {
         this.refreshPieceList();
 
-        // also start loading the piece for the next step
-        if(response && response.piece) {
-            PieceActions.updatePiece({});
+        // Also load the newly registered piece for the next step
+        if (response && response.piece) {
             PieceActions.updatePiece(response.piece);
         }
 
-        this.incrementStep();
-
-        this.refs.slidesContainer.nextSlide({ piece_id: response.piece.id });
+        this.nextSlide({ piece_id: response.piece.id });
     },
 
     handleAdditionalDataSuccess() {
-
         // We need to refetch the piece again after submitting the additional data
-        // since we want it's otherData to be displayed when the user choses to click
+        // since we want its otherData to be displayed when the user choses to click
         // on the browsers back button.
-        PieceActions.fetchOne(this.state.piece.id);
+        PieceActions.fetchPiece(this.state.piece.id);
 
         this.refreshPieceList();
 
-        this.incrementStep();
-
-        this.refs.slidesContainer.nextSlide();
+        this.nextSlide();
     },
 
     handleLoanSuccess(response) {
-        let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
+        const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
         this.refreshPieceList();
 
-        PieceActions.fetchOne(this.state.piece.id);
-
-        this.history.pushState(null, `/pieces/${this.state.piece.id}`);
+        this.history.push(`/pieces/${this.state.piece.id}`);
     },
 
-    // We need to increase the step to lock the forms that are already filled out
-    incrementStep() {
-        // also increase step
-        let newStep = this.state.step + 1;
+    nextSlide(queryParams) {
+        // We need to increase the step to lock the forms that are already filled out
         this.setState({
-            step: newStep
+            step: this.state.step + 1
         });
+
+        this.refs.slidesContainer.nextSlide(queryParams);
     },
 
     refreshPieceList() {
-        PieceListActions.fetchPieceList(
-            this.state.page,
-            this.state.pageSize,
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
-    },
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
 
-    changeSlide() {
-        // only transition to the login store, if user is not logged in
-        // ergo the currentUser object is not properly defined
-        if(this.state.currentUser && !this.state.currentUser.email) {
-            this.onLoggedOut();
-        }
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     render() {
+        const { location } = this.props;
+        const { currentUser, piece, step, whitelabel } = this.state;
 
-        let today = new Moment();
-        let datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain = new Moment();
-        datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain.add(1000, 'years');
+        const today = new Moment();
+        const datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain = new Moment().add(1000, 'years');
+
+        const loanHeading = getLangText('Loan to Cyland archive');
+        const loanButtons = (
+            <div>
+                <div className='col-xs-6 ascribe-form-btn-container-left'>
+                    <button className='btn btn-default btn-wide'>
+                        {getLangText('Loan to archive')}
+                    </button>
+                </div>
+                <div className='col-xs-6 ascribe-form-btn-container-right'>
+                    <LinkContainer to='/collection'>
+                        <button
+                            type='button'
+                            className='btn btn-secondary btn-wide'>
+                            {getLangText('Loan later')}
+                        </button>
+                    </LinkContainer>
+                </div>
+            </div>
+        );
 
         setDocumentTitle(getLangText('Register a new piece'));
 
@@ -174,18 +175,18 @@ let CylandRegisterPiece = React.createClass({
                     pending: 'glyphicon glyphicon-chevron-right',
                     completed: 'glyphicon glyphicon-lock'
                 }}
-                location={this.props.location}>
+                location={location}>
                 <div data-slide-title={getLangText('Register work')}>
                     <Row className="no-margin">
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <RegisterPieceForm
-                                disabled={this.state.step > 0}
+                                disabled={step > 0}
                                 enableLocalHashing={false}
                                 headerMessage={getLangText('Submit to Cyland Archive')}
                                 submitMessage={getLangText('Submit')}
                                 isFineUploaderActive={true}
                                 handleSuccess={this.handleRegisterSuccess}
-                                location={this.props.location}/>
+                                location={location} />
                         </Col>
                     </Row>
                 </div>
@@ -193,9 +194,9 @@ let CylandRegisterPiece = React.createClass({
                     <Row className="no-margin">
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <CylandAdditionalDataForm
-                                disabled={this.state.step > 1}
+                                disabled={step > 1}
                                 handleSuccess={this.handleAdditionalDataSuccess}
-                                piece={this.state.piece} />
+                                piece={piece} />
                         </Col>
                     </Row>
                 </div>
@@ -204,15 +205,16 @@ let CylandRegisterPiece = React.createClass({
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <LoanForm
                                 loanHeading={getLangText('Loan to Cyland archive')}
+                                buttons={loanButtons}
                                 message={getAclFormMessage({
                                     aclName: 'acl_loan',
-                                    entities: this.state.piece,
+                                    entities: piece,
                                     isPiece: true,
-                                    senderName: this.state.currentUser.username
+                                    senderName: currentUser.username
                                 })}
-                                id={{piece_id: this.state.piece.id}}
+                                id={{piece_id: piece.id}}
                                 url={ApiUrls.ownership_loans_pieces}
-                                email={this.state.whitelabel.user}
+                                email={whitelabel.user}
                                 gallery="Cyland Archive"
                                 startDate={today}
                                 endDate={datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain}
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js
index ce8cebf5..46763e2b 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js
@@ -53,8 +53,9 @@ let IkonotvAccordionListItem = React.createClass({
     },
 
     handleSubmitSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js
index d3479562..4f6a88a1 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js
@@ -106,28 +106,33 @@ let IkonotvContractNotifications = React.createClass({
 
     handleConfirm() {
         let contractAgreement = this.state.contractAgreementListNotifications[0].contract_agreement;
-        OwnershipFetcher.confirmContractAgreement(contractAgreement).then(
-            () => this.handleConfirmSuccess()
-        );
+        OwnershipFetcher
+            .confirmContractAgreement(contractAgreement)
+            .then(this.handleConfirmSuccess);
     },
 
     handleConfirmSuccess() {
         let notification = new GlobalNotificationModel(getLangText('You have accepted the conditions'), 'success', 5000);
         GlobalNotificationActions.appendGlobalNotification(notification);
-        this.history.pushState(null, '/collection');
+
+        // Flush contract notifications and refetch
+        NotificationActions.flushContractAgreementListNotifications();
+        NotificationActions.fetchContractAgreementListNotifications();
+
+        this.history.push('/collection');
     },
 
     handleDeny() {
         let contractAgreement = this.state.contractAgreementListNotifications[0].contract_agreement;
-        OwnershipFetcher.denyContractAgreement(contractAgreement).then(
-            () => this.handleDenySuccess()
-        );
+        OwnershipFetcher
+            .denyContractAgreement(contractAgreement)
+            .then(this.handleDenySuccess);
     },
 
     handleDenySuccess() {
         let notification = new GlobalNotificationModel(getLangText('You have denied the conditions'), 'success', 5000);
         GlobalNotificationActions.appendGlobalNotification(notification);
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     getCopyrightAssociationForm(){
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js
index df58b7c7..a1280cc8 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js
@@ -41,7 +41,7 @@ let IkonotvPieceContainer = React.createClass({
 
     getInitialState() {
         return mergeOptions(
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             UserStore.getState(),
             PieceListStore.getState()
         );
@@ -52,19 +52,14 @@ let IkonotvPieceContainer = React.createClass({
         UserStore.listen(this.onChange);
         PieceListStore.listen(this.onChange);
 
-        // Every time we enter the piece detail page, just reset the piece
-        // store as it will otherwise display wrong/old data once the user loads
-        // the piece detail a second time
-        PieceActions.updatePiece({});
-
         this.loadPiece();
     },
 
-     // We need this for when the user clicks on a notification while being in another piece view
+    // We need this for when the user clicks on a notification while being in another piece view
     componentWillReceiveProps(nextProps) {
-        if(this.props.params.pieceId !== nextProps.params.pieceId) {
-            PieceActions.updatePiece({});
-            PieceActions.fetchOne(nextProps.params.pieceId);
+        if (this.props.params.pieceId !== nextProps.params.pieceId) {
+            PieceActions.flushPiece();
+            this.loadPiece();
         }
     },
 
@@ -79,25 +74,28 @@ let IkonotvPieceContainer = React.createClass({
     },
 
     loadPiece() {
-        PieceActions.fetchOne(this.props.params.pieceId);
+        PieceActions.fetchPiece(this.props.params.pieceId);
     },
 
     handleDeleteSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         // since we're deleting a piece, we just need to close
         // all editions dialogs and not reload them
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     render() {
+        const { piece } = this.state;
+
         let furtherDetails = (
             <CollapsibleParagraph
                 title={getLangText('Further Details')}
@@ -106,28 +104,29 @@ let IkonotvPieceContainer = React.createClass({
             </CollapsibleParagraph>
         );
 
-        if(this.state.piece.extra_data && Object.keys(this.state.piece.extra_data).length > 0 && this.state.piece.acl) {
+        if (piece.extra_data && Object.keys(piece.extra_data).length && piece.acl) {
             furtherDetails = (
                 <CollapsibleParagraph
                     title={getLangText('Further Details')}
                     defaultExpanded={true}>
                     <IkonotvArtistDetailsForm
-                        piece={this.state.piece}
+                        piece={piece}
                         isInline={true}
-                        disabled={!this.state.piece.acl.acl_edit} />
+                        disabled={!piece.acl.acl_edit} />
                     <IkonotvArtworkDetailsForm
-                        piece={this.state.piece}
+                        piece={piece}
                         isInline={true}
-                        disabled={!this.state.piece.acl.acl_edit} />
+                        disabled={!piece.acl.acl_edit} />
                 </CollapsibleParagraph>
             );
         }
 
-        if(this.state.piece && this.state.piece.id) {
-            setDocumentTitle([this.state.piece.artist_name, this.state.piece.title].join(', '));
+        if (piece.id) {
+            setDocumentTitle(`${piece.artist_name}, ${piece.title}`);
+
             return (
                 <WalletPieceContainer
-                    piece={this.state.piece}
+                    piece={piece}
                     currentUser={this.state.currentUser}
                     loadPiece={this.loadPiece}
                     handleDeleteSuccess={this.handleDeleteSuccess}
@@ -135,8 +134,7 @@ let IkonotvPieceContainer = React.createClass({
                     {furtherDetails}
                 </WalletPieceContainer>
             );
-        }
-        else {
+        } else {
             return (
                 <div className="fullpage-spinner">
                     <AscribeSpinner color='dark-blue' size='lg' />
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
index 7aec7ff4..598f5bd0 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
@@ -20,11 +20,10 @@ import { getLangText } from '../../../../../../utils/lang_utils';
 
 let IkonotvArtistDetailsForm = React.createClass({
     propTypes: {
-        handleSuccess: React.PropTypes.func,
         piece: React.PropTypes.object.isRequired,
 
         disabled: React.PropTypes.bool,
-
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool
     },
 
@@ -35,8 +34,8 @@ let IkonotvArtistDetailsForm = React.createClass({
     },
 
     getFormData() {
-        let extradata = {};
-        let formRefs = this.refs.form.refs;
+        const extradata = {};
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -53,21 +52,23 @@ let IkonotvArtistDetailsForm = React.createClass({
     },
 
     handleSuccess() {
-        let notification = new GlobalNotificationModel('Artist details successfully updated', 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Artist details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     render() {
-        let buttons, spinner, heading;
-        let { isInline, handleSuccess } = this.props;
-        
+        const { disabled, isInline, handleSuccess, piece } = this.props;
 
-        if(!isInline) {
+        let buttons;
+        let spinner;
+        let heading;
+
+        if (!isInline) {
             buttons = (
                 <button
                     type="submit"
                     className="btn btn-default btn-wide"
-                    disabled={this.props.disabled}>
+                    disabled={disabled}>
                     {getLangText('Proceed to loan')}
                 </button>
             );
@@ -75,7 +76,7 @@ let IkonotvArtistDetailsForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        <AscribeSpinner color='dark-blue' size='md'/>
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -89,13 +90,15 @@ let IkonotvArtistDetailsForm = React.createClass({
             );
         }
 
-        if(this.props.piece && this.props.piece.id && this.props.piece.extra_data) {
+        if (piece.id) {
+            const { extra_data: extraData = {} } = piece;
+
             return (
                 <Form
-                    disabled={this.props.disabled}
+                    disabled={disabled}
                     className="ascribe-form-bordered"
                     ref='form'
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: this.props.piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: piece.id })}
                     handleSuccess={handleSuccess || this.handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
@@ -104,39 +107,38 @@ let IkonotvArtistDetailsForm = React.createClass({
                     <Property
                         name='artist_website'
                         label={getLangText('Artist Website')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.artist_website}>
+                        expanded={!disabled || !!extraData.artist_website}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.artist_website}
-                            placeholder={getLangText('The artist\'s website if present...')}/>
+                            defaultValue={extraData.artist_website}
+                            placeholder={getLangText('The artist\'s website if present...')} />
                     </Property>
                     <Property
                         name='gallery_website'
                         label={getLangText('Website of related Gallery, Museum, etc.')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.gallery_website}>
+                        expanded={!disabled || !!extraData.gallery_website}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.gallery_website}
-                            placeholder={getLangText('The website of any related Gallery or Museum')}/>
+                            defaultValue={extraData.gallery_website}
+                            placeholder={getLangText('The website of any related Gallery or Museum')} />
                     </Property>
                     <Property
                         name='additional_websites'
                         label={getLangText('Additional Websites/Publications/Museums/Galleries')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.additional_websites}>
+                        expanded={!disabled || !!extraData.additional_websites}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.additional_websites}
-                            placeholder={getLangText('Enter additional Websites/Publications if any')}/>
+                            defaultValue={extraData.additional_websites}
+                            placeholder={getLangText('Enter additional Websites/Publications if any')} />
                     </Property>
                     <Property
                         name='conceptual_overview'
                         label={getLangText('Short text about the Artist')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.conceptual_overview}>
+                        expanded={!disabled || !!extraData.conceptual_overview}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.conceptual_overview}
-                            placeholder={getLangText('Enter a short bio about the Artist')}
-                            />
+                            defaultValue={extraData.conceptual_overview}
+                            placeholder={getLangText('Enter a short bio about the Artist')} />
                     </Property>
                 </Form>
             );
@@ -150,4 +152,4 @@ let IkonotvArtistDetailsForm = React.createClass({
     }
 });
 
-export default IkonotvArtistDetailsForm;
\ No newline at end of file
+export default IkonotvArtistDetailsForm;
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
index 97b1adc7..28c67c94 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
@@ -20,11 +20,10 @@ import { getLangText } from '../../../../../../utils/lang_utils';
 
 let IkonotvArtworkDetailsForm = React.createClass({
     propTypes: {
-        handleSuccess: React.PropTypes.func,
         piece: React.PropTypes.object.isRequired,
 
         disabled: React.PropTypes.bool,
-
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool
     },
 
@@ -35,8 +34,8 @@ let IkonotvArtworkDetailsForm = React.createClass({
     },
 
     getFormData() {
-        let extradata = {};
-        let formRefs = this.refs.form.refs;
+        const extradata = {};
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -53,20 +52,23 @@ let IkonotvArtworkDetailsForm = React.createClass({
     },
 
     handleSuccess() {
-        let notification = new GlobalNotificationModel('Artwork details successfully updated', 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Artwork details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     render() {
-        let buttons, spinner, heading;
-        let { isInline, handleSuccess } = this.props;
+        const { disabled, isInline, handleSuccess, piece } = this.props;
 
-        if(!isInline) {
+        let buttons;
+        let spinner;
+        let heading;
+
+        if (!isInline) {
             buttons = (
                 <button
                     type="submit"
                     className="btn btn-default btn-wide"
-                    disabled={this.props.disabled}>
+                    disabled={disabled}>
                     {getLangText('Proceed to artist details')}
                 </button>
             );
@@ -74,7 +76,7 @@ let IkonotvArtworkDetailsForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        <AscribeSpinner color='dark-blue' size='md'/>
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -88,13 +90,15 @@ let IkonotvArtworkDetailsForm = React.createClass({
             );
         }
 
-        if(this.props.piece && this.props.piece.id && this.props.piece.extra_data) {
+        if (piece.id && piece.extra_data) {
+            const { extra_data: extraData = {} } = piece;
+
             return (
                 <Form
-                    disabled={this.props.disabled}
+                    disabled={disabled}
                     className="ascribe-form-bordered"
                     ref='form'
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: this.props.piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: piece.id })}
                     handleSuccess={handleSuccess || this.handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
@@ -103,56 +107,56 @@ let IkonotvArtworkDetailsForm = React.createClass({
                     <Property
                         name='medium'
                         label={getLangText('Medium')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.medium}>
+                        expanded={!disabled || !!extraData.medium}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.medium}
-                            placeholder={getLangText('The medium of the file (i.e. photo, video, other, ...)')}/>
+                            defaultValue={extraData.medium}
+                            placeholder={getLangText('The medium of the file (i.e. photo, video, other, ...)')} />
                     </Property>
                     <Property
                         name='size_duration'
                         label={getLangText('Size/Duration')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.size_duration}>
+                        expanded={!disabled || !!extraData.size_duration}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.size_duration}
-                            placeholder={getLangText('Size in centimeters. Duration in minutes.')}/>
+                            defaultValue={extraData.size_duration}
+                            placeholder={getLangText('Size in centimeters. Duration in minutes.')} />
                     </Property>
                     <Property
                         name='copyright'
                         label={getLangText('Copyright')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.copyright}>
+                        expanded={!disabled || !!extraData.copyright}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.copyright}
-                            placeholder={getLangText('Which copyright is attached to this work?')}/>
+                            defaultValue={extraData.copyright}
+                            placeholder={getLangText('Which copyright is attached to this work?')} />
                     </Property>
                     <Property
                         name='courtesy_of'
                         label={getLangText('Courtesy of')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.courtesy_of}>
+                        expanded={!disabled || !!extraData.courtesy_of}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.courtesy_of}
-                            placeholder={getLangText('The current owner of the artwork')}/>
+                            defaultValue={extraData.courtesy_of}
+                            placeholder={getLangText('The current owner of the artwork')} />
                     </Property>
                     <Property
                         name='copyright_of_photography'
                         label={getLangText('Copyright of Photography')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.copyright_of_photography}>
+                        expanded={!disabled || !!extraData.copyright_of_photography}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.copyright_of_photography}
-                            placeholder={getLangText('Who should be attributed for the photography?')}/>
+                            defaultValue={extraData.copyright_of_photography}
+                            placeholder={getLangText('Who should be attributed for the photography?')} />
                     </Property>
                     <Property
                         name='additional_details'
                         label={getLangText('Additional Details about the artwork')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.additional_details}>
+                        expanded={!disabled || !!extraData.additional_details}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.additional_details}
-                            placeholder={getLangText('Insert artwork overview')}/>
+                            defaultValue={extraData.additional_details}
+                            placeholder={getLangText('Insert artwork overview')} />
                     </Property>
                 </Form>
             );
@@ -166,4 +170,4 @@ let IkonotvArtworkDetailsForm = React.createClass({
     }
 });
 
-export default IkonotvArtworkDetailsForm;
\ No newline at end of file
+export default IkonotvArtworkDetailsForm;
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 0b51bdbd..5b489d09 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js
@@ -1,15 +1,18 @@
 'use strict';
 
 import React from 'react';
+
 import PieceList from '../../../../piece_list';
 
 import UserActions from '../../../../../actions/user_actions';
 import UserStore from '../../../../../stores/user_store';
+import NotificationStore from '../../../../../stores/notification_store';
 
 import IkonotvAccordionListItem from './ikonotv_accordion_list/ikonotv_accordion_list_item';
 
-import { getLangText } from '../../../../../utils/lang_utils';
 import { setDocumentTitle } from '../../../../../utils/dom_utils';
+import { mergeOptions } from '../../../../../utils/general_utils';
+import { getLangText } from '../../../../../utils/lang_utils';
 
 
 let IkonotvPieceList = React.createClass({
@@ -18,20 +21,33 @@ let IkonotvPieceList = React.createClass({
     },
 
     getInitialState() {
-        return UserStore.getState();
+        return mergeOptions(
+            NotificationStore.getState(),
+            UserStore.getState()
+        );
     },
 
     componentDidMount() {
+        NotificationStore.listen(this.onChange);
         UserStore.listen(this.onChange);
+
         UserActions.fetchCurrentUser();
     },
 
     componentWillUnmount() {
+        NotificationStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
     },
 
     onChange(state) {
         this.setState(state);
+
+    },
+
+    redirectIfNoContractNotifications() {
+        const { contractAgreementListNotifications } = this.state;
+
+        return contractAgreementListNotifications && !contractAgreementListNotifications.length;
     },
 
     render() {
@@ -41,6 +57,7 @@ let IkonotvPieceList = React.createClass({
             <div>
                 <PieceList
                     redirectTo="/register_piece?slide_num=0"
+                    shouldRedirect={this.redirectIfNoContractNotifications}
                     accordionListItemType={IkonotvAccordionListItem}
                     filterParams={[{
                         label: getLangText('Show works I have'),
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 c40d779d..d2e3ac99 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
@@ -49,7 +49,7 @@ let IkonotvRegisterPiece = React.createClass({
         return mergeOptions(
             UserStore.getState(),
             PieceListStore.getState(),
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             WhitelabelStore.getState(),
             {
                 step: 0,
@@ -65,11 +65,7 @@ let IkonotvRegisterPiece = React.createClass({
         UserActions.fetchCurrentUser();
         WhitelabelActions.fetchWhitelabel();
 
-        // Before we load the new piece, we reset the piece store to delete old data that we do
-        // not want to display to the user.
-        PieceActions.updatePiece({});
-
-        let queryParams = this.props.location.query;
+        const queryParams = this.props.location.query;
 
         // Since every step of this register process is atomic,
         // we may need to enter the process at step 1 or 2.
@@ -78,8 +74,8 @@ let IkonotvRegisterPiece = React.createClass({
         //
         // We're using 'in' here as we want to know if 'piece_id' is present in the url,
         // we don't care about the value.
-        if (queryParams && 'piece_id' in queryParams) {
-            PieceActions.fetchOne(queryParams.piece_id);
+        if ('piece_id' in queryParams) {
+            PieceActions.fetchPiece(queryParams.piece_id);
         }
     },
 
@@ -95,72 +91,62 @@ let IkonotvRegisterPiece = React.createClass({
     },
 
 
-    handleRegisterSuccess(response){
+    handleRegisterSuccess(response) {
         this.refreshPieceList();
 
-        // also start loading the piece for the next step
-        if(response && response.piece) {
+        // Also load the newly registered piece for the next step
+        if (response && response.piece) {
             PieceActions.updatePiece(response.piece);
         }
+
         if (!this.canSubmit()) {
-            this.history.pushState(null, '/collection');
-        }
-        else {
-            this.incrementStep();
-            this.refs.slidesContainer.nextSlide();
+            this.history.push('/collection');
+        } else {
+            this.nextSlide({ piece_id: response.piece.id });
         }
     },
 
     handleAdditionalDataSuccess() {
-
         // We need to refetch the piece again after submitting the additional data
         // since we want it's otherData to be displayed when the user choses to click
         // on the browsers back button.
-        PieceActions.fetchOne(this.state.piece.id);
+        PieceActions.fetchPiece(this.state.piece.id);
 
         this.refreshPieceList();
 
-        this.incrementStep();
-
-        this.refs.slidesContainer.nextSlide();
+        this.nextSlide();
     },
 
     handleLoanSuccess(response) {
         this.setState({ pageExitWarning: null });
 
-        let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
+        const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
         this.refreshPieceList();
 
-        PieceActions.fetchOne(this.state.piece.id);
-        this.history.pushState(null, `/pieces/${this.state.piece.id}`);
+        this.history.push(`/pieces/${this.state.piece.id}`);
     },
 
-    // We need to increase the step to lock the forms that are already filled out
-    incrementStep() {
-        // also increase step
-        let newStep = this.state.step + 1;
+    nextSlide(queryParams) {
+        // We need to increase the step to lock the forms that are already filled out
         this.setState({
-            step: newStep
+            step: this.state.step + 1
         });
+
+        this.refs.slidesContainer.nextSlide(queryParams);
     },
 
     refreshPieceList() {
-        PieceListActions.fetchPieceList(
-            this.state.page,
-            this.state.pageSize,
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     canSubmit() {
         let currentUser = this.state.currentUser;
         let whitelabel = this.state.whitelabel;
-        return currentUser && currentUser.acl && currentUser.acl.acl_wallet_submit && whitelabel && whitelabel.user;
+        return currentUser.acl && currentUser.acl.acl_wallet_submit && whitelabel.user;
     },
 
     getSlideArtistDetails() {
@@ -171,13 +157,14 @@ let IkonotvRegisterPiece = React.createClass({
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <IkonotvArtistDetailsForm
                                 handleSuccess={this.handleAdditionalDataSuccess}
-                                piece={this.state.piece}/>
+                                piece={this.state.piece} />
                         </Col>
                     </Row>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     },
 
     getSlideArtworkDetails() {
@@ -188,21 +175,21 @@ let IkonotvRegisterPiece = React.createClass({
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <IkonotvArtworkDetailsForm
                                 handleSuccess={this.handleAdditionalDataSuccess}
-                                piece={this.state.piece}/>
+                                piece={this.state.piece} />
                         </Col>
                     </Row>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     },
 
     getSlideLoan() {
         if (this.canSubmit()) {
             const { piece, whitelabel } = this.state;
-            let today = new Moment();
-            let endDate = new Moment();
-            endDate.add(2, 'years');
+            const today = new Moment();
+            const endDate = new Moment().add(2, 'years');
 
             return (
                 <div data-slide-title={getLangText('Loan')}>
@@ -225,8 +212,9 @@ let IkonotvRegisterPiece = React.createClass({
                     </Row>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     },
 
     render() {
@@ -252,7 +240,7 @@ let IkonotvRegisterPiece = React.createClass({
                                 submitMessage={getLangText('Register')}
                                 isFineUploaderActive={true}
                                 handleSuccess={this.handleRegisterSuccess}
-                                location={this.props.location}/>
+                                location={this.props.location} />
                         </Col>
                     </Row>
                 </div>
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js b/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js
index e68b1781..23289276 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js
+++ b/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js
@@ -53,7 +53,7 @@ let LumenusLanding = React.createClass({
                             </div>
                         </div>
                         <div className="row" style={{border: '1px solid #CCC', borderTop: 'none', padding: '2em'}}>
-                            <div className="col-sm-6">
+                            <div className="col-xs-6">
                                 <p>
                                     {getLangText('Existing ascribe user?')}
                                 </p>
@@ -63,7 +63,7 @@ let LumenusLanding = React.createClass({
                                     </Button>
                                 </LinkContainer>
                             </div>
-                            <div className="col-sm-6">
+                            <div className="col-xs-6">
                                 <p>
                                     {getLangText('Do you need an account?')}
                                 </p>
diff --git a/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js b/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js
index 1dcdd4e5..4d4f8918 100644
--- a/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js
+++ b/js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js
@@ -30,7 +30,7 @@ let MarketAclButtonList = React.createClass({
 
     componentDidMount() {
         UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
+        UserActions.fetchCurrentUser.defer();
     },
 
     componentWillUnmount() {
diff --git a/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
index d8ef4c41..c839dea0 100644
--- a/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
+++ b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
@@ -3,6 +3,11 @@
 import React from 'react';
 import classNames from 'classnames';
 
+import EditionActions from '../../../../../../actions/edition_actions';
+
+import WhitelabelActions from '../../../../../../actions/whitelabel_actions';
+import WhitelabelStore from '../../../../../../stores/whitelabel_store';
+
 import MarketAdditionalDataForm from '../market_forms/market_additional_data_form';
 
 import AclFormFactory from '../../../../../ascribe_forms/acl_form_factory';
@@ -11,10 +16,7 @@ import ConsignForm from '../../../../../ascribe_forms/form_consign';
 import ModalWrapper from '../../../../../ascribe_modal/modal_wrapper';
 
 import AclProxy from '../../../../../acl_proxy';
-
-import PieceActions from '../../../../../../actions/piece_actions';
-import WhitelabelActions from '../../../../../../actions/whitelabel_actions';
-import WhitelabelStore from '../../../../../../stores/whitelabel_store';
+import AscribeSpinner from '../../../../../ascribe_spinner';
 
 import ApiUrls from '../../../../../../constants/api_urls';
 
@@ -26,8 +28,9 @@ let MarketSubmitButton = React.createClass({
         availableAcls: React.PropTypes.object.isRequired,
         currentUser: React.PropTypes.object,
         editions: React.PropTypes.array.isRequired,
-        handleSuccess: React.PropTypes.func.isRequired,
+
         className: React.PropTypes.string,
+        handleSuccess: React.PropTypes.func
     },
 
     getInitialState() {
@@ -50,22 +53,21 @@ let MarketSubmitButton = React.createClass({
 
     canEditionBeSubmitted(edition) {
         if (edition && edition.extra_data && edition.other_data) {
-            const { extra_data, other_data } = edition;
+            const {
+                extra_data: {
+                    artist_bio: artistBio,
+                    display_instructions: displayInstructions,
+                    technology_details: technologyDetails,
+                    work_description: workDescription
+                },
+                other_data: otherData } = edition;
 
-            if (extra_data.artist_bio && extra_data.work_description &&
-                extra_data.technology_details && extra_data.display_instructions &&
-                other_data.length > 0) {
-                return true;
-            }
+            return artistBio && displayInstructions && technologyDetails && workDescription && otherData.length;
         }
 
         return false;
     },
 
-    getFormDataId() {
-        return getAclFormDataId(false, this.props.editions);
-    },
-
     getAggregateEditionDetails() {
         const { editions } = this.props;
 
@@ -82,13 +84,20 @@ let MarketSubmitButton = React.createClass({
         });
     },
 
-    handleAdditionalDataSuccess(pieceId) {
-        // Fetch newly updated piece to update the views
-        PieceActions.fetchOne(pieceId);
+    getFormDataId() {
+        return getAclFormDataId(false, this.props.editions);
+    },
 
+    handleAdditionalDataSuccess() {
         this.refs.consignModal.show();
     },
 
+    refreshEdition() {
+        if (this.props.editions.length === 1) {
+            EditionActions.fetchEdition(this.props.editions[0].bitcoin_id);
+        }
+    },
+
     render() {
         const { availableAcls, currentUser, className, editions, handleSuccess } = this.props;
         const { whitelabel: { name: whitelabelName = 'Market', user: whitelabelAdminEmail } } = this.state;
@@ -101,6 +110,10 @@ let MarketSubmitButton = React.createClass({
             senderName: currentUser.username
         });
 
+        // If only a single piece is selected, all the edition's extra_data and other_data will
+        // be the same, so we just take the first edition's
+        const { extra_data: extraData, other_data: otherData } = solePieceId ? editions[0] : {};
+
         const triggerButton = (
             <button className={classNames('btn', 'btn-default', 'btn-sm', className)}>
                 {getLangText('CONSIGN TO %s', whitelabelName.toUpperCase())}
@@ -126,16 +139,25 @@ let MarketSubmitButton = React.createClass({
                     aclName='acl_consign'>
                     <ModalWrapper
                         trigger={triggerButton}
-                        handleSuccess={this.handleAdditionalDataSuccess.bind(this, solePieceId)}
+                        handleSuccess={this.handleAdditionalDataSuccess}
                         title={getLangText('Add additional information')}>
                         <MarketAdditionalDataForm
+                            extraData={extraData}
+                            otherData={otherData}
                             pieceId={solePieceId}
                             submitLabel={getLangText('Continue to consignment')} />
                     </ModalWrapper>
 
                     <ModalWrapper
                         ref="consignModal"
-                        handleSuccess={handleSuccess}
+                        handleCancel={this.refreshEdition}
+                        handleSuccess={(...params) => {
+                            if (typeof handleSuccess === 'function') {
+                                handleSuccess(...params);
+                            }
+
+                            this.refreshEdition();
+                        }}
                         title={getLangText('Consign artwork')}>
                         {consignForm}
                     </ModalWrapper>
diff --git a/js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js b/js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js
index 4e1e3ee8..064936c9 100644
--- a/js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js
+++ b/js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js
@@ -6,8 +6,12 @@ import MarketAdditionalDataForm from '../market_forms/market_additional_data_for
 
 let MarketFurtherDetails = React.createClass({
     propTypes: {
-        pieceId: React.PropTypes.number,
+        pieceId: React.PropTypes.number.isRequired,
+
+        editable: React.PropTypes.bool,
+        extraData: React.PropTypes.object,
         handleSuccess: React.PropTypes.func,
+        otherData: React.PropTypes.arrayOf(React.PropTypes.object)
     },
 
     render() {
diff --git a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
index 2a22e743..24a70445 100644
--- a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
+++ b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
@@ -2,21 +2,18 @@
 
 import React from 'react';
 
-import Form from '../../../../../ascribe_forms/form';
-import Property from '../../../../../ascribe_forms/property';
-
-import InputTextAreaToggable from '../../../../../ascribe_forms/input_textarea_toggable';
-
-import FurtherDetailsFileuploader from '../../../../../ascribe_detail/further_details_fileuploader';
-import AscribeSpinner from '../../../../../ascribe_spinner';
-
 import GlobalNotificationModel from '../../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
 
+import FurtherDetailsFileuploader from '../../../../../ascribe_detail/further_details_fileuploader';
+
+import InputTextAreaToggable from '../../../../../ascribe_forms/input_textarea_toggable';
+import Form from '../../../../../ascribe_forms/form';
+import Property from '../../../../../ascribe_forms/property';
+
 import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils';
 
-import PieceActions from '../../../../../../actions/piece_actions';
-import PieceStore from '../../../../../../stores/piece_store';
+import AscribeSpinner from '../../../../../ascribe_spinner';
 
 import ApiUrls from '../../../../../../constants/api_urls';
 import AppConstants from '../../../../../../constants/application_constants';
@@ -28,16 +25,16 @@ import { getLangText } from '../../../../../../utils/lang_utils';
 
 let MarketAdditionalDataForm = React.createClass({
     propTypes: {
-        pieceId: React.PropTypes.oneOfType([
-            React.PropTypes.number,
-            React.PropTypes.string
-        ]),
+        pieceId: React.PropTypes.number.isRequired,
+
         editable: React.PropTypes.bool,
+        extraData: React.PropTypes.object,
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool,
+        otherData: React.PropTypes.arrayOf(React.PropTypes.object),
         showHeading: React.PropTypes.bool,
         showNotification: React.PropTypes.bool,
-        submitLabel: React.PropTypes.string,
-        handleSuccess: React.PropTypes.func
+        submitLabel: React.PropTypes.string
     },
 
     getDefaultProps() {
@@ -48,50 +45,34 @@ let MarketAdditionalDataForm = React.createClass({
     },
 
     getInitialState() {
-        const pieceStore = PieceStore.getState();
-
-        return mergeOptions(
-            pieceStore,
-            {
-                // Allow the form to be submitted if there's already an additional image uploaded
-                isUploadReady: this.isUploadReadyOnChange(pieceStore.piece),
-                forceUpdateKey: 0
-            });
-    },
-
-    componentDidMount() {
-        PieceStore.listen(this.onChange);
-
-        if (this.props.pieceId) {
-            PieceActions.fetchOne(this.props.pieceId);
+        return {
+            // Allow the form to be submitted if there's already an additional image uploaded
+            isUploadReady: this.isUploadReadyOnChange(),
+            forceUpdateKey: 0
         }
     },
 
-    componentWillUnmount() {
-        PieceStore.unlisten(this.onChange);
-    },
+    componentWillReceiveProps(nextProps) {
+        if (this.props.extraData !== nextProps.extraData || this.props.otherData !== nextProps.otherData) {
+            this.setState({
+                // Allow the form to be submitted if the updated piece has an additional image uploaded
+                isUploadReady: this.isUploadReadyOnChange(),
 
-    onChange(state) {
-        Object.assign({}, state, {
-            // Allow the form to be submitted if the updated piece already has an additional image uploaded
-            isUploadReady: this.isUploadReadyOnChange(state.piece),
-
-            /**
-             * Increment the forceUpdateKey to force the form to rerender on each change
-             *
-             * THIS IS A HACK TO MAKE SURE THE FORM ALWAYS DISPLAYS THE MOST RECENT STATE
-             * BECAUSE SOME OF OUR FORM ELEMENTS DON'T UPDATE FROM PROP CHANGES (ie.
-             * InputTextAreaToggable).
-             */
-            forceUpdateKey: this.state.forceUpdateKey + 1
-        });
-
-        this.setState(state);
+                /**
+                 * Increment the forceUpdateKey to force the form to rerender on each change
+                 *
+                 * THIS IS A HACK TO MAKE SURE THE FORM ALWAYS DISPLAYS THE MOST RECENT STATE
+                 * BECAUSE SOME OF OUR FORM ELEMENTS DON'T UPDATE FROM PROP CHANGES (ie.
+                 * InputTextAreaToggable).
+                 */
+                forceUpdateKey: this.state.forceUpdateKey + 1
+            });
+        }
     },
 
     getFormData() {
-        let extradata = {};
-        let formRefs = this.refs.form.refs;
+        const extradata = {};
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -102,12 +83,12 @@ let MarketAdditionalDataForm = React.createClass({
 
         return {
             extradata: extradata,
-            piece_id: this.state.piece.id
+            piece_id: this.props.pieceId
         };
     },
 
-    isUploadReadyOnChange(piece) {
-        return piece && piece.other_data && piece.other_data.length > 0;
+    isUploadReadyOnChange() {
+        return this.props.otherData && this.props.otherData.length;
     },
 
     handleSuccessWithNotification() {
@@ -115,7 +96,7 @@ let MarketAdditionalDataForm = React.createClass({
             this.props.handleSuccess();
         }
 
-        let notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
@@ -126,11 +107,20 @@ let MarketAdditionalDataForm = React.createClass({
     },
 
     render() {
-        const { editable, isInline, handleSuccess, showHeading, showNotification, submitLabel } = this.props;
-        const { piece } = this.state;
-        let buttons, heading;
+        const {
+            editable,
+            extraData = {},
+            isInline,
+            handleSuccess,
+            otherData,
+            pieceId,
+            showHeading,
+            showNotification,
+            submitLabel } = this.props;
 
-        let spinner = <AscribeSpinner color='dark-blue' size='lg' />;
+        let buttons;
+        let heading;
+        let spinner;
 
         if (!isInline) {
             buttons = (
@@ -145,7 +135,7 @@ let MarketAdditionalDataForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        {spinner}
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -159,65 +149,65 @@ let MarketAdditionalDataForm = React.createClass({
             ) : null;
         }
 
-        if (piece && piece.id) {
+        if (pieceId) {
             return (
                 <Form
                     className="ascribe-form-bordered"
                     ref='form'
                     key={this.state.forceUpdateKey}
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: pieceId })}
                     handleSuccess={showNotification ? this.handleSuccessWithNotification : handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
                     spinner={spinner}
-                    disabled={!this.props.editable || !piece.acl.acl_edit}>
+                    disabled={!this.props.editable}>
                     {heading}
                     <FurtherDetailsFileuploader
-                        pieceId={piece.id}
-                        label={getLangText('Marketplace Thumbnail Image')}
-                        submitFile={function () {}}
-                        setIsUploadReady={this.setIsUploadReady}
-                        isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
-                        otherData={piece.other_data}
                         areAssetsDownloadable={!!isInline}
-                        editable={editable} />
+                        editable={editable}
+                        isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
+                        label={getLangText('Marketplace Thumbnail Image')}
+                        otherData={otherData}
+                        pieceId={pieceId}
+                        setIsUploadReady={this.setIsUploadReady}
+                        submitFile={function () {}} />
                     <Property
                         name='artist_bio'
                         label={getLangText('Artist Bio')}
-                        expanded={editable || !!piece.extra_data.artist_bio}>
+                        expanded={editable || !!extraData.artist_bio}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.artist_bio}
+                            defaultValue={extraData.artist_bio}
                             placeholder={getLangText('Enter a biography of the artist...')}
                             required />
                     </Property>
                     <Property
                         name='work_description'
                         label={getLangText('Work Description')}
-                        expanded={editable || !!piece.extra_data.work_description}>
+                        expanded={editable || !!extraData.work_description}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.work_description}
+                            defaultValue={extraData.work_description}
                             placeholder={getLangText('Enter a description of the work...')}
                             required />
                     </Property>
                     <Property
                         name='technology_details'
                         label={getLangText('Technology Details')}
-                        expanded={editable || !!piece.extra_data.technology_details}>
+                        expanded={editable || !!extraData.technology_details}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.technology_details}
+                            defaultValue={extraData.technology_details}
                             placeholder={getLangText('Enter technological details about the work...')}
                             required />
                     </Property>
                     <Property
                         name='display_instructions'
                         label={getLangText('Display Instructions')}
-                        expanded={editable || !!piece.extra_data.display_instructions}>
+                        expanded={editable || !!extraData.display_instructions}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.display_instructions}
+                            defaultValue={extraData.display_instructions}
                             placeholder={getLangText('Enter instructions on how to best display the work...')}
                             required />
                     </Property>
@@ -226,7 +216,7 @@ let MarketAdditionalDataForm = React.createClass({
         } else {
             return (
                 <div className="ascribe-loading-position">
-                    {spinner}
+                    <AscribeSpinner color='dark-blue' size='lg' />
                 </div>
             );
         }
diff --git a/js/components/whitelabel/wallet/components/market/market_register_piece.js b/js/components/whitelabel/wallet/components/market/market_register_piece.js
index 387934f9..53c1a59d 100644
--- a/js/components/whitelabel/wallet/components/market/market_register_piece.js
+++ b/js/components/whitelabel/wallet/components/market/market_register_piece.js
@@ -6,19 +6,23 @@ import { History } from 'react-router';
 import Col from 'react-bootstrap/lib/Col';
 import Row from 'react-bootstrap/lib/Row';
 
+import PieceStore from '../../../../../stores/piece_store';
+import PieceActions from '../../../../../actions/piece_actions';
+
+import PieceListStore from '../../../../../stores/piece_list_store';
+import PieceListActions from '../../../../../actions/piece_list_actions';
+
+import UserStore from '../../../../../stores/user_store';
+import UserActions from '../../../../../actions/user_actions';
+
+import WhitelabelActions from '../../../../../actions/whitelabel_actions';
+import WhitelabelStore from '../../../../../stores/whitelabel_store';
+
 import MarketAdditionalDataForm from './market_forms/market_additional_data_form';
 
 import Property from '../../../../ascribe_forms/property';
 import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
 
-import PieceActions from '../../../../../actions/piece_actions';
-import PieceListStore from '../../../../../stores/piece_list_store';
-import PieceListActions from '../../../../../actions/piece_list_actions';
-import UserStore from '../../../../../stores/user_store';
-import UserActions from '../../../../../actions/user_actions';
-import WhitelabelActions from '../../../../../actions/whitelabel_actions';
-import WhitelabelStore from '../../../../../stores/whitelabel_store';
-
 import SlidesContainer from '../../../../ascribe_slides_container/slides_container';
 
 import { getLangText } from '../../../../../utils/lang_utils';
@@ -35,6 +39,7 @@ let MarketRegisterPiece = React.createClass({
     getInitialState(){
         return mergeOptions(
             PieceListStore.getState(),
+            PieceStore.getInitialState(),
             UserStore.getState(),
             WhitelabelStore.getState(),
             {
@@ -44,19 +49,27 @@ let MarketRegisterPiece = React.createClass({
 
     componentDidMount() {
         PieceListStore.listen(this.onChange);
+        PieceStore.listen(this.onChange);
         UserStore.listen(this.onChange);
         WhitelabelStore.listen(this.onChange);
 
         UserActions.fetchCurrentUser();
         WhitelabelActions.fetchWhitelabel();
 
-        // Reset the piece store to make sure that we don't display old data
-        // if the user repeatedly registers works
-        PieceActions.updatePiece({});
+        const queryParams = this.props.location.query;
+
+        // Load the correct piece if the user loads the second step directly
+        // by pressing on the back button or using the url
+        // We're using 'in' here as we want to know if 'piece_id' is present in the url,
+        // we don't care about the value.
+        if ('piece_id' in queryParams) {
+            PieceActions.fetchPiece(queryParams.piece_id);
+        }
     },
 
     componentWillUnmount() {
         PieceListStore.unlisten(this.onChange);
+        PieceStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
         WhitelabelStore.unlisten(this.onChange);
     },
@@ -68,53 +81,39 @@ let MarketRegisterPiece = React.createClass({
     handleRegisterSuccess(response) {
         this.refreshPieceList();
 
-        // Use the response's piece for the next step if available
-        let pieceId = null;
+        // Also load the newly registered piece for the next step
         if (response && response.piece) {
-            pieceId = response.piece.id;
             PieceActions.updatePiece(response.piece);
         }
 
-        this.incrementStep();
-        this.refs.slidesContainer.nextSlide({ piece_id: pieceId });
+        this.nextSlide({ piece_id: response.piece.id });
     },
 
     handleAdditionalDataSuccess() {
         this.refreshPieceList();
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
-    // We need to increase the step to lock the forms that are already filled out
-    incrementStep() {
+    nextSlide(queryParams) {
+        // We need to increase the step to lock the forms that are already filled out
         this.setState({
             step: this.state.step + 1
         });
-    },
 
-    getPieceFromQueryParam() {
-        const queryParams = this.props.location.query;
-
-        // Since every step of this register process is atomic,
-        // we may need to enter the process at step 1 or 2.
-        // If this is the case, we'll need the piece number to complete submission.
-        // It is encoded in the URL as a queryParam and we're checking for it here.
-        return queryParams && queryParams.piece_id;
+        this.refs.slidesContainer.nextSlide(queryParams);
     },
 
     refreshPieceList() {
-        PieceListActions.fetchPieceList(
-            this.state.page,
-            this.state.pageSize,
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     render() {
+        const { location } = this.props;
         const {
+            piece,
             step,
             whitelabel: {
                 name: whitelabelName = 'Market'
@@ -130,7 +129,7 @@ let MarketRegisterPiece = React.createClass({
                     pending: 'glyphicon glyphicon-chevron-right',
                     completed: 'glyphicon glyphicon-lock'
                 }}
-                location={this.props.location}>
+                location={location}>
                 <div data-slide-title={getLangText('Register work')}>
                     <Row className="no-margin">
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
@@ -142,7 +141,7 @@ let MarketRegisterPiece = React.createClass({
                                 isFineUploaderActive={true}
                                 enableSeparateThumbnail={false}
                                 handleSuccess={this.handleRegisterSuccess}
-                                location={this.props.location}>
+                                location={location}>
                                 <Property
                                     name="num_editions"
                                     label={getLangText('Specify editions')}>
@@ -160,8 +159,10 @@ let MarketRegisterPiece = React.createClass({
                     <Row className="no-margin">
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <MarketAdditionalDataForm
+                                extraData={piece.extra_data}
                                 handleSuccess={this.handleAdditionalDataSuccess}
-                                pieceId={this.getPieceFromQueryParam()}
+                                otherData={piece.other_data}
+                                pieceId={piece.id}
                                 showHeading />
                         </Col>
                     </Row>
diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js
index c2810fd0..bce7106b 100644
--- a/js/components/whitelabel/wallet/wallet_app.js
+++ b/js/components/whitelabel/wallet/wallet_app.js
@@ -35,7 +35,7 @@ let WalletApp = React.createClass({
             && (['cyland', 'ikonotv', 'lumenus', '23vivi']).indexOf(subdomain) > -1) {
             header = (<div className="hero"/>);
         } else {
-            header = <Header showAddWork={true} routes={routes} />;
+            header = <Header routes={routes} />;
         }
 
         // In react-router 1.0, Routes have no 'name' property anymore. To keep functionality however,
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 0a4e3a58..a5a0e075 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -40,7 +40,7 @@ import LumenusLanding from './components/lumenus/lumenus_landing';
 import Vivi23Landing from './components/23vivi/23vivi_landing';
 import Vivi23PieceList from './components/23vivi/23vivi_piece_list';
 
-import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler';
+import { ProxyHandler, AuthRedirect } from '../../../components/ascribe_routes/proxy_handler';
 
 import WalletApp from './wallet_app';
 
@@ -51,30 +51,31 @@ let ROUTES = {
             <IndexRoute component={CylandLanding} />
             <Route
                 path='login'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(CylandRegisterPiece)}
-                headerTitle='+ NEW WORK'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandRegisterPiece)}
+                headerTitle='+ NEW WORK'
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(CylandPieceList)}
-                headerTitle='COLLECTION'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandPieceList)}
+                headerTitle='COLLECTION' />
             <Route path='editions/:editionId' component={EditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
             <Route path='pieces/:pieceId' component={CylandPieceContainer} />
@@ -85,30 +86,30 @@ let ROUTES = {
         <Route path='/' component={WalletApp}>
             <Route
                 path='login'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(CCRegisterPiece)}
-                headerTitle='+ NEW WORK'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CCRegisterPiece)}
+                headerTitle='+ NEW WORK' />
             <Route
                 path='collection'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(PieceList)}
-                headerTitle='COLLECTION'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
+                headerTitle='COLLECTION' />
             <Route path='pieces/:pieceId' component={PieceContainer} />
             <Route path='editions/:editionId' component={EditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
@@ -120,39 +121,39 @@ let ROUTES = {
             <IndexRoute component={IkonotvLanding} />
             <Route
                 path='login'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='request_loan'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SendContractAgreementForm)}
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SendContractAgreementForm)}
                 headerTitle='SEND NEW CONTRACT'
-                aclName='acl_create_contractagreement'/>
+                aclName='acl_create_contractagreement' />
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvRegisterPiece)}
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvRegisterPiece)}
                 headerTitle='+ NEW WORK'
-                aclName='acl_create_piece'/>
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvPieceList)}
-                headerTitle='COLLECTION'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvPieceList)}
+                headerTitle='COLLECTION' />
             <Route
                 path='contract_notifications'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvContractNotifications)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)} />
             <Route path='pieces/:pieceId' component={IkonotvPieceContainer} />
             <Route path='editions/:editionId' component={EditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
@@ -161,33 +162,34 @@ let ROUTES = {
     ),
     'lumenus': (
         <Route path='/' component={WalletApp}>
-            <IndexRoute component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LumenusLanding)} />
+            <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LumenusLanding)} />
             <Route
                 path='login'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(MarketRegisterPiece)}
-                headerTitle='+ NEW WORK'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
+                headerTitle='+ NEW WORK'
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(MarketPieceList)}
-                headerTitle='COLLECTION'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketPieceList)}
+                headerTitle='COLLECTION' />
             <Route path='pieces/:pieceId' component={MarketPieceContainer} />
             <Route path='editions/:editionId' component={MarketEditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
@@ -196,34 +198,34 @@ let ROUTES = {
     ),
     '23vivi': (
         <Route path='/' component={WalletApp}>
-            <IndexRoute component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(Vivi23Landing)} />
+            <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)} />
             <Route
                 path='login'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(MarketRegisterPiece)}
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
                 headerTitle='+ NEW WORK'
-                aclName='acl_wallet_submit'/>
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
-                component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(Vivi23PieceList)}
-                headerTitle='COLLECTION'/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(Vivi23PieceList)}
+                headerTitle='COLLECTION' />
             <Route path='pieces/:pieceId' component={MarketPieceContainer} />
             <Route path='editions/:editionId' component={MarketEditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js
index e7f11141..f7bac317 100644
--- a/js/constants/api_urls.js
+++ b/js/constants/api_urls.js
@@ -76,8 +76,7 @@ let ApiUrls = {
     'webhooks': AppConstants.apiEndpoint + 'webhooks/',
     'webhooks_events': AppConstants.apiEndpoint + 'webhooks/events/',
     'whitelabel_settings': AppConstants.apiEndpoint + 'whitelabel/settings/${subdomain}/',
-    'delete_s3_file': AppConstants.serverUrl + 's3/delete/',
-    'prize_list': AppConstants.apiEndpoint + 'prize/'
+    'delete_s3_file': AppConstants.serverUrl + 's3/delete/'
 };
 
 
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index 74edc51b..824ed4b2 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -91,6 +91,10 @@ const constants = {
             'registerWork': {
                 'itemLimit': 1,
                 'sizeLimit': '25000000000'
+            },
+            'workThumbnail': {
+                'itemLimit': 1,
+                'sizeLimit': '5000000'
             }
         }
     },
diff --git a/js/constants/mime_types.js b/js/constants/mime_types.js
new file mode 100644
index 00000000..215ac20e
--- /dev/null
+++ b/js/constants/mime_types.js
@@ -0,0 +1,11 @@
+'use strict';
+
+const MimeTypes = {
+    'jpg': 'image/jpeg',
+    'jpeg': 'image/jpeg',
+    'gif': 'image/gif',
+    'pdf': 'application/pdf',
+    'png': 'image/png'
+};
+
+export default MimeTypes;
diff --git a/js/fetchers/edition_list_fetcher.js b/js/fetchers/edition_list_fetcher.js
index 93e4553d..4a97680f 100644
--- a/js/fetchers/edition_list_fetcher.js
+++ b/js/fetchers/edition_list_fetcher.js
@@ -9,10 +9,10 @@ let EditionListFetcher = {
     /**
      * Fetches a list of editions from the API.
      */
-    fetch(pieceId, page, pageSize, orderBy, orderAsc, filterBy) {
-        let ordering = generateOrderingQueryParams(orderBy, orderAsc);
+    fetch({ pieceId, page, pageSize, orderBy, orderAsc, filterBy }) {
+        const ordering = generateOrderingQueryParams(orderBy, orderAsc);
 
-        let queryParams = mergeOptions(
+        const queryParams = mergeOptions(
             {
                 page,
                 pageSize,
diff --git a/js/fetchers/piece_fetcher.js b/js/fetchers/piece_fetcher.js
deleted file mode 100644
index 481b79fe..00000000
--- a/js/fetchers/piece_fetcher.js
+++ /dev/null
@@ -1,15 +0,0 @@
-'use strict';
-
-import requests from '../utils/requests';
-
-
-let PieceFetcher = {
-    /**
-     * Fetch a piece from the API.
-     */
-    fetchOne(id) {
-        return requests.get('piece', {'piece_id': id});
-    }
-};
-
-export default PieceFetcher;
diff --git a/js/fetchers/piece_list_fetcher.js b/js/fetchers/piece_list_fetcher.js
index 6bd4eb3a..ed095b37 100644
--- a/js/fetchers/piece_list_fetcher.js
+++ b/js/fetchers/piece_list_fetcher.js
@@ -10,12 +10,12 @@ let PieceListFetcher = {
      * Fetches a list of pieces from the API.
      * Can be called with all supplied queryparams the API.
      */
-    fetch(page, pageSize, search, orderBy, orderAsc, filterBy) {
-        let ordering = generateOrderingQueryParams(orderBy, orderAsc);
+    fetch({ page, pageSize, search, orderBy, orderAsc, filterBy }) {
+        const ordering = generateOrderingQueryParams(orderBy, orderAsc);
 
         // filterBy is an object of acl key-value pairs.
         // The values are booleans
-        let queryParams = mergeOptions(
+        const queryParams = mergeOptions(
             {
                 page,
                 pageSize,
diff --git a/js/fetchers/prize_list_fetcher.js b/js/fetchers/prize_list_fetcher.js
deleted file mode 100644
index 150f07a1..00000000
--- a/js/fetchers/prize_list_fetcher.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-import requests from '../utils/requests';
-
-
-let PrizeListFetcher = {
-    fetch() {
-        return requests.get('prize_list');
-    }
-};
-
-export default PrizeListFetcher;
diff --git a/js/history.js b/js/history.js
index 903f2b73..4e8c03c7 100644
--- a/js/history.js
+++ b/js/history.js
@@ -1,6 +1,7 @@
 'use strict';
 
 import useBasename from 'history/lib/useBasename';
+import useQueries from 'history/lib/useQueries';
 import createBrowserHistory from 'history/lib/createBrowserHistory';
 import AppConstants from './constants/application_constants';
 
@@ -8,6 +9,6 @@ import AppConstants from './constants/application_constants';
 // Remove the trailing slash if present
 let baseUrl = AppConstants.baseUrl.replace(/\/$/, '');
 
-export default useBasename(createBrowserHistory)({
+export default useBasename(useQueries(createBrowserHistory))({
     basename: baseUrl
 });
diff --git a/js/routes.js b/js/routes.js
index 116fb663..49a284af 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -25,39 +25,39 @@ import ErrorNotFoundPage from './components/error_not_found_page';
 
 import RegisterPiece from './components/register_piece';
 
-import AuthProxyHandler from './components/ascribe_routes/proxy_routes/auth_proxy_handler';
+import { ProxyHandler, AuthRedirect } from './components/ascribe_routes/proxy_handler';
 
 
 let COMMON_ROUTES = (
     <Route path='/' component={App}>
         <Route
             path='login'
-            component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
+            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
         <Route
             path='register_piece'
-            component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(RegisterPiece)}
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(RegisterPiece)}
             headerTitle='+ NEW WORK'/>
         <Route
             path='collection'
-            component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(PieceList)}
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
             headerTitle='COLLECTION'/>
         <Route
             path='signup'
-            component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
+            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
         <Route
             path='logout'
-            component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(LogoutContainer)}/>
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(LogoutContainer)}/>
         <Route path='pieces/:pieceId' component={PieceContainer} />
         <Route path='editions/:editionId' component={EditionContainer} />
         <Route
             path='password_reset'
-            component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
+            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
         <Route
             path='settings'
-            component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}/>
         <Route
             path='contract_settings'
-            component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}/>
         <Route path='coa_verify' component={CoaVerifyContainer} />
         <Route path='*' component={ErrorNotFoundPage} />
     </Route>
diff --git a/js/sources/NAMING_CONVENTIONS.md b/js/sources/NAMING_CONVENTIONS.md
index 81158793..17898ce1 100644
--- a/js/sources/NAMING_CONVENTIONS.md
+++ b/js/sources/NAMING_CONVENTIONS.md
@@ -22,12 +22,8 @@ refreshApplicationToken
 we cannot repeat this for a sources' methods as patterns like this would emerge in the stores:
 
 ```javascript
-onFetchCurrentUser(invalidateCache) {
-    this.invalidateCache = invalidateCache;
-
-    if(!this.getInstance().isLoading()) {
-        this.getInstance().fetchCurrentUser(); // does not call a flux "action" but a method in user_source.js - which is confusing
-    }
+onFetchCurrentUser() {
+    this.getInstance().fetchCurrentUser(); // does not call a flux "action" but a method in user_source.js - which is confusing
 }
 ```
 
@@ -67,4 +63,4 @@ lookupCurrentUser: {
 UserActions.logoutCurrentUser
 UserStore.onLogoutCurrentUser
 UserSource.performLogoutCurrentUser
-```
\ No newline at end of file
+```
diff --git a/js/sources/coa_source.js b/js/sources/coa_source.js
index 88c72cce..3a949a1b 100644
--- a/js/sources/coa_source.js
+++ b/js/sources/coa_source.js
@@ -7,21 +7,27 @@ import EditionActions from '../actions/edition_actions';
 
 const CoaSource = {
     lookupCoa: {
-        remote(state) {
-            return requests.get('coa', { id: state.edition.coa });
+        remote(state, coaId) {
+            return requests
+                .get('coa', { id: coaId })
+                .then((res) => {
+                    // If no coa is found here, fake a 404 error so the error action can pick it up
+                    return (res && res.coa) ? res : Promise.reject({ json: { status: 404 } });
+                });
         },
 
         success: EditionActions.successFetchCoa,
         error: EditionActions.errorCoa
     },
 
-    performCreateCoa: {
-        remote(state) {
-            return requests.post('coa_create', {body: { bitcoin_id: state.edition.bitcoin_id }});
+    performCreateCoaForEdition: {
+        remote(state, editionId) {
+            return requests.post('coa_create', { body: { bitcoin_id: editionId } });
         },
+
         success: EditionActions.successFetchCoa,
         error: EditionActions.errorCoa
     }
 };
 
-export default CoaSource;
\ No newline at end of file
+export default CoaSource;
diff --git a/js/sources/edition_source.js b/js/sources/edition_source.js
index 3e48d257..dd295352 100644
--- a/js/sources/edition_source.js
+++ b/js/sources/edition_source.js
@@ -7,8 +7,8 @@ import EditionActions from '../actions/edition_actions';
 
 const EditionSource = {
     lookupEdition: {
-        remote(state) {
-            return requests.get('edition', { bitcoin_id: state.editionMeta.idToFetch });
+        remote(state, editionId) {
+            return requests.get('edition', { bitcoin_id: editionId });
         },
 
         success: EditionActions.successFetchEdition,
@@ -16,4 +16,4 @@ const EditionSource = {
     }
 };
 
-export default EditionSource;
\ No newline at end of file
+export default EditionSource;
diff --git a/js/sources/piece_source.js b/js/sources/piece_source.js
new file mode 100644
index 00000000..393c844c
--- /dev/null
+++ b/js/sources/piece_source.js
@@ -0,0 +1,19 @@
+'use strict';
+
+import requests from '../utils/requests';
+
+import PieceActions from '../actions/piece_actions';
+
+
+const PieceSource = {
+    lookupPiece: {
+        remote(state, pieceId) {
+            return requests.get('piece', { piece_id: pieceId });
+        },
+
+        success: PieceActions.successFetchPiece,
+        error: PieceActions.errorPiece
+    }
+};
+
+export default PieceSource;
diff --git a/js/sources/user_source.js b/js/sources/user_source.js
index 872b060b..04e36fb9 100644
--- a/js/sources/user_source.js
+++ b/js/sources/user_source.js
@@ -13,12 +13,14 @@ const UserSource = {
         },
 
         local(state) {
-            return state.currentUser && state.currentUser.email ? state : {};
+            return !Object.keys(state.currentUser).length ? state : {};
         },
+
         success: UserActions.successFetchCurrentUser,
         error: UserActions.errorCurrentUser,
-        shouldFetch(state) {
-            return state.userMeta.invalidateCache || state.currentUser && !state.currentUser.email;
+
+        shouldFetch(state, invalidateCache) {
+            return invalidateCache || !Object.keys(state.currentUser).length;
         }
     },
 
@@ -26,9 +28,10 @@ const UserSource = {
         remote() {
             return requests.get(ApiUrls.users_logout);
         },
+
         success: UserActions.successLogoutCurrentUser,
         error: UserActions.errorCurrentUser
     }
 };
 
-export default UserSource;
\ No newline at end of file
+export default UserSource;
diff --git a/js/sources/webhook_source.js b/js/sources/webhook_source.js
index 5351c89c..7174d74a 100644
--- a/js/sources/webhook_source.js
+++ b/js/sources/webhook_source.js
@@ -10,13 +10,16 @@ const WebhookSource = {
         remote() {
             return requests.get('webhooks');
         },
+
         local(state) {
-            return state.webhooks && !Object.keys(state.webhooks).length ? state : {};
+            return !Object.keys(state.webhooks).length ? state : {};
         },
+
         success: WebhookActions.successFetchWebhooks,
         error: WebhookActions.errorWebhooks,
-        shouldFetch(state) {
-            return state.webhookMeta.invalidateCache || state.webhooks && !Object.keys(state.webhooks).length;
+
+        shouldFetch(state, invalidateCache) {
+            return invalidateCache || !Object.keys(state.webhooks).length;
         }
     },
 
@@ -24,23 +27,27 @@ const WebhookSource = {
         remote() {
             return requests.get('webhooks_events');
         },
+
         local(state) {
-            return state.webhookEvents && !Object.keys(state.webhookEvents).length ? state : {};
+            return !Object.keys(state.webhookEvents).length ? state : {};
         },
+
         success: WebhookActions.successFetchWebhookEvents,
         error: WebhookActions.errorWebhookEvents,
-        shouldFetch(state) {
-            return state.webhookEventsMeta.invalidateCache || state.webhookEvents && !Object.keys(state.webhookEvents).length;
+
+        shouldFetch(state, invalidateCache) {
+            return invalidateCache || !Object.keys(state.webhookEvents).length;
         }
     },
 
     performRemoveWebhook: {
-        remote(state) {
-            return requests.delete('webhook', {'webhook_id': state.webhookMeta.idToDelete });
+        remote(state, webhookId) {
+            return requests.delete('webhook', { 'webhook_id': webhookId });
         },
+
         success: WebhookActions.successRemoveWebhook,
         error: WebhookActions.errorWebhooks
     }
 };
 
-export default WebhookSource;
\ No newline at end of file
+export default WebhookSource;
diff --git a/js/sources/whitelabel_source.js b/js/sources/whitelabel_source.js
index 07bea746..3d5770ad 100644
--- a/js/sources/whitelabel_source.js
+++ b/js/sources/whitelabel_source.js
@@ -9,17 +9,20 @@ import { getSubdomain } from '../utils/general_utils';
 const WhitelabelSource = {
     lookupWhitelabel: {
         remote() {
-            return requests.get('whitelabel_settings', {'subdomain': getSubdomain()});
+            return requests.get('whitelabel_settings', { 'subdomain': getSubdomain() });
         },
+
         local(state) {
-            return Object.keys(state.whitelabel).length > 0 ? state : {};
+            return Object.keys(state.whitelabel).length ? state : {};
         },
+
         success: WhitelabelActions.successFetchWhitelabel,
         error: WhitelabelActions.errorWhitelabel,
-        shouldFetch(state) {
-            return state.whitelabelMeta.invalidateCache || Object.keys(state.whitelabel).length === 0;
+
+        shouldFetch(state, invalidateCache) {
+            return invalidateCache || !Object.keys(state.whitelabel).length;
         }
     }
 };
 
-export default WhitelabelSource;
\ No newline at end of file
+export default WhitelabelSource;
diff --git a/js/stores/edition_list_store.js b/js/stores/edition_list_store.js
index 107f9af4..683e40ca 100644
--- a/js/stores/edition_list_store.js
+++ b/js/stores/edition_list_store.js
@@ -12,7 +12,11 @@ class EditionListStore {
         this.bindActions(EditionsListActions);
     }
 
-    onUpdateEditionList({pieceId, editionListOfPiece, page, pageSize, orderBy, orderAsc, count, filterBy}) {
+    onUpdateEditionList({ pieceId, editionListOfPiece, page, pageSize, orderBy, orderAsc, count, filterBy, maxEdition }) {
+        // if editionList for a specific piece does not exist yet,
+        // just initialize a new array
+        const pieceEditionList = this.editionList[pieceId] || [];
+
         /*
             Basically there are two modes an edition list can be updated.
 
@@ -20,93 +24,107 @@ class EditionListStore {
                 2. The elements are already defined => merge current objects with the new ones from the server
 
          */
-        for(let i = 0; i < editionListOfPiece.length; i++) {
+        editionListOfPiece.forEach((updatedEdition, index) => {
+            // this is the index formula for accessing an edition starting from a specific page
+            const storeEditionIndex = (page - 1) * pageSize + index;
 
-            // if editionList for a specific piece does not exist yet,
-            // just initialize a new array
-            if(!this.editionList[pieceId]) {
-                this.editionList[pieceId] = [];
-            }
-
-            // this is the index formula for accessing an edition of a specific
-            // page
-            let storeEditionIndex = (page - 1) * pageSize + i;
-            let editionsForPieces = this.editionList[pieceId];
-            
             // if edition already exists, just merge
-            if(editionsForPieces[storeEditionIndex]) {
-                editionsForPieces[storeEditionIndex] = React.addons.update(editionsForPieces[storeEditionIndex], {$merge: editionListOfPiece[i]});
+            if (pieceEditionList[storeEditionIndex]) {
+                pieceEditionList[storeEditionIndex] = React.addons.update(pieceEditionList[storeEditionIndex], { $merge: updatedEdition });
             } else {
                 // if does not exist, assign
-                editionsForPieces[storeEditionIndex] = editionListOfPiece[i];
+                pieceEditionList[storeEditionIndex] = updatedEdition;
+            }
+        });
+
+        // Remove editions after specified max by finding the index of the first
+        // edition larger than the max edition and using that to cut off the rest of the list
+        if (typeof maxEdition === 'number') {
+            const largerThanMaxIndex = pieceEditionList.findIndex(edition => edition.edition_number > maxEdition);
+
+            if (largerThanMaxIndex !== -1) {
+                // The API defines inflexible page buckets based on the page number
+                // and page size, so we cannot just arbitrarily cut off the end of
+                // a page and expect get the rest of it on the next pagination request.
+                // Hence, we use the max edition index as a guide for which page to
+                // cut off to so as to always provide complete pages.
+                page = Math.ceil(largerThanMaxIndex / pageSize);
+
+                // We only want to cut off the list if there are more editions than
+                // there should be (ie. we're not already at the end of the editions)
+                const totalPageSize = page * pageSize;
+                if (pieceEditionList.length > totalPageSize) {
+                    pieceEditionList.length = totalPageSize;
+                }
             }
         }
 
+        const lastEdition = pieceEditionList[pieceEditionList.length - 1];
+
         /**
          * page, pageSize, orderBy, orderAsc and count are specific to a single list of editions
          * therefore they need to be saved in relation to their parent-piece.
          *
          * Default values for both are set in the editon_list_actions.
          */
-        this.editionList[pieceId].page = page;
-        this.editionList[pieceId].pageSize = pageSize;
-        this.editionList[pieceId].orderBy = orderBy;
-        this.editionList[pieceId].orderAsc = orderAsc;
-        this.editionList[pieceId].count = count;
-        this.editionList[pieceId].filterBy = filterBy;
+        pieceEditionList.page = page;
+        pieceEditionList.pageSize = pageSize;
+        pieceEditionList.orderBy = orderBy;
+        pieceEditionList.orderAsc = orderAsc;
+        pieceEditionList.count = count;
+        pieceEditionList.filterBy = filterBy;
+
+        if (pieceEditionList.maxSeen == null || lastEdition.edition_number > pieceEditionList.maxSeen) {
+            pieceEditionList.maxSeen = lastEdition.edition_number;
+        }
+
+        this.editionList[pieceId] = pieceEditionList;
     }
 
     /**
      * We often just have to refresh the edition list for a certain pieceId,
      * this method provides exactly that functionality without any side effects
      */
-    onRefreshEditionList({pieceId, filterBy = {}}) {
+    onRefreshEditionList({ pieceId, filterBy }) {
+        const pieceEditionList = this.editionList[pieceId];
+
         // It may happen that the user enters the site logged in already
         // through /editions
         // If he then tries to delete a piece/edition and this method is called,
         // we'll not be able to refresh his edition list since its not yet there.
         // Therefore we can just return, since there is no data to be refreshed
-        if(!this.editionList[pieceId]) {
+        if (!this.editionList[pieceId]) {
             return;
         }
 
-        let prevEditionListLength = this.editionList[pieceId].length;
-        let prevEditionListPage = this.editionList[pieceId].page;
-        let prevEditionListPageSize = this.editionList[pieceId].pageSize;
-
-        // we can also refresh the edition list using filterBy,
-        // if we decide not to do that then the old filter will just be applied.
-        if(filterBy && Object.keys(filterBy).length <= 0) {
-            filterBy = this.editionList[pieceId].filterBy;
-            prevEditionListLength = 10;
-            prevEditionListPage = 1;
-            prevEditionListPageSize = 10;
+        if (typeof filterBy !== 'object') {
+            filterBy = pieceEditionList.filterBy;
         }
 
+        const { maxSeen, orderAsc, orderBy, pageSize } = pieceEditionList;
+
         // to clear an array, david walsh recommends to just set it's length to zero
         // http://davidwalsh.name/empty-array
-        this.editionList[pieceId].length = 0;
+        pieceEditionList.length = 0;
 
-        // refetch editions with adjusted page size
-        EditionsListActions.fetchEditionList(pieceId, 1, prevEditionListLength,
-                                             this.editionList[pieceId].orderBy,
-                                             this.editionList[pieceId].orderAsc,
-                                             filterBy)
-            .then(() => {
-                // reset back to the normal pageSize and page
-                this.editionList[pieceId].page = prevEditionListPage;
-                this.editionList[pieceId].pageSize = prevEditionListPageSize;
+        EditionsListActions
+            .fetchEditionList({
+                pieceId,
+                pageSize,
+                orderBy,
+                orderAsc,
+                filterBy,
+                maxSeen,
+                page: 1
             })
-            .catch((err) => {
-                console.logGlobal(err);
-            });
+            .catch(console.logGlobal);
     }
 
-    onSelectEdition({pieceId, editionId, toValue}) {
+    onSelectEdition({ pieceId, editionId, toValue }) {
         this.editionList[pieceId].forEach((edition) => {
 
             // Taken from: http://stackoverflow.com/a/519157/1263876
-            if(typeof toValue !== 'undefined' && edition.id === editionId) {
+            if (typeof toValue !== 'undefined' && edition.id === editionId) {
                 edition.selected = toValue;
             } else if(edition.id === editionId) {
                 if(edition.selected) {
@@ -132,7 +150,6 @@ class EditionListStore {
     }
 
     onToggleEditionList(pieceId) {
-
         this.isEditionListOpenForPieceId[pieceId] = {
             show: this.isEditionListOpenForPieceId[pieceId] ? !this.isEditionListOpenForPieceId[pieceId].show : true
         };
@@ -141,10 +158,10 @@ class EditionListStore {
         // the merge fails, as the edition list is not refreshed when closed.
         // Therefore in the case of a filter application when closed, we need to reload the
         // edition list
-        if(!this.isEditionListOpenForPieceId[pieceId].show) {
+        if (!this.isEditionListOpenForPieceId[pieceId].show) {
             // to clear an array, david walsh recommends to just set it's length to zero
             // http://davidwalsh.name/empty-array
-            
+
             this.editionList[pieceId].length = 0;
         }
     }
diff --git a/js/stores/edition_store.js b/js/stores/edition_store.js
index 3a35dbad..ebb7ccf9 100644
--- a/js/stores/edition_store.js
+++ b/js/stores/edition_store.js
@@ -7,71 +7,90 @@ import EditionActions from '../actions/edition_actions';
 import EditionSource from '../sources/edition_source';
 import CoaSource from '../sources/coa_source';
 
+import { mergeOptions } from '../utils/general_utils';
+
 
 class EditionStore {
     constructor() {
+        this.getInitialState();
+
+        this.bindActions(EditionActions);
+        this.registerAsync(mergeOptions(EditionSource, CoaSource));
+        this.exportPublicMethods({
+            getInitialState: this.getInitialState.bind(this)
+        });
+    }
+
+    getInitialState() {
         this.edition = {};
         this.editionMeta = {
-            err: null,
-            idToFetch: null
+            err: null
         };
         this.coaMeta = {
             err: null
         };
 
-        this.bindActions(EditionActions);
-        this.registerAsync(Object.assign(EditionSource, CoaSource));
+        return {
+            edition: this.edition,
+            editionMeta: this.editionMeta,
+            coaMeta: this.coaMeta
+        };
     }
 
-    onFetchEdition(idToFetch) {
-        this.editionMeta.idToFetch = idToFetch;
+    onFetchEdition(editionId) {
+        this.getInstance().lookupEdition(editionId);
 
-        this.getInstance().lookupEdition();
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
     }
 
-    onSuccessFetchEdition(res) {
-        if(res && res.edition) {
-            this.edition = res.edition;
+    onSuccessFetchEdition({ edition }) {
+        if (edition) {
+            this.edition = edition;
             this.editionMeta.err = null;
-            this.editionMeta.idToFetch = null;
 
-            if (this.edition.coa && this.edition.acl.acl_coa &&
-                typeof this.edition.coa.constructor !== Object) {
-                this.getInstance().lookupCoa();
-            } else if(!this.edition.coa && this.edition.acl.acl_coa) {
-                this.getInstance().performCreateCoa();
+            // Also fetch coa if allowed
+            if (edition.acl.acl_coa) {
+                if (edition.coa && typeof edition.coa.constructor !== Object) {
+                    this.getInstance().lookupCoa(edition.coa);
+                } else if (!edition.coa) {
+                    this.getInstance().performCreateCoaForEdition(edition.bitcoin_id);
+                }
             }
         } else {
             this.editionMeta.err = new Error('Problem fetching the edition');
+            console.logGlobal(this.editionMeta.err);
         }
     }
 
-    onSuccessFetchCoa(res) {
-        if (res && res.coa && Object.keys(this.edition).length) {
-            this.edition.coa = res.coa;
+    onSuccessFetchCoa({ coa }) {
+        if (coa && Object.keys(this.edition).length) {
+            this.edition.coa = coa;
             this.coaMeta.err = null;
         } else {
             this.coaMeta.err = new Error('Problem generating/fetching the COA');
+            console.logGlobal(this.coaMeta.err);
         }
     }
 
-    onFlushEdition() {
-        this.edition = {};
-        this.editionMeta = {
-            err: null,
-            idToFetch: null
-        };
-        this.coaMeta = {
-            err: null
-        };
-    }
-
     onErrorEdition(err) {
+        console.logGlobal(err);
         this.editionMeta.err = err;
     }
 
     onErrorCoa(err) {
-        this.coaMeta.err = err;
+        // On 404s, create a new COA as the COA has not been made yet
+        if (err && err.json && err.json.status === 404) {
+            this.getInstance().performCreateCoaForEdition(this.edition.bitcoin_id);
+        } else {
+            console.logGlobal(err);
+            this.coaMeta.err = err;
+        }
+    }
+
+    onFlushEdition() {
+        this.getInitialState();
     }
 }
 
diff --git a/js/stores/notification_store.js b/js/stores/notification_store.js
index ffb3b0af..7a9add9c 100644
--- a/js/stores/notification_store.js
+++ b/js/stores/notification_store.js
@@ -10,6 +10,8 @@ class NotificationStore {
     constructor() {
         this.pieceListNotifications = {};
         this.editionListNotifications = {};
+        // Need to determine if contract agreement notifications have been loaded or not,
+        // so we use null here instead of an empty array
         this.contractAgreementListNotifications = null;
         this.editionNotifications = null;
         this.pieceNotifications = null;
@@ -20,6 +22,10 @@ class NotificationStore {
         this.pieceListNotifications = res.notifications;
     }
 
+    onFlushPieceListNotifications() {
+        this.pieceListNotifications = [];
+    }
+
     onUpdatePieceNotifications(res) {
         this.pieceNotifications = res.notification;
     }
@@ -28,6 +34,10 @@ class NotificationStore {
         this.editionListNotifications = res.notifications;
     }
 
+    onFlushPieceListNotifications() {
+        this.editionListNotifications = [];
+    }
+
     onUpdateEditionNotifications(res) {
         this.editionNotifications = res.notification;
     }
@@ -36,6 +46,9 @@ class NotificationStore {
         this.contractAgreementListNotifications = res.notifications;
     }
 
+    onFlushContractAgreementListNotifications() {
+        this.contractAgreementListNotifications = null;
+    }
 }
 
 export default alt.createStore(NotificationStore, 'NotificationStore');
diff --git a/js/stores/piece_list_store.js b/js/stores/piece_list_store.js
index 94c57113..22d35c51 100644
--- a/js/stores/piece_list_store.js
+++ b/js/stores/piece_list_store.js
@@ -31,7 +31,7 @@ class PieceListStore {
         this.requestActions = {};
         this.bindActions(PieceListActions);
     }
-    
+
     onUpdatePieceList({ page, pageSize, search, pieceList, orderBy, orderAsc, pieceListCount, unfilteredPieceListCount, filterBy }) {
         this.page = page;
         this.pageSize = pageSize;
@@ -60,13 +60,13 @@ class PieceListStore {
          * point anyway. Then, this problem is automatically resolved.
          */
         pieceList.forEach((piece, i) => {
-            let oldPiece = this.pieceList[i];
-            if(oldPiece) {
+            const oldPiece = this.pieceList[i];
+            if (oldPiece) {
                 piece = React.addons.update(piece, {
                     show: { $set: oldPiece.show }
                 });
             }
-            
+
         });
 
         this.pieceList = pieceList;
@@ -76,12 +76,11 @@ class PieceListStore {
         this.requestActions = res.actions;
     }
 
-    onUpdatePropertyForPiece({pieceId, key, value}) {
-        let filteredPieceList = this.pieceList.filter((piece) => piece.id === pieceId);
+    onUpdatePropertyForPiece({ pieceId, key, value }) {
+        const filteredPieceList = this.pieceList.filter((piece) => piece.id === pieceId);
 
-        if(filteredPieceList.length === 1) {
-
-            let piece = filteredPieceList[0];
+        if (filteredPieceList.length === 1) {
+            const piece = filteredPieceList[0];
             piece[key] = value;
         } else {
             throw new Error('Could not find a matching piece in piece list since its either not there or piecelist contains duplicates.');
diff --git a/js/stores/piece_store.js b/js/stores/piece_store.js
index 3b04736b..5ae80e74 100644
--- a/js/stores/piece_store.js
+++ b/js/stores/piece_store.js
@@ -1,32 +1,73 @@
 'use strict';
 
 import { alt } from '../alt';
+
 import PieceActions from '../actions/piece_actions';
 
+import PieceSource from '../sources/piece_source';
+
 
 class PieceStore {
     constructor() {
-        this.piece = {};
-        this.pieceError = null;
+        this.getInitialState();
+
         this.bindActions(PieceActions);
+        this.registerAsync(PieceSource);
+        this.exportPublicMethods({
+            getInitialState: this.getInitialState.bind(this)
+        });
+    }
+
+    getInitialState() {
+        this.piece = {};
+        this.pieceMeta = {
+            err: null
+        };
+
+        return {
+            piece: this.piece,
+            pieceMeta: this.pieceMeta
+        }
+    }
+
+    onFetchPiece(pieceId) {
+        this.getInstance().lookupPiece(pieceId);
+
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
+    }
+
+    onSuccessFetchPiece({ piece }) {
+        if (piece) {
+            this.onUpdatePiece(piece);
+        } else {
+            this.pieceMeta.err = new Error('Problem fetching the piece');
+            console.logGlobal(this.pieceMeta.err);
+        }
+    }
+
+    onErrorPiece(err) {
+        console.logGlobal(err);
+        this.pieceMeta.err = err;
+    }
+
+    onFlushPiece() {
+        this.getInitialState();
     }
 
     onUpdatePiece(piece) {
         this.piece = piece;
-        this.pieceError = null;
+        this.pieceMeta.err = null;
     }
 
-    onUpdateProperty({key, value}) {
-        if(this.piece && key in this.piece) {
+    onUpdateProperty({ key, value }) {
+        if (this.piece && key in this.piece) {
             this.piece[key] = value;
         } else {
             throw new Error('There is no piece defined in PieceStore or the piece object does not have the property you\'re looking for.');
         }
     }
-
-    onPieceFailed(err) {
-        this.pieceError = err;
-    }
 }
 
 export default alt.createStore(PieceStore, 'PieceStore');
diff --git a/js/stores/prize_list_store.js b/js/stores/prize_list_store.js
deleted file mode 100644
index 87b94f01..00000000
--- a/js/stores/prize_list_store.js
+++ /dev/null
@@ -1,20 +0,0 @@
-'use strict';
-
-import { alt } from '../alt';
-
-import PrizeListActions from '../actions/prize_list_actions';
-
-class PrizeListStore {
-    constructor() {
-        this.prizeList = [];
-        this.prizeListCount = -1;
-        this.bindActions(PrizeListActions);
-    }
-
-    onUpdatePrizeList({ prizeList, prizeListCount }) {
-        this.prizeList = prizeList;
-        this.prizeListCount = prizeListCount;
-    }
-}
-
-export default alt.createStore(PrizeListStore, 'PrizeListStore');
\ No newline at end of file
diff --git a/js/stores/user_store.js b/js/stores/user_store.js
index 4d4c5022..7e0e49b0 100644
--- a/js/stores/user_store.js
+++ b/js/stores/user_store.js
@@ -1,6 +1,7 @@
 'use strict';
 
 import { altUser } from '../alt';
+
 import UserActions from '../actions/user_actions';
 
 import UserSource from '../sources/user_source';
@@ -10,7 +11,6 @@ class UserStore {
     constructor() {
         this.currentUser = {};
         this.userMeta = {
-            invalidateCache: false,
             err: null
         };
 
@@ -19,24 +19,30 @@ class UserStore {
     }
 
     onFetchCurrentUser(invalidateCache) {
-        this.userMeta.invalidateCache = invalidateCache;
-
-        if(!this.getInstance().isLoading()) {
-            this.getInstance().lookupCurrentUser();
+        if (invalidateCache || !this.getInstance().isLoading()) {
+            this.getInstance().lookupCurrentUser(invalidateCache);
         }
+
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
     }
 
-    onSuccessFetchCurrentUser({users: [user]}) {
-        this.userMeta.invalidateCache = false;
+    onSuccessFetchCurrentUser({ users: [ user = {} ] }) {
         this.userMeta.err = null;
         this.currentUser = user;
     }
 
     onLogoutCurrentUser() {
         this.getInstance().performLogoutCurrentUser();
+
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
     }
 
     onSuccessLogoutCurrentUser() {
+        this.userMeta.err = null;
         this.currentUser = {};
     }
 
diff --git a/js/stores/webhook_store.js b/js/stores/webhook_store.js
index 7dfcc61d..ebc84d51 100644
--- a/js/stores/webhook_store.js
+++ b/js/stores/webhook_store.js
@@ -1,6 +1,7 @@
 'use strict';
 
 import { alt } from '../alt';
+
 import WebhookActions from '../actions/webhook_actions';
 
 import WebhookSource from '../sources/webhook_source';
@@ -10,12 +11,9 @@ class WebhookStore {
         this.webhooks = [];
         this.webhookEvents = [];
         this.webhookMeta = {
-            invalidateCache: false,
-            err: null,
-            idToDelete: null
+            err: null
         };
         this.webhookEventsMeta = {
-            invalidateCache: false,
             err: null
         };
 
@@ -24,54 +22,57 @@ class WebhookStore {
     }
 
     onFetchWebhooks(invalidateCache) {
-        this.webhookMeta.invalidateCache = invalidateCache;
-        this.getInstance().lookupWebhooks();
+        if (invalidateCache || !this.getInstance().isLoading()) {
+            this.getInstance().lookupWebhooks(invalidateCache);
+        }
+
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
     }
 
-    onSuccessFetchWebhooks({ webhooks }) {
-        this.webhookMeta.invalidateCache = false;
+    onSuccessFetchWebhooks({ webhooks = [] }) {
         this.webhookMeta.err = null;
         this.webhooks = webhooks;
 
-        this.webhookEventsMeta.invalidateCache = true;
-        this.getInstance().lookupWebhookEvents();
+        this.onFetchWebhookEvents(true);
     }
 
     onFetchWebhookEvents(invalidateCache) {
-        this.webhookEventsMeta.invalidateCache = invalidateCache;
-        this.getInstance().lookupWebhookEvents();
+        if (invalidateCache || !this.getInstance().isLoading()) {
+            this.getInstance().lookupWebhookEvents(invalidateCache);
+        }
+
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
     }
 
     onSuccessFetchWebhookEvents({ events }) {
-        this.webhookEventsMeta.invalidateCache = false;
         this.webhookEventsMeta.err = null;
 
         // remove all events that have already been used.
         const usedEvents = this.webhooks
-                                .reduce((tempUsedEvents, webhook) => {
-                                    tempUsedEvents.push(webhook.event.split('.')[0]);
-                                    return tempUsedEvents;
-                                }, []);
+                               .reduce((tempUsedEvents, webhook) => {
+                                   tempUsedEvents.push(webhook.event.split('.')[0]);
+                                   return tempUsedEvents;
+                               }, []);
 
         this.webhookEvents = events.filter((event) => {
             return usedEvents.indexOf(event) === -1;
         });
     }
 
-    onRemoveWebhook(id) {
-        this.webhookMeta.invalidateCache = true;
-        this.webhookMeta.idToDelete = id;
+    onRemoveWebhook(webhookId) {
+        this.getInstance().performRemoveWebhook(webhookId);
 
-        if(!this.getInstance().isLoading()) {
-            this.getInstance().performRemoveWebhook();
-        }
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
     }
 
     onSuccessRemoveWebhook() {
-        this.webhookMeta.idToDelete = null;
-        if(!this.getInstance().isLoading()) {
-            this.getInstance().lookupWebhooks();
-        }
+        this.getInstance().lookupWebhooks(true);
     }
 
     onErrorWebhooks(err) {
diff --git a/js/stores/whitelabel_store.js b/js/stores/whitelabel_store.js
index 7ad7495a..a2664ccb 100644
--- a/js/stores/whitelabel_store.js
+++ b/js/stores/whitelabel_store.js
@@ -1,7 +1,9 @@
 'use strict';
 
 import { altWhitelabel } from '../alt';
+
 import WhitelabelActions from '../actions/whitelabel_actions';
+
 import WhitelabelSource from '../sources/whitelabel_source';
 
 
@@ -9,7 +11,6 @@ class WhitelabelStore {
     constructor() {
         this.whitelabel = {};
         this.whitelabelMeta = {
-            invalidateCache: false,
             err: null
         };
 
@@ -18,15 +19,16 @@ class WhitelabelStore {
     }
 
     onFetchWhitelabel(invalidateCache) {
-        this.whitelabelMeta.invalidateCache = invalidateCache;
-
-        if(!this.getInstance().isLoading()) {
-            this.getInstance().lookupWhitelabel();
+        if (invalidateCache || !this.getInstance().isLoading()) {
+            this.getInstance().lookupWhitelabel(invalidateCache);
         }
+
+        // Prevent alt from sending an empty change event when a request is sent
+        // off to the source
+        this.preventDefault();
     }
 
-    onSuccessFetchWhitelabel({ whitelabel }) {
-        this.whitelabelMeta.invalidateCache = false;
+    onSuccessFetchWhitelabel({ whitelabel = {} }) {
         this.whitelabelMeta.err = null;
         this.whitelabel = whitelabel;
     }
diff --git a/js/third_party/debug.js b/js/third_party/debug_handler.js
similarity index 99%
rename from js/third_party/debug.js
rename to js/third_party/debug_handler.js
index 23fe4d04..cd11bf72 100644
--- a/js/third_party/debug.js
+++ b/js/third_party/debug_handler.js
@@ -4,7 +4,6 @@ import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 
-
 class DebugHandler {
     constructor() {
         let symbols = [];
diff --git a/js/third_party/facebook.js b/js/third_party/facebook_handler.js
similarity index 67%
rename from js/third_party/facebook.js
rename to js/third_party/facebook_handler.js
index eab0b0e0..9e40e7ab 100644
--- a/js/third_party/facebook.js
+++ b/js/third_party/facebook_handler.js
@@ -1,13 +1,18 @@
 'use strict';
 
 import { altThirdParty } from '../alt';
+
 import EventActions from '../actions/event_actions';
+import FacebookActions from '../actions/facebook_actions';
 
 import AppConstants from '../constants/application_constants'
 
 class FacebookHandler {
     constructor() {
+        this.loaded = false;
+
         this.bindActions(EventActions);
+        this.bindActions(FacebookActions);
     }
 
     onApplicationWillBoot(settings) {
@@ -16,15 +21,19 @@ class FacebookHandler {
         window.fbAsyncInit = () => {
             FB.init({
                 appId: AppConstants.facebook.appId,
-                // Force FB to parse everything on first load to make sure all the XFBML components are initialized.
-                // If we don't do this, we can run into issues with components on the first load who are not be
-                // initialized.
-                xfbml: true,
+                // Don't parse anything on the first load as we will parse all XFBML components as necessary.
+                xfbml: false,
                 version: 'v2.5',
                 cookie: false
             });
+
+            FacebookActions.sdkReady();
         };
     }
+
+    onSdkReady() {
+        this.loaded = true;
+    }
 }
 
 export default altThirdParty.createStore(FacebookHandler, 'FacebookHandler');
diff --git a/js/third_party/ga.js b/js/third_party/ga_handler.js
similarity index 100%
rename from js/third_party/ga.js
rename to js/third_party/ga_handler.js
diff --git a/js/third_party/intercom.js b/js/third_party/intercom_handler.js
similarity index 100%
rename from js/third_party/intercom.js
rename to js/third_party/intercom_handler.js
diff --git a/js/third_party/notifications.js b/js/third_party/notifications_handler.js
similarity index 89%
rename from js/third_party/notifications.js
rename to js/third_party/notifications_handler.js
index 85379479..6820617e 100644
--- a/js/third_party/notifications.js
+++ b/js/third_party/notifications_handler.js
@@ -22,14 +22,14 @@ class NotificationsHandler {
             return;
         }
 
-        let subdomain = getSubdomain();
+        const subdomain = getSubdomain();
         if (subdomain === 'ikonotv') {
             NotificationActions.fetchContractAgreementListNotifications().then(
                 (res) => {
                     if (res.notifications && res.notifications.length > 0) {
                         this.loaded = true;
                         console.log('Contractagreement notifications loaded');
-                        history.pushState(null, '/contract_notifications');
+                        history.push('/contract_notifications');
                     }
                 }
             );
diff --git a/js/third_party/raven.js b/js/third_party/raven_handler.js
similarity index 100%
rename from js/third_party/raven.js
rename to js/third_party/raven_handler.js
diff --git a/js/utils/error_utils.js b/js/utils/error_utils.js
index 753bbf61..a29f59a0 100644
--- a/js/utils/error_utils.js
+++ b/js/utils/error_utils.js
@@ -13,27 +13,50 @@ import AppConstants from '../constants/application_constants';
  * @param  {boolean} ignoreSentry Defines whether or not the error should be submitted to Sentry
  * @param  {string} comment  Will also be submitted to Sentry, but will not be logged
  */
-function logGlobal(error, ignoreSentry = AppConstants.errorMessagesToIgnore.indexOf(error.message) > -1,
-                   comment) {
+function logGlobal(error, comment, ignoreSentry) {
     console.error(error);
 
-    if(!ignoreSentry) {
-        if(comment) {
-            Raven.captureException(error, {extra: { comment }});
-        } else {
-            Raven.captureException(error);
-        }
+    if (!ignoreSentry) {
+        Raven.captureException(error, comment ? { extra: { comment } } : undefined);
     }
-    
 }
 
 export function initLogging() {
     // Initialize Raven for logging on Sentry
     Raven.config(AppConstants.raven.url, {
-        release: AppConstants.version
+        release: AppConstants.version,
+        ignoreErrors: AppConstants.errorMessagesToIgnore
     }).install();
 
     window.onerror = Raven.process;
 
     console.logGlobal = logGlobal;
-}
\ No newline at end of file
+}
+
+/*
+ * Gets the json errors from the error as an array
+ * @param  {Error} error A Javascript error
+ * @return {Array}       List of json errors
+ */
+export function getJsonErrorsAsArray(error) {
+    const { json: { errors = {} } = {} } = error;
+
+    const errorArrays = Object
+        .keys(errors)
+        .map((errorKey) => {
+            return errors[errorKey];
+        });
+
+    // Collapse each errorKey's errors into a flat array
+    return [].concat(...errorArrays);
+}
+
+/*
+ * Tries to get an error message from the error, either by using its notification
+ * property or first json error (if any)
+ * @param  {Error} error A Javascript error
+ * @return {string}      Error message string
+ */
+export function getErrorNotificationMessage(error) {
+    return (error && error.notification) || getJsonErrorsAsArray(error)[0] || '';
+}
diff --git a/js/utils/form_utils.js b/js/utils/form_utils.js
index 8d12a8c1..0581b28b 100644
--- a/js/utils/form_utils.js
+++ b/js/utils/form_utils.js
@@ -2,8 +2,34 @@
 
 import { getLangText } from './lang_utils';
 
+import GlobalNotificationActions from '../actions/global_notification_actions';
+import GlobalNotificationModel from '../models/global_notification_model';
+
 import AppConstants from '../constants/application_constants';
 
+/**
+ * Validates a given list of forms
+ * @param  {Form} forms                      List of forms, each of which should have a `validate` method available
+ * @param  {boolean} showFailureNotification Show global notification if there are validation failures
+ * @return {boolean}                         True if validation did *NOT* catch any errors
+ */
+export function validateForms(forms, showFailureNotification) {
+    const validationSuccessful = forms.reduce((result, form) => {
+        if (form && typeof form.validate === 'function') {
+            return form.validate() && result;
+        } else {
+            throw new Error('Form given for validation does not have a `validate` method');
+        }
+    }, true);
+
+    if (!validationSuccessful && showFailureNotification) {
+        const notification = new GlobalNotificationModel(getLangText('Oops, there may be missing or invalid fields. Please check your inputs again.'), 'danger');
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    }
+
+    return validationSuccessful;
+}
+
 /**
  * Get the data ids of the given piece or editions.
  * @param  {boolean} isPiece                   Is the given entities parameter a piece? (False: array of editions)
diff --git a/js/utils/general_utils.js b/js/utils/general_utils.js
index e81a806d..c245cef6 100644
--- a/js/utils/general_utils.js
+++ b/js/utils/general_utils.js
@@ -84,8 +84,6 @@ export function formatText() {
  * Checks a list of objects for key duplicates and returns a boolean
  */
 function _doesObjectListHaveDuplicates(l) {
-    let mergedList = [];
-
     l = l.map((obj) => {
         if(!obj) {
             throw new Error('The object you are trying to merge is null instead of an empty object');
@@ -94,11 +92,11 @@ function _doesObjectListHaveDuplicates(l) {
         return Object.keys(obj);
     });
 
-    // Taken from: http://stackoverflow.com/a/10865042
+    // Taken from: http://stackoverflow.com/a/10865042 (but even better with rest)
     // How to flatten an array of arrays in javascript.
     // If two objects contain the same key, then these two keys
     // will actually be represented in the merged array
-    mergedList = mergedList.concat.apply(mergedList, l);
+    let mergedList = [].concat(...l);
 
     // Taken from: http://stackoverflow.com/a/7376645/1263876
     // By casting the array to a set, and then checking if the size of the array
diff --git a/js/utils/requests.js b/js/utils/requests.js
index d9c5288d..fec31c00 100644
--- a/js/utils/requests.js
+++ b/js/utils/requests.js
@@ -10,71 +10,67 @@ import { argsToQueryParams } from '../utils/url_utils';
 
 
 class Requests {
-    unpackResponse(response) {
-        if (response.status >= 500) {
-            let err = new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url);
-
-            return response
-                .text()
-                .then((resText) => {
-                    const resJson = JSON.parse(resText);
-                    err = new Error(resJson.errors.pop());
-
-                    // ES6 promises don't have a .finally() clause so
-                    // we fake that here by forcing the .catch() clause
-                    // to run
-                    return Promise.reject();
-                })
-                .catch(() => { throw err; });
-        }
-
-        return Q.Promise((resolve, reject) => {
-            response.text()
-                .then((responseText) => {
-                    // If the responses' body does not contain any data,
-                    // fetch will resolve responseText to the string 'None'.
-                    // If this is the case, we can not try to parse it as JSON.
-                    if(responseText !== 'None') {
-                        let body = JSON.parse(responseText);
-
-                        if(body && body.errors) {
-                            let error = new Error('Form Error');
-                            error.json = body;
-                            reject(error);
-                        } else if(body && body.detail) {
-                            reject(new Error(body.detail));
-                        } else if('success' in body && !body.success) {
-                            let error = new Error('Client Request Error');
-                            error.json = {
-                                status: response.status,
-                                statusText: response.statusText,
-                                type: response.type,
-                                url: response.url
-                            };
-                            reject(error);
-                        } else {
-                            resolve(body);
-                        }
-
-                    } else {
-                        if(response.status >= 400) {
-                            reject(new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url));
-                        } else {
-                            resolve({});
-                        }
-                    }
-                }).catch(reject);
-            });
-    }
-
-    handleError(url) {
-        return (err) => {
-            if (err instanceof TypeError) {
+    unpackResponse(url) {
+        return (response) => {
+            if (response == null) {
                 throw new Error('For: ' + url + ' - Server did not respond to the request. (Not even displayed a 500)');
-            } else {
-                throw err;
             }
-        };
+
+            if (response.status >= 500) {
+                let err = new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url);
+
+                return response
+                    .text()
+                    .then((resText) => {
+                        const resJson = JSON.parse(resText);
+                        err = new Error(resJson.errors.pop());
+
+                        // ES6 promises don't have a .finally() clause so
+                        // we fake that here by forcing the .catch() clause
+                        // to run
+                        return Promise.reject();
+                    })
+                    .catch(() => { throw err; });
+            }
+
+            return Q.Promise((resolve, reject) => {
+                response.text()
+                    .then((responseText) => {
+                        // If the responses' body does not contain any data,
+                        // fetch will resolve responseText to the string 'None'.
+                        // If this is the case, we can not try to parse it as JSON.
+                        if(responseText !== 'None') {
+                            let body = JSON.parse(responseText);
+
+                            if(body && body.errors) {
+                                let error = new Error('Form Error');
+                                error.json = body;
+                                reject(error);
+                            } else if(body && body.detail) {
+                                reject(new Error(body.detail));
+                            } else if('success' in body && !body.success) {
+                                let error = new Error('Client Request Error');
+                                error.json = {
+                                    status: response.status,
+                                    statusText: response.statusText,
+                                    type: response.type,
+                                    url: response.url
+                                };
+                                reject(error);
+                            } else {
+                                resolve(body);
+                            }
+
+                        } else {
+                            if(response.status >= 400) {
+                                reject(new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url));
+                            } else {
+                                resolve({});
+                            }
+                        }
+                    }).catch(reject);
+            });
+        }
     }
 
     getUrl(url) {
@@ -128,8 +124,7 @@ class Requests {
         }
         merged.method = verb;
         return fetch(url, merged)
-                    .then(this.unpackResponse)
-                    .catch(this.handleError(url));
+                    .then(this.unpackResponse(url));
     }
 
     get(url, params) {
diff --git a/js/utils/url_utils.js b/js/utils/url_utils.js
index 86c8dfc5..94584026 100644
--- a/js/utils/url_utils.js
+++ b/js/utils/url_utils.js
@@ -2,7 +2,7 @@
 
 import camelCase from 'camelcase';
 import decamelize from 'decamelize';
-import qs from 'qs';
+import queryString from 'query-string';
 
 import { sanitize } from './general_utils';
 
@@ -36,8 +36,7 @@ export function argsToQueryParams(obj) {
             queryParamObj[decamelize(key)] = sanitizedObj[key];
         });
 
-    // Use bracket arrayFormat as history.js and react-router use it
-    return '?' + qs.stringify(queryParamObj, { arrayFormat: 'brackets' });
+    return '?' + queryString.stringify(queryParamObj);
 }
 
 /**
@@ -56,13 +55,13 @@ export function getCurrentQueryParams() {
  * @return {object}                  Query params dictionary
  */
 export function queryParamsToArgs(queryParamString) {
-    const qsQueryParamObj = qs.parse(queryParamString);
+    const queryParamObj = queryString.parse(queryParamString);
     const camelCaseParamObj = {};
 
     Object
-        .keys(qsQueryParamObj)
+        .keys(queryParamObj)
         .forEach((key) => {
-            camelCaseParamObj[camelCase(key)] = qsQueryParamObj[key];
+            camelCaseParamObj[camelCase(key)] = queryParamObj[key];
         });
 
     return camelCaseParamObj;
diff --git a/package.json b/package.json
index be5c1202..c961e9c3 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
   "devDependencies": {
     "babel-eslint": "^3.1.11",
     "babel-jest": "^5.2.0",
+    "gulp-sass": "^2.1.1",
     "jest-cli": "^0.4.0"
   },
   "dependencies": {
@@ -47,6 +48,7 @@
     "browserify": "^9.0.8",
     "browserify-shim": "^3.8.10",
     "camelcase": "^1.2.1",
+    "classlist-polyfill": "^1.0.2",
     "classnames": "^1.2.2",
     "compression": "^1.4.4",
     "decamelize": "^1.1.1",
@@ -66,7 +68,7 @@
     "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.4",
     "harmonize": "^1.4.2",
-    "history": "^1.13.1",
+    "history": "1.17.0",
     "invariant": "^2.1.1",
     "isomorphic-fetch": "^2.0.2",
     "jest-cli": "^0.4.0",
@@ -75,12 +77,12 @@
     "object-assign": "^2.0.0",
     "opn": "^3.0.2",
     "q": "^1.4.1",
-    "qs": "^4.0.0",
+    "query-string": "^3.0.0",
     "raven-js": "^1.1.19",
     "react": "0.13.2",
     "react-bootstrap": "0.25.1",
     "react-datepicker": "^0.12.0",
-    "react-router": "1.0.0",
+    "react-router": "1.0.3",
     "react-router-bootstrap": "^0.19.0",
     "react-star-rating": "~1.3.2",
     "react-textarea-autosize": "^2.5.2",
diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss
index 96b97783..55fe2868 100644
--- a/sass/ascribe_custom_style.scss
+++ b/sass/ascribe_custom_style.scss
@@ -447,9 +447,9 @@ fieldset[disabled] .btn-secondary.active {
 }
 
 .search-bar > .form-group > .input-group {
-    border: 1px solid rgba(0, 0, 0, 0);
+    border: 1px solid $ascribe-blue-border;
     &:hover, &:focus, &:active {
-        border-color: $ascribe-blue-border;
+        border-color: $ascribe-blue-border-active;
     }
     input::-webkit-input-placeholder {
         color: rgba($ascribe-dark-blue, 0.5);
diff --git a/sass/ascribe_footer.scss b/sass/ascribe_footer.scss
index 85f3439d..4824d1ef 100644
--- a/sass/ascribe_footer.scss
+++ b/sass/ascribe_footer.scss
@@ -1,4 +1,3 @@
-
 .ascribe-footer {
     text-align: center;
     margin-top: 5em;
diff --git a/sass/ascribe_form.scss b/sass/ascribe_form.scss
index 1b265e91..4b724e45 100644
--- a/sass/ascribe_form.scss
+++ b/sass/ascribe_form.scss
@@ -23,4 +23,14 @@
     @media (max-width: 550px) {
         width: 100%;
     }
-}
\ No newline at end of file
+}
+
+.ascribe-form-btn-container-left {
+    float: left;
+    padding: 0 2px 2px 0;
+}
+
+.ascribe-form-btn-container-right {
+    float: right;
+    padding: 0 0 2px 2px;
+}
diff --git a/sass/ascribe_print.scss b/sass/ascribe_print.scss
new file mode 100644
index 00000000..973e36ed
--- /dev/null
+++ b/sass/ascribe_print.scss
@@ -0,0 +1,118 @@
+@media print {
+    @page {
+        margin: 1.2cm;
+    }
+
+    .ascribe-default-app {
+        padding: 0 !important;
+    }
+
+    // Utility class to not automatically expand an anchor href after the text
+    .anchor-no-expand-print:after {
+        content: '' !important;
+    }
+
+    // Replace navbar header with ascribe logo
+    .ascribe-print-header {
+        border-bottom: 1px solid rgba(0, 60, 105, 0.1);
+        font-size: 1.2em;
+        margin: 0.5em 0;
+        text-align: center;
+    }
+
+    // Force left and right columns
+    .ascribe-print-col-left {
+        width: 50% !important;
+        float: left !important;
+    }
+    .ascribe-print-col-right {
+        width: 50% !important;
+        float: right !important;
+    }
+
+    // Restyle file uploader dialogs
+    .file-drag-and-drop {
+        padding-top: 0;
+        outline-width: 0;
+        text-align: left;
+    }
+
+    .file-drag-and-drop-position {
+        margin: 0;
+    }
+
+    // Restyle COA
+    .ascribe-coa-print-placeholder {
+        padding: 0 1.5em 1em 1.5em;
+        margin: 0;
+    }
+
+    // Force collapsible properties to be expanded
+    .ascribe-collapsible-content .collapse {
+        display: block;
+    }
+
+    // Decrease property spacing
+    .ascribe-property-wrapper {
+        padding-bottom: 0.5em;
+    }
+
+    .ascribe-property {
+        padding-top: 0.5em;
+
+        > div,
+        > input,
+        > p,
+        > pre,
+        > select,
+        > span:not(.glyphicon),
+        > textarea {
+            margin: 0;
+        }
+    }
+
+    .ascribe-collapsible-wrapper {
+        margin-bottom: 5px;
+
+        > div:first-child {
+            margin-top: 0;
+            padding-bottom: 5px;
+        }
+    }
+
+    .ascribe-form hr {
+        margin-bottom: 3px;
+    }
+
+    // Hide placeholder text
+    input::-webkit-input-placeholder {
+        opacity: 0;
+    }
+    textarea::-webkit-input-placeholder {
+        opacity: 0;
+    }
+
+    /* firefox 18- */
+    input:-moz-placeholder {
+        opacity: 0;
+    }
+    textarea:-moz-placeholder {
+        opacity: 0;
+    }
+
+    /* firefox 19+ */
+    input::-moz-placeholder {
+        opacity: 0;
+    }
+    textarea::-moz-placeholder {
+        opacity: 0;
+    }
+
+    /* ie */
+    input:-ms-input-placeholder {
+        opacity: 0;
+    }
+    textarea:-ms-input-placeholder  {
+        opacity: 0;
+    }
+}
diff --git a/sass/ascribe_social_share.scss b/sass/ascribe_social_share.scss
index 0a577fb6..64e6e06b 100644
--- a/sass/ascribe_social_share.scss
+++ b/sass/ascribe_social_share.scss
@@ -7,4 +7,8 @@
     width: 56px;
     box-sizing: content-box;   /* We want to ignore padding in these calculations as we use the sdk buttons' height and width */
     padding: 1px 0;
+
+    &:not(:first-child) {
+        margin-left: 1px;
+    }
 }
diff --git a/sass/ascribe_uploader.scss b/sass/ascribe_uploader.scss
index e6dd66cc..fc772cd6 100644
--- a/sass/ascribe_uploader.scss
+++ b/sass/ascribe_uploader.scss
@@ -28,9 +28,9 @@
 }
 
 .file-drag-and-drop-dialog {
-    margin: 1.5em 0 1.5em 0;
-    
-    > p:first-child {
+    margin: 0 0 1.5em 0;
+
+    .file-drag-and-drop-dialog-title {
         font-size: 1.5em !important;
         margin-bottom: 0;
         margin-top: 0;
@@ -47,14 +47,6 @@
     margin: 1.5em 0 0 0;
 }
 
-.file-drag-and-drop .file-drag-and-drop-dialog > p:first-child {
-    font-size: 1.5em !important;
-
-    margin-top: 0;
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-
 .file-drag-and-drop-position {
     display: inline-block;
     margin-left: .7em;
@@ -138,6 +130,7 @@
     text-align: center;
     width: 104px;
 
+    // REFACTOR TO USE TABLE CELL
     .action-file, .spinner-file, .icon-ascribe-ok {
         margin-top: 1em;
         line-height: 1.3;
@@ -200,4 +193,4 @@
     span + .btn {
         margin-left: 1em;
     }
-}
\ No newline at end of file
+}
diff --git a/sass/ascribe_variables.scss b/sass/ascribe_variables.scss
index c3263f4d..cdff14da 100644
--- a/sass/ascribe_variables.scss
+++ b/sass/ascribe_variables.scss
@@ -5,6 +5,7 @@ $ascribe-light-blue: #D3DEE4;
 $ascribe-white: #F8F8F8;
 $ascribe-pink: #D10074;
 $ascribe-blue-border: rgba(0, 60, 105, 0.1);
+$ascribe-blue-border-active: rgba(0, 60, 105, 0.2);
 $ascribe-red-error: rgb(169, 68, 66);
 
 
diff --git a/sass/main.scss b/sass/main.scss
index 5cc91e9a..9ca2a07a 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -44,6 +44,8 @@ $BASE_URL: '<%= BASE_URL %>';
 
 @import 'whitelabel/index';
 
+@import 'ascribe_print';
+
 
 html,
 body {
@@ -59,6 +61,7 @@ html {
 .ascribe-default-app {
     overflow-x: hidden;
     padding-top: 70px;
+    padding-bottom: 10px;
 }
 
 hr {
@@ -105,6 +108,12 @@ hr {
     color: $ascribe-dark-blue;
 }
 
+.add-overflow-ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
 .ascribe-subheader {
     padding-bottom: 10px;
     margin-top: -10px;
diff --git a/sass/whitelabel/prize/index.scss b/sass/whitelabel/prize/index.scss
index 24645c8a..dfdcaebd 100644
--- a/sass/whitelabel/prize/index.scss
+++ b/sass/whitelabel/prize/index.scss
@@ -3,6 +3,13 @@
 
 .ascribe-prize-app {
     border-radius: 0;
-    padding-top: 70px;
     min-height: 100vh;
+    padding-top: 70px;
+    padding-bottom: 10px;
+}
+
+@media print {
+    .ascribe-prize-app {
+        padding: 0 !important;
+    }
 }
diff --git a/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss b/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
index d8ccd858..0759cf49 100644
--- a/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
+++ b/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
@@ -2,7 +2,6 @@ $pr--nav-fg-prim-color: black;
 $pr--button-color: $pr--nav-fg-prim-color;
 
 .client--portfolioreview {
-    padding-top: 0 !important;
 
     .btn-wide,
     .btn-default {
@@ -23,10 +22,59 @@ $pr--button-color: $pr--nav-fg-prim-color;
         }
     }
 
+    .navbar-default {
+        .navbar-nav > .ascribe-powered-by, li > a {
+            color: $pr--button-color !important;
+        }
+
+        .active a {
+            border-bottom-color: $pr--button-color !important;
+            color: $pr--button-color !important;
+        }
+    }
+
+    .search-bar > .form-group > .input-group input {
+        &::-webkit-input-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+        &::-moz-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+        &:-ms-input-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+        &:-moz-placeholder {
+            color: rgba($pr--button-color, 0.5);
+        }
+    }
+
+    .icon-ascribe-search {
+        color: $pr--button-color;
+    }
+
+    // filter widget
+    .ascribe-piece-list-toolbar-filter-widget button {
+        background-color: transparent !important;
+        border-color: transparent !important;
+        color: $pr--button-color !important;
+
+        &:hover,
+        &:active {
+            background-color: $pr--button-color !important;
+            border-color: $pr--button-color !important;
+            color: white !important;
+        }
+    }
+
     .ascribe-property {
-        > p > span:not(> .span),
-        > textarea,
-        > input {
+        > div,
+        > input,
+        > pre,
+        > select,
+        > span:not(.glyphicon),
+        > p,
+        > p > span,
+        > textarea {
             color: $pr--nav-fg-prim-color;
         }
     }
@@ -97,4 +145,10 @@ $pr--button-color: $pr--nav-fg-prim-color;
             text-transform: capitalize;
         }
     }
-}
\ No newline at end of file
+
+    // intercom
+    #intercom-container .intercom-launcher-button {
+        background-color: $pr--button-color !important;
+        border-color: $pr--button-color !important;
+    }
+}
diff --git a/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss b/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
index a5026272..8bf729a8 100644
--- a/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
+++ b/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
@@ -238,7 +238,7 @@ $vivi23--highlight-color: #de2600;
         &.active:hover{
             background-color: $vivi23--highlight-color;
             border-color: $vivi23--highlight-color;
-            color: $vivi23--highlight-color;
+            color: $vivi23--bg-color;
         }
     }
 
diff --git a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
index 6c4223ac..9af18fcf 100644
--- a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
+++ b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
@@ -1,6 +1,7 @@
 $cyland--nav-bg-color: #fcfcfc;
 $cyland--nav-fg-prim-color: #1E1E1E;
 $cyland--button-color: $cyland--nav-fg-prim-color;
+$cyland--button-sec-color: #515151;
 
 .client--cyland {
     .navbar-default {
@@ -117,8 +118,8 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
         &.active:hover,
         &.active:focus,
         &.active.focus {
-            background-color: $cyland--button-color;
-            border-color: $cyland--button-color;
+            background-color: $cyland--button-sec-color;
+            border-color: $cyland--button-sec-color;
             color: white;
         }
     }
@@ -234,4 +235,4 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
 
 .client--cyland  .upload-button-wrapper > span {
     color: $cyland--button-color;
-}
\ No newline at end of file
+}
diff --git a/sass/whitelabel/wallet/index.scss b/sass/whitelabel/wallet/index.scss
index 01c374d9..647bb16c 100644
--- a/sass/whitelabel/wallet/index.scss
+++ b/sass/whitelabel/wallet/index.scss
@@ -5,6 +5,13 @@
 
 .ascribe-wallet-app {
     border-radius: 0;
-    padding-top: 70px;
     min-height: 100vh;
+    padding-top: 70px;
+    padding-bottom: 10px;
+}
+
+@media print {
+    .ascribe-wallet-app {
+        padding: 0 !important;
+    }
 }