diff --git a/src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java b/src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java
index 3022b46386..9d776c933a 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/OrdersViewCB.java
@@ -145,12 +145,10 @@ public class OrdersViewCB extends CachedViewCB {
             ((ViewCB) childController).setParent(this);
 
         } catch (IOException e) {
-            log.error("Loading view failed. FxmlUrl = " + Navigation.Item.ACCOUNT_SETUP.getFxmlUrl());
+            log.error("Loading view failed. FxmlUrl = " + navigationItem.getFxmlUrl());
             e.printStackTrace();
         }
         return childController;
     }
-
-
 }
 
diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java
index 2000fa5f66..12d84ce779 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesModel.java
@@ -74,7 +74,7 @@ class ClosedTradesModel extends UIModel {
                 .forEach(e -> list.add(new ClosedTradesListItem(e)));
         tradeManager.getClosedTrades().addListener(mapChangeListener);
 
-        // we sort by date
+        // We sort by date, earliest first
         list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate()));
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java
index 335042e4ef..768961b088 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesPM.java
@@ -29,8 +29,10 @@ import org.slf4j.LoggerFactory;
 
 class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
     private static final Logger log = LoggerFactory.getLogger(ClosedTradesPM.class);
+
     private final BSFormatter formatter;
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -42,6 +44,7 @@ class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
         this.formatter = formatter;
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -70,15 +73,15 @@ class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
         super.terminate();
     }
 
-    public ObservableList<ClosedTradesListItem> getList() {
-        return model.getList();
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    public ObservableList<ClosedTradesListItem> getList() {
+        return model.getList();
+    }
+
     String getTradeId(ClosedTradesListItem item) {
         return item.getTrade().getId();
     }
@@ -103,15 +106,4 @@ class ClosedTradesPM extends PresentationModel<ClosedTradesModel> {
         return formatter.formatDateTime(item.getTrade().getDate());
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private methods
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-
 }
diff --git a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java
index e8adada021..33fafed35d 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java
@@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory;
 public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
     private static final Logger log = LoggerFactory.getLogger(ClosedTradesViewCB.class);
 
-
     @FXML TableColumn<ClosedTradesListItem, ClosedTradesListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, tradeIdColumn;
     @FXML TableView<ClosedTradesListItem> table;
diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java
index ea63461508..f83ad88129 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersModel.java
@@ -73,6 +73,10 @@ class OffersModel extends UIModel {
 
         list.clear();
         list.addAll(tradeManager.getOffers().values().stream().map(OfferListItem::new).collect(Collectors.toList()));
+
+        // we sort by date, earliest first
+        list.sort((o1, o2) -> o2.getOffer().getCreationDate().compareTo(o1.getOffer().getCreationDate()));
+
         tradeManager.getOffers().addListener(offerMapChangeListener);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java
index 4579fb74e0..fae99aaa6c 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersPM.java
@@ -29,8 +29,10 @@ import org.slf4j.LoggerFactory;
 
 class OffersPM extends PresentationModel<OffersModel> {
     private static final Logger log = LoggerFactory.getLogger(OffersPM.class);
+
     private final BSFormatter formatter;
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -42,6 +44,7 @@ class OffersPM extends PresentationModel<OffersModel> {
         this.formatter = formatter;
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -70,10 +73,6 @@ class OffersPM extends PresentationModel<OffersModel> {
         super.terminate();
     }
 
-    public ObservableList<OfferListItem> getList() {
-        return model.getList();
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Public methods
@@ -88,6 +87,10 @@ class OffersPM extends PresentationModel<OffersModel> {
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    public ObservableList<OfferListItem> getList() {
+        return model.getList();
+    }
+
     String getTradeId(OfferListItem item) {
         return item.getOffer().getId();
     }
@@ -112,15 +115,4 @@ class OffersPM extends PresentationModel<OffersModel> {
         return formatter.formatDateTime(item.getOffer().getCreationDate());
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private methods
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-
 }
diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java
index 0fddc4d0b7..9e67f33bd6 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java
@@ -37,7 +37,6 @@ import org.slf4j.LoggerFactory;
 public class OffersViewCB extends CachedViewCB<OffersPM> {
     private static final Logger log = LoggerFactory.getLogger(OffersViewCB.class);
 
-
     @FXML TableColumn<OfferListItem, OfferListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, offerIdColumn, removeItemColumn;
     @FXML TableView<OfferListItem> table;
diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java
index e15e016238..933f8656de 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java
@@ -108,7 +108,7 @@ class PendingTradesModel extends UIModel {
                 .forEach(e -> list.add(new PendingTradesListItem(e)));
         tradeManager.getPendingTrades().addListener(mapChangeListener);
 
-        // we sort by date
+        // we sort by date, earliest first
         list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate()));
 
         // select either currentPendingTrade or first in the list
@@ -205,6 +205,7 @@ class PendingTradesModel extends UIModel {
         }
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java
index d8621e92ea..517e7e5b4c 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java
@@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory;
 
 public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
     private static final Logger log = LoggerFactory.getLogger(PendingTradesPM.class);
-    private final BSFormatter formatter;
-    private InvalidationListener stateChangeListener;
 
     enum State {
         TAKER_SELLER_WAIT_TX_CONF,
@@ -51,6 +49,10 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
         OFFERER_BUYER_COMPLETED,
     }
 
+    private final BSFormatter formatter;
+
+    private InvalidationListener stateChangeListener;
+
     final StringProperty txId = new SimpleStringProperty();
     final ObjectProperty<State> state = new SimpleObjectProperty<>();
     final ObjectProperty<Throwable> fault = new SimpleObjectProperty<>();
@@ -128,6 +130,7 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
         model.closeSummary();
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml
index fe2f34c467..f19a2e7334 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesView.fxml
@@ -17,7 +17,6 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-
 <?import io.bitsquare.gui.components.InfoDisplay?>
 <?import io.bitsquare.gui.components.processbar.ProcessStepBar?>
 <?import io.bitsquare.gui.components.TextFieldWithCopyIcon?>
diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java
index b00ce2b07d..72d4c5aa3f 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java
@@ -48,6 +48,13 @@ import org.slf4j.LoggerFactory;
 public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
     private static final Logger log = LoggerFactory.getLogger(PendingTradesViewCB.class);
 
+    private ChangeListener<PendingTradesListItem> selectedItemChangeListener;
+    private ListChangeListener<PendingTradesListItem> listChangeListener;
+    private ChangeListener<String> txIdChangeListener;
+    private ChangeListener<PendingTradesPM.State> offererStateChangeListener;
+    private ChangeListener<PendingTradesPM.State> takerStateChangeListener;
+    private ChangeListener<Throwable> faultChangeListener;
+
     @FXML TitledGroupBg titledGroupBg, paymentsGroupBg, summaryGroupBg;
     @FXML ProcessStepBar processBar;
     @FXML Label statusLabel, txIdLabel, paymentMethodLabel, holderNameLabel, primaryIdLabel, secondaryIdLabel,
@@ -61,12 +68,6 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
     @FXML TableView<PendingTradesListItem> table;
     @FXML TableColumn<PendingTradesListItem, PendingTradesListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, tradeIdColumn, selectColumn;
-    private ChangeListener<PendingTradesListItem> selectedItemChangeListener;
-    private ListChangeListener<PendingTradesListItem> listChangeListener;
-    private ChangeListener<String> txIdChangeListener;
-    private ChangeListener<PendingTradesPM.State> offererStateChangeListener;
-    private ChangeListener<PendingTradesPM.State> takerStateChangeListener;
-    private ChangeListener<Throwable> faultChangeListener;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -99,15 +100,10 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
                 txIdTextField.setup(presentationModel.getWalletFacade(), newValue);
 
         selectedItemChangeListener = (obsValue, oldValue, newValue) -> {
-            if (oldValue != newValue) {
-                if (oldValue != null && newValue != null)
-                    presentationModel.selectTrade(newValue);
-                else if (newValue == null)
-                    table.getSelectionModel().clearSelection();
-            }
-            else {
-                log.warn("should never happen!");
-            }
+            if (oldValue != null && newValue != null)
+                presentationModel.selectTrade(newValue);
+            else if (newValue == null)
+                table.getSelectionModel().clearSelection();
         };
 
         listChangeListener = change -> {
@@ -578,7 +574,5 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
             }
         });
     }
-
-
 }
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
index 7d4f3d416e..f03c608cd1 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
@@ -20,7 +20,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsController"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsViewCB"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">
diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsController.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java
similarity index 89%
rename from src/main/java/io/bitsquare/gui/main/settings/SettingsController.java
rename to src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java
index a33679495c..42c199ccf8 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/SettingsController.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsViewCB.java
@@ -31,8 +31,8 @@ import javafx.fxml.Initializable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SettingsController extends CachedViewCB {
-    private static final Logger log = LoggerFactory.getLogger(SettingsController.class);
+public class SettingsViewCB extends CachedViewCB {
+    private static final Logger log = LoggerFactory.getLogger(SettingsViewCB.class);
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -40,28 +40,37 @@ public class SettingsController extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public SettingsController() {
+    public SettingsViewCB() {
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    @SuppressWarnings("EmptyMethod")
     @Override
     public void initialize(URL url, ResourceBundle rb) {
         super.initialize(url, rb);
     }
 
+    @SuppressWarnings("EmptyMethod")
     @Override
     public void deactivate() {
         super.deactivate();
     }
 
+    @SuppressWarnings("EmptyMethod")
     @Override
     public void activate() {
         super.activate();
     }
 
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Navigation
diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java
index 36216588f8..08b9e1c67b 100644
--- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java
+++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java
@@ -181,7 +181,6 @@ public class BuyerAcceptsOfferProtocol {
         log.debug("onResultHandleTakeOfferRequest called " + step++);
         if (takeOfferRequestAccepted) {
             trade.setState(Trade.State.OFFERER_ACCEPTED);
-            messageFacade.removeOffer(offer);
             listener.onOfferAccepted(offer);
             listener.onWaitingForPeerResponse(state);
         }