diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
index 1f73cac543..ab43ea52f8 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -34,9 +34,9 @@ import io.bitsquare.gui.common.view.guice.InjectorViewFactory;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.MainViewModel;
 import io.bitsquare.gui.main.debug.DebugView;
-import io.bitsquare.gui.popups.EmptyWalletPopup;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.SendAlertMessagePopup;
+import io.bitsquare.gui.main.popups.EmptyWalletPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.SendAlertMessagePopup;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.p2p.P2PService;
 import io.bitsquare.storage.Storage;
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java b/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java
index 5a97b19170..3336bd50e8 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java
@@ -26,6 +26,7 @@ import io.bitsquare.common.crypto.KeyStorage;
 import io.bitsquare.crypto.EncryptionServiceModule;
 import io.bitsquare.gui.GuiModule;
 import io.bitsquare.gui.common.view.CachingViewLoader;
+import io.bitsquare.gui.main.notifications.NotificationCenter;
 import io.bitsquare.p2p.P2PModule;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.TradeModule;
@@ -58,7 +59,8 @@ class BitsquareAppModule extends AppModule {
         bind(KeyRing.class).in(Singleton.class);
         bind(User.class).in(Singleton.class);
         bind(Preferences.class).in(Singleton.class);
-
+        bind(NotificationCenter.class).in(Singleton.class);
+        
         File storageDir = new File(env.getRequiredProperty(Storage.DIR_KEY));
         bind(File.class).annotatedWith(named(Storage.DIR_KEY)).toInstance(storageDir);
 
diff --git a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java
index 4d37f59e2c..fc878e070c 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java
@@ -21,7 +21,7 @@ import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java b/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
index daa178d6e1..5a7dbc9770 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
@@ -23,7 +23,7 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.TxConfidenceListener;
 import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.user.Preferences;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java
index 5f35ad3deb..6ca54fff49 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -31,9 +31,9 @@ import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.markets.MarketView;
 import io.bitsquare.gui.main.offer.BuyOfferView;
 import io.bitsquare.gui.main.offer.SellOfferView;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.settings.SettingsView;
-import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.Transitions;
 import javafx.beans.value.ChangeListener;
 import javafx.geometry.Insets;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index eec03200fa..ab9e7f34c3 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -36,11 +36,11 @@ import io.bitsquare.gui.common.view.ViewPath;
 import io.bitsquare.gui.components.BalanceTextField;
 import io.bitsquare.gui.components.BalanceWithConfirmationTextField;
 import io.bitsquare.gui.components.TxIdTextField;
+import io.bitsquare.gui.main.popups.DisplayAlertMessagePopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.WalletPasswordPopup;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
-import io.bitsquare.gui.popups.DisplayAlertMessagePopup;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.WalletPasswordPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
index 1d8e1bf01b..7fc167baad 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
@@ -24,8 +24,8 @@ import io.bitsquare.common.UserThread;
 import io.bitsquare.common.util.Tuple2;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.popups.EnterPrivKeyPopup;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.EnterPrivKeyPopup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.util.FormBuilder;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.gui.util.Layout;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java
index 051593146f..a0250e69b2 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java
@@ -22,7 +22,7 @@ import io.bitsquare.common.util.Tuple2;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.TableGroupHeadline;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.LanguageUtil;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
index f5db10258d..dbbe7b6b17 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
@@ -20,7 +20,7 @@ package io.bitsquare.gui.main.account.content.backup;
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.user.Preferences;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
index 110daca09e..75068a1b0c 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
@@ -26,7 +26,7 @@ import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.PasswordTextField;
 import io.bitsquare.gui.components.TitledGroupBg;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java
index 4bc7777efb..a52c82dc00 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java
@@ -22,7 +22,7 @@ import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.components.paymentmethods.*;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.util.FormBuilder;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.gui.util.Layout;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
index b5f7fba59d..86f6dfb102 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
@@ -24,8 +24,8 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.common.UserThread;
 import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.WalletPasswordPopup;
 import io.bitsquare.gui.util.Layout;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java b/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
index 84ceeebc6d..49ee5daa10 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
@@ -22,9 +22,9 @@ import io.bitsquare.arbitration.DisputeManager;
 import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.main.disputes.trader.TraderDisputeView;
-import io.bitsquare.gui.popups.ContractPopup;
-import io.bitsquare.gui.popups.DisputeSummaryPopup;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.ContractPopup;
+import io.bitsquare.gui.main.popups.DisputeSummaryPopup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.trade.TradeManager;
 import javafx.collections.transformation.FilteredList;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java b/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
index 55d3cc1394..ede884f52c 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
@@ -29,10 +29,10 @@ import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
 import io.bitsquare.gui.components.TableGroupHeadline;
-import io.bitsquare.gui.popups.ContractPopup;
-import io.bitsquare.gui.popups.DisputeSummaryPopup;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.ContractPopup;
+import io.bitsquare.gui.main.popups.DisputeSummaryPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.GUIUtil;
 import io.bitsquare.p2p.network.Connection;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
index d3917e5367..887dbf1708 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
@@ -25,7 +25,7 @@ import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.funds.reserved.ReservedView;
 import io.bitsquare.gui.main.funds.transactions.TransactionsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.user.PopupId;
 import io.bitsquare.user.Preferences;
 import javafx.beans.value.ChangeListener;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
index b699346413..dcca9b30b3 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
@@ -25,9 +25,9 @@ import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.trade.Tradable;
 import io.bitsquare.trade.Trade;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
index 9e2e0f55eb..2e24962983 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
@@ -25,9 +25,9 @@ import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.AddressWithIconAndDirection;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.trade.Tradable;
 import io.bitsquare.trade.Trade;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
index 72f9bf3aa1..7204df03de 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
@@ -28,10 +28,10 @@ import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
-import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.WalletPasswordPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcAddressValidator;
 import io.bitsquare.trade.Tradable;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/help/Help.java b/gui/src/main/java/io/bitsquare/gui/main/help/Help.java
index 7727592dfc..d7ac8c23c6 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/help/Help.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/help/Help.java
@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main.help;
 
 import io.bitsquare.common.util.Utilities;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/notifications/NotificationCenter.java b/gui/src/main/java/io/bitsquare/gui/main/notifications/NotificationCenter.java
new file mode 100644
index 0000000000..63a488a237
--- /dev/null
+++ b/gui/src/main/java/io/bitsquare/gui/main/notifications/NotificationCenter.java
@@ -0,0 +1,14 @@
+package io.bitsquare.gui.main.notifications;
+
+import com.google.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NotificationCenter {
+    private static final Logger log = LoggerFactory.getLogger(NotificationCenter.class);
+
+    @Inject
+    public NotificationCenter() {
+
+    }
+}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
index 765fd56448..2f94dd218d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
@@ -28,7 +28,7 @@ import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.offer.createoffer.CreateOfferView;
 import io.bitsquare.gui.main.offer.offerbook.OfferBookView;
 import io.bitsquare.gui.main.offer.takeoffer.TakeOfferView;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.locale.TradeCurrency;
 import io.bitsquare.trade.offer.Offer;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
index af772be02c..c97104b491 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
@@ -29,8 +29,8 @@ import io.bitsquare.btc.pricefeed.MarketPriceFeed;
 import io.bitsquare.common.UserThread;
 import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.gui.common.model.ActivatableDataModel;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.WalletPasswordPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.TradeCurrency;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
index 4aed52f666..b031d04013 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
@@ -37,10 +37,10 @@ import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
 import io.bitsquare.gui.main.offer.OfferView;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.FormBuilder;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
index 839c755f56..d9632d9605 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
@@ -30,8 +30,8 @@ import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
 import io.bitsquare.gui.main.offer.OfferView;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.TradeCurrency;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
index cd46833436..4296e0ea59 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
@@ -30,8 +30,8 @@ import io.bitsquare.btc.pricefeed.MarketPriceFeed;
 import io.bitsquare.common.UserThread;
 import io.bitsquare.common.handlers.ResultHandler;
 import io.bitsquare.gui.common.model.ActivatableDataModel;
-import io.bitsquare.gui.popups.Popup;
-import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.gui.main.popups.Popup;
+import io.bitsquare.gui.main.popups.WalletPasswordPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.TradeCurrency;
 import io.bitsquare.payment.PaymentAccount;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
index bbc130ed00..d2cc34959d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
@@ -34,10 +34,10 @@ import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
 import io.bitsquare.gui.main.offer.OfferView;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/ContractPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/ContractPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/ContractPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/ContractPopup.java
index 820936c95f..dea31da7cb 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/ContractPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/ContractPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.arbitration.Dispute;
 import io.bitsquare.gui.util.BSFormatter;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/DisplayAlertMessagePopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/DisplayAlertMessagePopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/DisplayAlertMessagePopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/DisplayAlertMessagePopup.java
index 750b1fbb2e..82b1ad727a 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/DisplayAlertMessagePopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/DisplayAlertMessagePopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.alert.Alert;
 import io.bitsquare.common.util.Utilities;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/DisputeSummaryPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/DisputeSummaryPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/DisputeSummaryPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/DisputeSummaryPopup.java
index 815a8ad04a..6609e72f1d 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/DisputeSummaryPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/DisputeSummaryPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.arbitration.Dispute;
 import io.bitsquare.arbitration.DisputeManager;
@@ -43,6 +43,8 @@ import javafx.scene.layout.VBox;
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Coin;
 import org.reactfx.util.FxTimer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import java.time.Duration;
@@ -52,6 +54,8 @@ import java.util.Optional;
 import static io.bitsquare.gui.util.FormBuilder.*;
 
 public class DisputeSummaryPopup extends Popup {
+    private static final Logger log = LoggerFactory.getLogger(DisputeSummaryPopup.class);
+    
     private final BSFormatter formatter;
     private final DisputeManager disputeManager;
     private final WalletService walletService;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/EmptyWalletPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/EmptyWalletPopup.java
index 0751051068..87fe3f5f27 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/EmptyWalletPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.btc.Restrictions;
 import io.bitsquare.btc.WalletService;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/EnterPrivKeyPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/EnterPrivKeyPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/EnterPrivKeyPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/EnterPrivKeyPopup.java
index adbea65515..a37286cc6c 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/EnterPrivKeyPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/EnterPrivKeyPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.gui.components.InputTextField;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/OfferDetailsPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/OfferDetailsPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/OfferDetailsPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/OfferDetailsPopup.java
index d6c09041f1..b87e1f641e 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/OfferDetailsPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/OfferDetailsPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.common.util.Tuple2;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/OpenEmergencyTicketPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/OpenEmergencyTicketPopup.java
similarity index 98%
rename from gui/src/main/java/io/bitsquare/gui/popups/OpenEmergencyTicketPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/OpenEmergencyTicketPopup.java
index 54a7b3d3ab..61db0b1c15 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/OpenEmergencyTicketPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/OpenEmergencyTicketPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.common.handlers.ResultHandler;
 import javafx.geometry.Insets;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/Popup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/Popup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/Popup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/Popup.java
index 7f0824d419..839cab2b12 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/Popup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/Popup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.common.UserThread;
 import io.bitsquare.common.util.Utilities;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/PopupManager.java b/gui/src/main/java/io/bitsquare/gui/main/popups/PopupManager.java
similarity index 96%
rename from gui/src/main/java/io/bitsquare/gui/popups/PopupManager.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/PopupManager.java
index da8701ecd2..7bff92e8c3 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/PopupManager.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/PopupManager.java
@@ -1,4 +1,4 @@
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/SelectDepositTxPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/SelectDepositTxPopup.java
index 2f820784bf..988b9efc7e 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/SelectDepositTxPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/SelectDepositTxPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.common.util.Tuple2;
 import javafx.collections.FXCollections;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/SendAlertMessagePopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/SendAlertMessagePopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/SendAlertMessagePopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/SendAlertMessagePopup.java
index 68503c2035..caca3f2ba3 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/SendAlertMessagePopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/SendAlertMessagePopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.alert.Alert;
 import io.bitsquare.app.BitsquareApp;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/TradeDetailsPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/TradeDetailsPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/TradeDetailsPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/TradeDetailsPopup.java
index 75e43fe177..396b3abcfb 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/TradeDetailsPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/TradeDetailsPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.arbitration.DisputeManager;
 import io.bitsquare.gui.util.BSFormatter;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/WalletPasswordPopup.java b/gui/src/main/java/io/bitsquare/gui/main/popups/WalletPasswordPopup.java
similarity index 99%
rename from gui/src/main/java/io/bitsquare/gui/popups/WalletPasswordPopup.java
rename to gui/src/main/java/io/bitsquare/gui/main/popups/WalletPasswordPopup.java
index f3cbad3324..da3213e4a0 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/WalletPasswordPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/popups/WalletPasswordPopup.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.popups;
+package io.bitsquare.gui.main.popups;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.crypto.ScryptUtil;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
index fd081960ae..84e3cfd872 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
@@ -20,8 +20,8 @@ package io.bitsquare.gui.main.portfolio.closedtrades;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.trade.Tradable;
 import io.bitsquare.trade.Trade;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
index 0e9a5cfd4c..b2014df52d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
@@ -20,7 +20,7 @@ package io.bitsquare.gui.main.portfolio.failedtrades;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
index 61ac29b0da..1eb162a14f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
@@ -24,8 +24,8 @@ import io.bitsquare.gui.components.HyperlinkWithIcon;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
-import io.bitsquare.gui.popups.OfferDetailsPopup;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.OfferDetailsPopup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.trade.offer.OpenOffer;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java
index bb0def1ad3..0974aa4389 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java
@@ -75,8 +75,8 @@ public class BuyerSubView extends TradeSubView {
 
     @Override
     protected void onViewStateChanged(PendingTradesViewModel.State viewState) {
-        Log.traceCall(viewState.toString());
         if (viewState != null) {
+            Log.traceCall(viewState.toString());
             PendingTradesViewModel.BuyerState buyerState = (PendingTradesViewModel.BuyerState) viewState;
 
             step1.setDisabled();
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
index fcda89e404..9836ada3f1 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
@@ -32,8 +32,8 @@ import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.common.model.ActivatableDataModel;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.disputes.DisputesView;
-import io.bitsquare.gui.popups.SelectDepositTxPopup;
-import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.gui.main.popups.SelectDepositTxPopup;
+import io.bitsquare.gui.main.popups.WalletPasswordPopup;
 import io.bitsquare.payment.PaymentAccountContractData;
 import io.bitsquare.trade.BuyerTrade;
 import io.bitsquare.trade.SellerTrade;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
index 77e85c3160..bda80d732d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
@@ -22,8 +22,8 @@ import io.bitsquare.common.UserThread;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
-import io.bitsquare.gui.popups.OpenEmergencyTicketPopup;
-import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.main.popups.OpenEmergencyTicketPopup;
+import io.bitsquare.gui.main.popups.TradeDetailsPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.event.EventHandler;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java
index 94eaec98bc..f95dfe60d0 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java
@@ -74,8 +74,8 @@ public class SellerSubView extends TradeSubView {
 
     @Override
     protected void onViewStateChanged(PendingTradesViewModel.State viewState) {
-        Log.traceCall(viewState.toString());
         if (viewState != null) {
+            Log.traceCall(viewState.toString());
             PendingTradesViewModel.SellerState sellerState = (PendingTradesViewModel.SellerState) viewState;
 
             step1.setDisabled();
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
index d5f2c425fb..9785d18679 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
@@ -22,9 +22,9 @@ import io.bitsquare.arbitration.Dispute;
 import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.components.TxIdTextField;
 import io.bitsquare.gui.components.paymentmethods.PaymentMethodForm;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.main.portfolio.pendingtrades.TradeSubView;
-import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.user.Preferences;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
index 35f4eeb9c2..68299a24c5 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
@@ -22,9 +22,9 @@ import io.bitsquare.common.util.Tuple3;
 import io.bitsquare.gui.components.TextFieldWithCopyIcon;
 import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.components.paymentmethods.*;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView;
-import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.CurrencyUtil;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java
index 9a32feeb79..d7bb0340a4 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java
@@ -20,9 +20,9 @@ package io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer;
 import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.app.Log;
 import io.bitsquare.common.util.Tuple2;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView;
-import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.Layout;
 import javafx.beans.value.ChangeListener;
 import javafx.scene.control.Button;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
index 6c9987bc3f..2ee5248ed2 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
@@ -21,9 +21,9 @@ import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.common.util.Tuple3;
 import io.bitsquare.gui.components.TextFieldWithCopyIcon;
 import io.bitsquare.gui.components.TitledGroupBg;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView;
-import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.payment.BlockChainAccountContractData;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index 22c26a3f46..ac7ccc15d7 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -23,7 +23,7 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.common.model.Activatable;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.p2p.NodeAddress;
 import io.bitsquare.p2p.P2PService;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesViewModel.java
index b26fb6fd47..44a13dd4a4 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesViewModel.java
@@ -20,7 +20,7 @@ package io.bitsquare.gui.main.settings.preferences;
 import com.google.inject.Inject;
 import io.bitsquare.common.UserThread;
 import io.bitsquare.gui.common.model.ActivatableViewModel;
-import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.main.popups.Popup;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.locale.TradeCurrency;
 import io.bitsquare.user.BlockChainExplorer;