diff --git a/core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java b/core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
index 33a12ccf29..8094f07c1f 100644
--- a/core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
+++ b/core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
@@ -26,6 +26,10 @@ import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.Utilities;
+import io.bitsquare.viewfx.view.CachingViewLoader;
+import io.bitsquare.viewfx.view.View;
+import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
 
 import com.google.common.base.Throwables;
 
@@ -34,11 +38,6 @@ import com.google.inject.Injector;
 
 import java.io.IOException;
 
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
-
 import javafx.application.Application;
 import javafx.scene.*;
 import javafx.scene.image.*;
diff --git a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
index 651aa1363f..9746ea4ace 100644
--- a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
+++ b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
@@ -41,8 +41,8 @@ import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 
 import static io.bitsquare.app.BitsquareEnvironment.*;
-import static io.bitsquare.network.tomp2p.TomP2PNetworkModule.*;
 import static io.bitsquare.network.Node.*;
+import static io.bitsquare.network.tomp2p.TomP2PNetworkModule.*;
 import static java.util.Arrays.asList;
 
 public class BitsquareAppMain extends BitsquareExecutable {
diff --git a/core/src/main/java/io/bitsquare/gui/GuiModule.java b/core/src/main/java/io/bitsquare/gui/GuiModule.java
index 855addab5d..c6476331f3 100644
--- a/core/src/main/java/io/bitsquare/gui/GuiModule.java
+++ b/core/src/main/java/io/bitsquare/gui/GuiModule.java
@@ -20,7 +20,6 @@ package io.bitsquare.gui;
 import io.bitsquare.BitsquareModule;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.offer.OfferBook;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.Transitions;
 import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
@@ -29,18 +28,18 @@ import io.bitsquare.gui.util.validation.FiatValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.offer.OfferBook;
+import io.bitsquare.viewfx.view.CachingViewLoader;
+import io.bitsquare.viewfx.view.ViewFactory;
+import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.viewfx.view.fxml.FxmlViewLoader;
+import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
 
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
 
 import java.util.ResourceBundle;
 
-import io.bitsquare.viewfx.view.ViewFactory;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.fxml.FxmlViewLoader;
-import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
-
 import javafx.stage.Stage;
 
 import org.springframework.core.env.Environment;
diff --git a/core/src/main/java/io/bitsquare/gui/Navigation.java b/core/src/main/java/io/bitsquare/gui/Navigation.java
index 747bd521df..3aee0de5ce 100644
--- a/core/src/main/java/io/bitsquare/gui/Navigation.java
+++ b/core/src/main/java/io/bitsquare/gui/Navigation.java
@@ -20,6 +20,8 @@ package io.bitsquare.gui;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.trade.BuyView;
 import io.bitsquare.persistence.Persistence;
+import io.bitsquare.viewfx.view.View;
+import io.bitsquare.viewfx.view.ViewPath;
 
 import com.google.inject.Inject;
 
@@ -29,9 +31,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewPath;
-
 public class Navigation {
 
     private static final String CURRENT_PATH_KEY = "currentPath";
diff --git a/core/src/main/java/io/bitsquare/gui/main/MainView.java b/core/src/main/java/io/bitsquare/gui/main/MainView.java
index 4379805790..35ac7aa0f4 100644
--- a/core/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -32,16 +32,15 @@ import io.bitsquare.gui.main.settings.SettingsView;
 import io.bitsquare.gui.main.trade.BuyView;
 import io.bitsquare.gui.main.trade.SellView;
 import io.bitsquare.gui.util.Transitions;
+import io.bitsquare.viewfx.view.CachingViewLoader;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.InitializableView;
+import io.bitsquare.viewfx.view.View;
+import io.bitsquare.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.InitializableView;
-
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
index 3a8eb9e308..69908e06ff 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
@@ -22,14 +22,13 @@ import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView;
 import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
-
-import javax.inject.Inject;
-
+import io.bitsquare.viewfx.view.ActivatableView;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import javax.inject.Inject;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
index 00523ad1ff..ee9cb9cef2 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
@@ -18,11 +18,10 @@
 package io.bitsquare.gui.main.account;
 
 import io.bitsquare.user.User;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.ViewModel;
-
 class AccountViewModel implements ViewModel {
 
     private final User user;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
index 8ad85df1a6..204a48bb2e 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
@@ -18,14 +18,13 @@
 package io.bitsquare.gui.main.account.arbitrator;
 
 import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
-
-import javax.inject.Inject;
-
+import io.bitsquare.viewfx.view.AbstractView;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.AbstractView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
index a0e06af22d..ee79ee6d8c 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
@@ -19,23 +19,22 @@ package io.bitsquare.gui.main.account.arbitrator.browser;
 
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
-import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.arbitrator.ArbitratorMessageService;
 import io.bitsquare.arbitrator.listeners.ArbitratorListener;
+import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
+import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.persistence.Persistence;
+import io.bitsquare.viewfx.view.ActivatableView;
+import io.bitsquare.viewfx.view.CachingViewLoader;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.View;
+import io.bitsquare.viewfx.view.ViewLoader;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
index 0d45039689..705fb3b7e8 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
@@ -19,12 +19,11 @@ package io.bitsquare.gui.main.account.arbitrator.profile;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.util.BSFormatter;
+import io.bitsquare.viewfx.view.AbstractView;
+import io.bitsquare.viewfx.view.FxmlView;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.AbstractView;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
index 609376c6ac..7fb7c8a2eb 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
@@ -18,17 +18,19 @@
 package io.bitsquare.gui.main.account.arbitrator.registration;
 
 import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitrator.ArbitratorMessageService;
 import io.bitsquare.arbitrator.Reputation;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
 import io.bitsquare.util.Utilities;
+import io.bitsquare.viewfx.view.ActivatableView;
+import io.bitsquare.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
@@ -44,9 +46,6 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.ActivatableView;
-
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
index 77ddf1ed4b..d0d433cc13 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
@@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.changepassword;
 
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.InitializableView;
+import io.bitsquare.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.InitializableView;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
index b7feeec186..c32997b9a2 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
@@ -19,11 +19,10 @@ package io.bitsquare.gui.main.account.content.changepassword;
 
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.ViewModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
index 8270159c06..5a484de664 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
@@ -26,14 +26,13 @@ import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.locale.Region;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
+import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.model.DataModel;
 
 import com.google.inject.Inject;
 
 import java.util.Currency;
 
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
index ba34613825..f2aed21e39 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
@@ -28,6 +28,9 @@ import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.Wizard;
 
 import java.util.ArrayList;
 import java.util.Currency;
@@ -35,10 +38,6 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-
 import javafx.collections.ListChangeListener;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
index 0b23f47272..d9b4fd340e 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
@@ -24,14 +24,13 @@ import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
+import io.bitsquare.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
 import java.util.Currency;
 
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
index 46e901b776..62005ed5cd 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
@@ -19,16 +19,18 @@ package io.bitsquare.gui.main.account.content.irc;
 
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitrator.ArbitratorMessageService;
 import io.bitsquare.arbitrator.Reputation;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
+import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
@@ -41,9 +43,6 @@ import java.util.Currency;
 import java.util.List;
 import java.util.Locale;
 
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
index 6b1553a457..13636e4ad9 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
@@ -23,15 +23,14 @@ import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.util.Utilities;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.Wizard;
 
 import java.util.Currency;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
index 68b247f676..abcb485bbe 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
@@ -21,14 +21,13 @@ import io.bitsquare.bank.BankAccountType;
 import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
 import java.util.Currency;
 
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
index 3afa48400f..3346541581 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
@@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.password;
 
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.InitializableView;
+import io.bitsquare.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.InitializableView;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
index 950fa60319..3f9954411c 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
@@ -19,11 +19,10 @@ package io.bitsquare.gui.main.account.content.password;
 
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.ViewModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
index b9e6d5fca1..16ff65e58e 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
@@ -23,6 +23,7 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
+import io.bitsquare.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.InsufficientMoneyException;
@@ -34,8 +35,6 @@ import com.google.inject.Inject;
 
 import javax.annotation.Nullable;
 
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
index 6fec3ccc38..a4141c5420 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
@@ -24,16 +24,15 @@ import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.InitializableView;
+import io.bitsquare.viewfx.view.Wizard;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.InitializableView;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
index d6745d49cf..b4ffd4329b 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
@@ -20,15 +20,14 @@ package io.bitsquare.gui.main.account.content.registration;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.viewfx.model.WithDataModel;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.WithDataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
index b9aaec6aaf..8bad6b03d3 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
@@ -19,15 +19,17 @@ package io.bitsquare.gui.main.account.content.restrictions;
 
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitrator.ArbitratorMessageService;
 import io.bitsquare.arbitrator.Reputation;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.locale.Region;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
+import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
@@ -39,9 +41,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
index 5021156a9f..322a5be6da 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
@@ -24,17 +24,16 @@ import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
-
-import java.util.Locale;
-
-import javax.inject.Inject;
-
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
 import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import java.util.Locale;
+
+import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
index 3320c2014d..b4d9cab366 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
@@ -20,14 +20,13 @@ package io.bitsquare.gui.main.account.content.restrictions;
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
+import io.bitsquare.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
 import java.util.Locale;
 
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.ObservableList;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
index 02922735d9..fb47d13ef5 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
@@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.seedwords;
 
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.viewfx.view.InitializableView;
+import io.bitsquare.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.InitializableView;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
index 56cd1d8596..6dfc3a51d4 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
@@ -19,13 +19,12 @@ package io.bitsquare.gui.main.account.content.seedwords;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.util.BSFormatter;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
 import java.util.List;
 
-import io.bitsquare.viewfx.model.ViewModel;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
index 6a84079aeb..af19df66dd 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
@@ -27,16 +27,15 @@ import io.bitsquare.gui.main.account.content.registration.RegistrationView;
 import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
 import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 import io.bitsquare.gui.util.Colors;
-
-import javax.inject.Inject;
-
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
 import io.bitsquare.viewfx.view.ViewPath;
 import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
index 8c452e65de..5d99bce09a 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
@@ -25,15 +25,14 @@ import io.bitsquare.gui.main.account.content.registration.RegistrationView;
 import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
 import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 import io.bitsquare.gui.main.trade.BuyView;
-
-import javax.inject.Inject;
-
+import io.bitsquare.viewfx.view.ActivatableView;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
 import io.bitsquare.viewfx.view.Wizard;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
index c6bf208181..9ba5dec3c7 100644
--- a/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
@@ -21,15 +21,14 @@ import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.funds.transactions.TransactionsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
-
-import javax.inject.Inject;
-
 import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import javax.inject.Inject;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
index 17948ea303..b189234d8d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
@@ -21,6 +21,8 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.util.Utilities;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Transaction;
 
@@ -29,9 +31,6 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
index bd487fc4f3..f4c0244cd3 100644
--- a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
@@ -25,6 +25,8 @@ import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.util.Utilities;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Coin;
@@ -38,9 +40,6 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
index 4e2d6a3109..5dc668ca18 100644
--- a/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.home;
 
-import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.AbstractView;
+import io.bitsquare.viewfx.view.FxmlView;
 
 // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home,
 // probably overview, event history, news, charts,... -> low prio
diff --git a/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
index c15faf4247..4978c8479c 100644
--- a/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.msg;
 
-import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.AbstractView;
+import io.bitsquare.viewfx.view.FxmlView;
 
 // will be probably only used for arbitration communication, will be renamed and the icon changed
 @FxmlView
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
index 6398d0e32c..7f8b5ea6be 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
@@ -23,15 +23,14 @@ import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
 import io.bitsquare.gui.main.portfolio.offer.OffersView;
 import io.bitsquare.gui.main.portfolio.pending.PendingTradesView;
 import io.bitsquare.trade.TradeManager;
-
-import javax.inject.Inject;
-
 import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import javax.inject.Inject;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
index cc2b056d7b..8fa869453d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
@@ -22,12 +22,11 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-
-import com.google.inject.Inject;
-
 import io.bitsquare.viewfx.model.Activatable;
 import io.bitsquare.viewfx.model.DataModel;
 
+import com.google.inject.Inject;
+
 import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
index f4ad90d123..0b00a6eb31 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
@@ -18,12 +18,11 @@
 package io.bitsquare.gui.main.portfolio.closed;
 
 import io.bitsquare.gui.components.Popups;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.FxmlView;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
index ef3e62838f..aaef963e1e 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
@@ -18,12 +18,11 @@
 package io.bitsquare.gui.main.portfolio.closed;
 
 import io.bitsquare.gui.util.BSFormatter;
+import io.bitsquare.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-
 import javafx.collections.ObservableList;
 
 class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataModel> implements ViewModel {
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
index 23fcc5406b..08418e892d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
@@ -26,6 +26,8 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
+import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.model.DataModel;
 
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Coin;
@@ -39,9 +41,6 @@ import com.google.inject.Inject;
 
 import java.util.Optional;
 
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
index d947d6243f..a099a58b58 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
@@ -33,6 +33,8 @@ import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.util.Utilities;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
@@ -43,9 +45,6 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
index e5044598eb..64b5c68fab 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
@@ -22,6 +22,8 @@ import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcAddressValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.trade.Trade;
+import io.bitsquare.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
@@ -30,9 +32,6 @@ import com.google.inject.Inject;
 
 import java.util.Date;
 
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
index c42374f46a..f5734d6d99 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
@@ -22,15 +22,14 @@ import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.settings.application.PreferencesView;
 import io.bitsquare.gui.main.settings.network.NetworkSettingsView;
 import io.bitsquare.settings.Preferences;
-
-import javax.inject.Inject;
-
 import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.CachingViewLoader;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
 import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
+
+import javax.inject.Inject;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
index 877527a72a..6ce26e596d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
@@ -18,12 +18,11 @@
 package io.bitsquare.gui.main.settings.application;
 
 import io.bitsquare.settings.Preferences;
-
-import com.google.inject.Inject;
-
 import io.bitsquare.viewfx.model.Activatable;
 import io.bitsquare.viewfx.model.DataModel;
 
+import com.google.inject.Inject;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
index 467a2116ca..add6236108 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
@@ -17,10 +17,10 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import javax.inject.Inject;
-
-import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.viewfx.view.FxmlView;
+
+import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
index 32a4a73933..d0ec55849c 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
@@ -17,10 +17,10 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import com.google.inject.Inject;
-
-import io.bitsquare.viewfx.model.ViewModel;
 import io.bitsquare.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.viewfx.model.ViewModel;
+
+import com.google.inject.Inject;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.StringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index c53797f1c9..6b35c16c99 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -19,12 +19,11 @@ package io.bitsquare.gui.main.settings.network;
 
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.network.ClientNode;
-
-import javax.inject.Inject;
-
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.InitializableView;
 
+import javax.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java b/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
index f6c2d5bf7a..ef8f86e159 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
@@ -18,12 +18,11 @@
 package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.Navigation;
-
-import javax.inject.Inject;
-
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.ViewLoader;
 
+import javax.inject.Inject;
+
 @FxmlView
 public class BuyView extends TradeView {
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java b/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
index e698ab0109..4a7cc3b36e 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
@@ -18,12 +18,11 @@
 package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.Navigation;
-
-import javax.inject.Inject;
-
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.ViewLoader;
 
+import javax.inject.Inject;
+
 @FxmlView
 public class SellView extends TradeView {
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
index 027f6ce630..14c8b4b463 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
@@ -31,6 +31,8 @@ import io.bitsquare.persistence.Persistence;
 import io.bitsquare.settings.Preferences;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
+import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
@@ -41,9 +43,6 @@ import com.google.inject.Inject;
 import java.util.Locale;
 import java.util.UUID;
 
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
index 92d1e576e9..4d13d23307 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
@@ -29,6 +29,8 @@ import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
 import io.bitsquare.util.handlers.ErrorMessageHandler;
 import io.bitsquare.util.handlers.ResultHandler;
+import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
@@ -36,9 +38,6 @@ import org.bitcoinj.utils.Fiat;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
index bb054f2e04..53783a5d23 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
@@ -25,15 +25,14 @@ import io.bitsquare.gui.util.validation.OptionalFiatValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
+import io.bitsquare.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.viewfx.model.ViewModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.transformation.SortedList;
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
index 9091297925..53773a3899 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
@@ -26,6 +26,8 @@ import io.bitsquare.persistence.Persistence;
 import io.bitsquare.settings.Preferences;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
+import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
@@ -33,9 +35,6 @@ import org.bitcoinj.utils.Fiat;
 
 import com.google.inject.Inject;
 
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java b/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
index 58bfbf993f..e625fed1e3 100644
--- a/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
+++ b/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
@@ -18,10 +18,10 @@
 package io.bitsquare.network.tomp2p;
 
 import io.bitsquare.BitsquareException;
-import io.bitsquare.network.MessageBroker;
 import io.bitsquare.network.BootstrapState;
 import io.bitsquare.network.ClientNode;
 import io.bitsquare.network.ConnectionType;
+import io.bitsquare.network.MessageBroker;
 import io.bitsquare.network.NetworkException;
 import io.bitsquare.network.Node;
 
diff --git a/core/src/main/java/io/bitsquare/trade/TradeMessageService.java b/core/src/main/java/io/bitsquare/trade/TradeMessageService.java
index 2a1328361c..54b6103c91 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeMessageService.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeMessageService.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade;
 import io.bitsquare.network.Message;
 import io.bitsquare.network.MessageBroker;
 import io.bitsquare.network.Peer;
-import io.bitsquare.trade.listeners.GetPeerAddressListener;
 import io.bitsquare.trade.handlers.MessageHandler;
+import io.bitsquare.trade.listeners.GetPeerAddressListener;
 import io.bitsquare.trade.listeners.SendMessageListener;
 
 import java.security.PublicKey;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
index 140ff38e8b..81a774a39c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
@@ -25,7 +25,7 @@ import io.bitsquare.util.taskrunner.TaskRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.google.common.base.Preconditions.*;
+import static com.google.common.base.Preconditions.checkNotNull;
 import static io.bitsquare.util.Validator.*;
 
 public class ProcessRequestOffererPublishDepositTxMessage extends Task<BuyerAsOffererModel> {
diff --git a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
index 96d4d9069f..786b065129 100644
--- a/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
+++ b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
@@ -22,8 +22,8 @@ import io.bitsquare.network.Peer;
 import io.bitsquare.network.tomp2p.TomP2PNode;
 import io.bitsquare.network.tomp2p.TomP2PPeer;
 import io.bitsquare.trade.TradeMessageService;
-import io.bitsquare.trade.listeners.GetPeerAddressListener;
 import io.bitsquare.trade.handlers.MessageHandler;
+import io.bitsquare.trade.listeners.GetPeerAddressListener;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.user.User;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java b/core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
index d5670dd006..767f550575 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
+++ b/core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.viewfx.view;
 
-import io.bitsquare.viewfx.view.View;
-
 import javafx.fxml.FXML;
 import javafx.scene.*;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java b/core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
index 1f62fac7f1..7a0c0ab095 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
+++ b/core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
@@ -17,14 +17,10 @@
 
 package io.bitsquare.viewfx.view;
 
-import io.bitsquare.viewfx.view.View;
-
 import java.util.HashMap;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.ViewLoader;
-
 public class CachingViewLoader implements ViewLoader {
 
     private final HashMap<Object, View> cache = new HashMap<>();
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java b/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
index 0b6bb2ba06..f7d1ef78e0 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
+++ b/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
@@ -20,6 +20,8 @@ package io.bitsquare.viewfx.view.fxml;
 import io.bitsquare.viewfx.ViewfxException;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
+import io.bitsquare.viewfx.view.ViewFactory;
+import io.bitsquare.viewfx.view.ViewLoader;
 
 import java.io.IOException;
 
@@ -29,9 +31,6 @@ import java.util.ResourceBundle;
 
 import javax.inject.Inject;
 
-import io.bitsquare.viewfx.view.ViewFactory;
-import io.bitsquare.viewfx.view.ViewLoader;
-
 import javafx.fxml.FXMLLoader;
 
 import org.springframework.core.annotation.AnnotationUtils;
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java b/core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
index 7ba5810b95..5e0503dc56 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
+++ b/core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
@@ -17,12 +17,12 @@
 
 package io.bitsquare.viewfx.view.guice;
 
+import io.bitsquare.viewfx.view.ViewFactory;
+
 import com.google.common.base.Preconditions;
 
 import com.google.inject.Injector;
 
-import io.bitsquare.viewfx.view.ViewFactory;
-
 public class InjectorViewFactory implements ViewFactory {
 
     private Injector injector;
diff --git a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java b/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
index 84c07f195d..b9cc37a6a2 100644
--- a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
+++ b/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
@@ -18,14 +18,13 @@
 package io.bitsquare.viewfx.view.fxml;
 
 import io.bitsquare.viewfx.ViewfxException;
+import io.bitsquare.viewfx.view.AbstractView;
 import io.bitsquare.viewfx.view.FxmlView;
 import io.bitsquare.viewfx.view.View;
-
-import java.util.ResourceBundle;
-
 import io.bitsquare.viewfx.view.ViewFactory;
 import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.AbstractView;
+
+import java.util.ResourceBundle;
 
 import javafx.fxml.LoadException;