diff --git a/js/components/ascribe_accordion_list/accordion_list_item.js b/js/components/ascribe_accordion_list/accordion_list_item.js
index 69d4bae5..1694b171 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item.js
@@ -63,7 +63,7 @@ let AccordionListItem = React.createClass({
                             <div>
                                 <span>{this.props.content.date_created.split('-')[0]}</span>
                                 <AccordionListItemEditionWidget
-                                    piece={this.props.content} />
+                                    piece={this.props.content}/>
                                 {/* <a href={this.props.content.license_type.url} target="_blank" className="pull-right">
                                     {getLangText('%s license', this.props.content.license_type.code)}
                                 </a> */}
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 92a8a1c4..08a676b3 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
@@ -53,9 +53,16 @@ let AccordionListItemEditionWidget = React.createClass({
         let isEditionListOpen = this.state.isEditionListOpenForPieceId[pieceId] ? this.state.isEditionListOpenForPieceId[pieceId].show : false;
         
         if(isEditionListOpen) {
-            return (
-                <span className="glyphicon glyphicon-menu-up" aria-hidden="true" style={{top: 2}}></span>
-            );
+            if(typeof this.state.editionList[pieceId] === 'undefined') {
+                return (
+                    <span className="glyph-ascribe-spool-chunked ascribe-color spin"/>
+                );
+            } else {
+                return (
+                    <span className="glyphicon glyphicon-menu-up" aria-hidden="true" style={{top: 2}}></span>
+                );
+            }
+            
         } else {
             return (
                 <span className="glyphicon glyphicon-menu-down" aria-hidden="true" style={{top: 2}}></span>
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 3f588293..0ebdb2ab 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
@@ -92,6 +92,7 @@ let AccordionListItemTableEditions = React.createClass({
         let showExpandOption = false;
 
         let editionsForPiece = this.state.editionList[this.props.parentId];
+        let loadingSpinner = <span className="glyph-ascribe-spool-chunked ascribe-color spin"/>;
 
         // 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
@@ -177,8 +178,6 @@ let AccordionListItemTableEditions = React.createClass({
             )
         ];
 
-        let loadingSpinner = <span className="glyph-ascribe-spool-chunked ascribe-color spin"/>;
-
         if(show && editionsForPiece && editionsForPiece.length > 0) {
             return (
                 <div className={this.props.className}>
@@ -194,7 +193,7 @@ let AccordionListItemTableEditions = React.createClass({
                     <AccordionListItemTableToggle
                         className="ascribe-accordion-list-table-toggle"
                         onClick={this.loadFurtherEditions}
-                        message={show && showExpandOption ? <span><span className="glyphicon glyphicon-option-horizontal" aria-hidden="true" style={{top: 3}}></span> Show me more {this.state.showMoreLoading ? loadingSpinner : null}</span> : ''} />
+                        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} />
                 </div>
             );
         } else {
diff --git a/js/components/piece_list.js b/js/components/piece_list.js
index 04f776e3..dc329444 100644
--- a/js/components/piece_list.js
+++ b/js/components/piece_list.js
@@ -47,7 +47,10 @@ let PieceList = React.createClass({
     },
 
     paginationGoToPage(page) {
+        // if the users clicks a pager of the pagination,
+        // the site should go to the top
         document.body.scrollTop = document.documentElement.scrollTop = 0;
+
         return () => PieceListActions.fetchPieceList(page, this.state.pageSize,
                                                       this.state.search, this.state.orderBy,
                                                       this.state.orderAsc);
@@ -67,6 +70,7 @@ let PieceList = React.createClass({
         let currentPage = parseInt(this.props.query.page, 10) || 1;
         let totalPages = Math.ceil(this.state.pieceListCount / this.state.pageSize);
         let loadingElement = (<img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />);
+        
         return (
             <div>
                 <PieceListToolbar