From b890f372160c5ba43210bcab353da861e24dc8d2 Mon Sep 17 00:00:00 2001
From: Chris Beams <chris@beams.io>
Date: Sun, 23 Nov 2014 17:16:35 +0100
Subject: [PATCH] Introduce top-level viewfx package

Move general-purpose ui infrastructure to this new package, leaving
what's in io.bitsquare.gui truly specific to Bitsquare.
---
 .idea/codeStyleSettings.xml                          |  5 +++--
 src/main/java/io/bitsquare/gui/main/MainView.java    |  3 ++-
 .../java/io/bitsquare/gui/main/MainViewModel.java    |  3 ++-
 .../io/bitsquare/gui/main/account/AccountView.java   |  8 +++-----
 .../bitsquare/gui/main/account/AccountViewModel.java |  3 ++-
 .../account/arbitrator/ArbitratorSettingsView.java   |  9 +++------
 .../arbitrator/browser/ArbitratorBrowserView.java    |  9 ++++-----
 .../arbitrator/profile/ArbitratorProfileView.java    |  3 ++-
 .../registration/ArbitratorRegistrationView.java     |  3 ++-
 .../content/changepassword/ChangePasswordView.java   |  5 +++--
 .../changepassword/ChangePasswordViewModel.java      |  3 ++-
 .../account/content/fiat/FiatAccountDataModel.java   |  5 +++--
 .../main/account/content/fiat/FiatAccountView.java   |  5 +++--
 .../account/content/fiat/FiatAccountViewModel.java   |  5 +++--
 .../account/content/irc/IrcAccountDataModel.java     |  5 +++--
 .../gui/main/account/content/irc/IrcAccountView.java |  5 +++--
 .../account/content/irc/IrcAccountViewModel.java     |  5 +++--
 .../main/account/content/password/PasswordView.java  |  5 +++--
 .../account/content/password/PasswordViewModel.java  |  3 ++-
 .../content/registration/RegistrationDataModel.java  |  3 ++-
 .../content/registration/RegistrationView.java       |  5 +++--
 .../content/registration/RegistrationViewModel.java  |  5 +++--
 .../content/restrictions/RestrictionsDataModel.java  |  5 +++--
 .../content/restrictions/RestrictionsView.java       | 12 +++++-------
 .../content/restrictions/RestrictionsViewModel.java  |  5 +++--
 .../account/content/seedwords/SeedWordsView.java     |  5 +++--
 .../content/seedwords/SeedWordsViewModel.java        |  3 ++-
 .../main/account/settings/AccountSettingsView.java   | 11 +++++------
 .../gui/main/account/setup/AccountSetupWizard.java   | 11 +++++------
 .../java/io/bitsquare/gui/main/funds/FundsView.java  | 10 ++++------
 .../main/funds/transactions/TransactionsView.java    |  3 ++-
 .../gui/main/funds/withdrawal/WithdrawalView.java    |  3 ++-
 .../java/io/bitsquare/gui/main/home/HomeView.java    |  2 +-
 src/main/java/io/bitsquare/gui/main/msg/MsgView.java |  4 +---
 .../bitsquare/gui/main/portfolio/PortfolioView.java  | 10 ++++------
 .../main/portfolio/closed/ClosedTradesDataModel.java |  5 +++--
 .../gui/main/portfolio/closed/ClosedTradesView.java  |  3 ++-
 .../main/portfolio/closed/ClosedTradesViewModel.java |  5 +++--
 .../gui/main/portfolio/offer/OffersDataModel.java    |  5 +++--
 .../gui/main/portfolio/offer/OffersView.java         |  3 ++-
 .../gui/main/portfolio/offer/OffersViewModel.java    |  5 +++--
 .../portfolio/pending/PendingTradesDataModel.java    |  5 +++--
 .../main/portfolio/pending/PendingTradesView.java    |  3 ++-
 .../portfolio/pending/PendingTradesViewModel.java    |  5 +++--
 .../io/bitsquare/gui/main/settings/SettingsView.java | 10 ++++------
 .../settings/application/PreferencesDataModel.java   |  5 +++--
 .../main/settings/application/PreferencesView.java   |  4 ++--
 .../settings/application/PreferencesViewModel.java   |  6 +++---
 .../main/settings/network/NetworkSettingsView.java   |  3 ++-
 .../java/io/bitsquare/gui/main/trade/TradeView.java  |  8 ++++----
 .../main/trade/createoffer/CreateOfferDataModel.java |  5 +++--
 .../gui/main/trade/createoffer/CreateOfferView.java  |  3 ++-
 .../main/trade/createoffer/CreateOfferViewModel.java |  5 +++--
 .../gui/main/trade/offerbook/OfferBookDataModel.java |  5 +++--
 .../gui/main/trade/offerbook/OfferBookView.java      |  5 +++--
 .../gui/main/trade/offerbook/OfferBookViewModel.java |  5 +++--
 .../gui/main/trade/takeoffer/TakeOfferDataModel.java |  5 +++--
 .../gui/main/trade/takeoffer/TakeOfferView.java      |  3 ++-
 .../gui/main/trade/takeoffer/TakeOfferViewModel.java |  5 +++--
 .../{io/bitsquare/gui => viewfx}/AbstractView.java   |  6 +-----
 .../{io/bitsquare/gui => viewfx}/Activatable.java    |  2 +-
 .../bitsquare/gui => viewfx}/ActivatableView.java    |  2 +-
 .../gui => viewfx}/ActivatableViewAndModel.java      |  2 +-
 .../gui => viewfx}/ActivatableWithDelegate.java      |  2 +-
 .../java/{io/bitsquare/gui => viewfx}/ChildView.java |  2 +-
 .../java/{io/bitsquare/gui => viewfx}/DataModel.java |  2 +-
 .../bitsquare/gui => viewfx}/InitializableView.java  |  2 +-
 .../java/{io/bitsquare/gui => viewfx}/Model.java     |  2 +-
 src/main/java/{io/bitsquare/gui => viewfx}/View.java |  2 +-
 .../java/{io/bitsquare/gui => viewfx}/ViewModel.java |  2 +-
 .../{io/bitsquare/gui => viewfx}/WithDelegate.java   |  2 +-
 .../java/{io/bitsquare/gui => viewfx}/Wizard.java    |  2 +-
 src/main/resources/logback.xml                       |  5 -----
 73 files changed, 179 insertions(+), 161 deletions(-)
 rename src/main/java/{io/bitsquare/gui => viewfx}/AbstractView.java (86%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/Activatable.java (97%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/ActivatableView.java (98%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/ActivatableViewAndModel.java (98%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/ActivatableWithDelegate.java (97%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/ChildView.java (96%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/DataModel.java (96%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/InitializableView.java (98%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/Model.java (96%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/View.java (96%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/ViewModel.java (96%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/WithDelegate.java (97%)
 rename src/main/java/{io/bitsquare/gui => viewfx}/Wizard.java (97%)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index e0138f2f2a..ff0fbb1d5a 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -48,6 +48,8 @@
             <emptyLine />
             <package name="javax.swing" withSubpackages="true" static="false" />
             <emptyLine />
+            <package name="viewfx" withSubpackages="true" static="false" />
+            <emptyLine />
             <package name="javafx" withSubpackages="true" static="false" />
             <emptyLine />
             <package name="com.sun.javafx" withSubpackages="true" static="false" />
@@ -86,5 +88,4 @@
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java
index 8d6909daf3..c91ed04684 100644
--- a/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -19,7 +19,6 @@ package io.bitsquare.gui.main;
 
 import io.bitsquare.BitsquareException;
 import io.bitsquare.bank.BankAccount;
-import io.bitsquare.gui.ActivatableView;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.ViewLoader;
@@ -30,6 +29,8 @@ import io.bitsquare.gui.util.Transitions;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import viewfx.ActivatableView;
+
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
diff --git a/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index 54c447f554..bb4240ecfc 100644
--- a/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -20,7 +20,6 @@ package io.bitsquare.gui.main;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.msg.MessageService;
 import io.bitsquare.network.BootstrapState;
@@ -31,6 +30,8 @@ import io.bitsquare.user.User;
 
 import com.google.inject.Inject;
 
+import viewfx.ViewModel;
+
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/src/main/java/io/bitsquare/gui/main/account/AccountView.java
index 053640bf88..f1219a246b 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.java
@@ -17,13 +17,13 @@
 
 package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.ActivatableView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableView;
+
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -94,8 +94,7 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
     }
 
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         final Tab tab;
         switch (navigationItem) {
@@ -121,6 +120,5 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
 
         tab.setContent(loaded.view);
         root.getSelectionModel().select(tab);
-        return (View) loaded.controller;
     }
 }
diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
index bd0594edef..82bb0ca64e 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
@@ -17,11 +17,12 @@
 
 package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.user.User;
 
 import com.google.inject.Inject;
 
+import viewfx.ViewModel;
+
 class AccountViewModel implements ViewModel {
 
     private final User user;
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
index 8af7703118..92e619f2af 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
@@ -17,14 +17,14 @@
 
 package io.bitsquare.gui.main.account.arbitrator;
 
-import io.bitsquare.gui.AbstractView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
 
 import javax.inject.Inject;
 
+import viewfx.AbstractView;
+
 import javafx.fxml.FXML;
 import javafx.scene.*;
 import javafx.stage.Modality;
@@ -46,8 +46,7 @@ class ArbitratorSettingsView extends AbstractView {
         this.primaryStage = primaryStage;
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
         arbitratorRegistrationView = (ArbitratorRegistrationView) loaded.controller;
 
@@ -64,8 +63,6 @@ class ArbitratorSettingsView extends AbstractView {
         Scene scene = new Scene((Parent) loaded.view, 800, 600);
         stage.setScene(scene);
         stage.show();
-
-        return arbitratorRegistrationView;
     }
 
     @FXML
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
index ac2305c091..8d086448da 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
@@ -19,9 +19,7 @@ package io.bitsquare.gui.main.account.arbitrator.browser;
 
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.ActivatableView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
 import io.bitsquare.locale.LanguageUtil;
@@ -34,6 +32,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableView;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
@@ -90,11 +90,10 @@ class ArbitratorBrowserView extends ActivatableView<Pane, Void> implements Arbit
     }*/
 
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         root.getChildren().set(0, loaded.view);
-        return arbitratorProfileView = (ArbitratorProfileView) loaded.controller;
+        arbitratorProfileView = (ArbitratorProfileView) loaded.controller;
     }
 
     @Override
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
index 5f86c7dd10..e2618796d8 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
@@ -18,13 +18,14 @@
 package io.bitsquare.gui.main.account.arbitrator.profile;
 
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.AbstractView;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.settings.Preferences;
 
 import javax.inject.Inject;
 
+import viewfx.AbstractView;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
index 1c8bc053e8..6cf97ae3c3 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
@@ -20,7 +20,6 @@ package io.bitsquare.gui.main.account.arbitrator.registration;
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.arbitrator.Reputation;
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ActivatableView;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
@@ -45,6 +44,8 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableView;
+
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
index 91fd6186aa..b6cc884bb7 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
@@ -17,13 +17,14 @@
 
 package io.bitsquare.gui.main.account.content.changepassword;
 
-import io.bitsquare.gui.InitializableView;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 
 import javax.inject.Inject;
 
+import viewfx.InitializableView;
+import viewfx.Wizard;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
index ab585bf048..9d2451b6d5 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
@@ -17,12 +17,13 @@
 
 package io.bitsquare.gui.main.account.content.changepassword;
 
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
 
 import com.google.inject.Inject;
 
+import viewfx.ViewModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
index 75502ca3c2..69dc71d93b 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
@@ -20,8 +20,6 @@ package io.bitsquare.gui.main.account.content.fiat;
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;
@@ -33,6 +31,9 @@ import com.google.inject.Inject;
 
 import java.util.Currency;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
index e421673cb8..a3880211e7 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
@@ -19,9 +19,7 @@ package io.bitsquare.gui.main.account.content.fiat;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
@@ -37,6 +35,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+import viewfx.Wizard;
+
 import javafx.collections.ListChangeListener;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
index fe3cb96728..856f6cbcae 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
@@ -19,8 +19,6 @@ package io.bitsquare.gui.main.account.content.fiat;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
@@ -31,6 +29,9 @@ import com.google.inject.Inject;
 
 import java.util.Currency;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
index 28896117b9..4a209960a7 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
@@ -22,8 +22,6 @@ import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.arbitrator.Reputation;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;
@@ -45,6 +43,9 @@ import java.util.Currency;
 import java.util.List;
 import java.util.Locale;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
index 23a286905b..9ae92eac6a 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.main.account.content.irc;
 
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.ActivatableViewAndModel;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
@@ -30,6 +28,9 @@ import java.util.Currency;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+import viewfx.Wizard;
+
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
index c54937f373..968a9ccbba 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
@@ -19,8 +19,6 @@ package io.bitsquare.gui.main.account.content.irc;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
@@ -29,6 +27,9 @@ import com.google.inject.Inject;
 
 import java.util.Currency;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
index cb412ace44..3d2fd9c1f9 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
@@ -17,13 +17,14 @@
 
 package io.bitsquare.gui.main.account.content.password;
 
-import io.bitsquare.gui.InitializableView;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 
 import javax.inject.Inject;
 
+import viewfx.InitializableView;
+import viewfx.Wizard;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
index 488ad8ee84..3e15eb5dbe 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
@@ -17,12 +17,13 @@
 
 package io.bitsquare.gui.main.account.content.password;
 
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
 
 import com.google.inject.Inject;
 
+import viewfx.ViewModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
index 6a363b70b7..56d2205e07 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
@@ -21,7 +21,6 @@ import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 
@@ -35,6 +34,8 @@ import com.google.inject.Inject;
 
 import javax.annotation.Nullable;
 
+import viewfx.DataModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
index 126f964677..ecbe3085c0 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
@@ -17,9 +17,7 @@
 
 package io.bitsquare.gui.main.account.content.registration;
 
-import io.bitsquare.gui.InitializableView;
 import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.components.AddressTextField;
 import io.bitsquare.gui.components.BalanceTextField;
 import io.bitsquare.gui.components.Popups;
@@ -32,6 +30,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import viewfx.InitializableView;
+import viewfx.Wizard;
+
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
index bd812a9f21..22a9304a68 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.main.account.content.registration;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ViewModel;
-import io.bitsquare.gui.WithDelegate;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
 
@@ -28,6 +26,9 @@ import org.bitcoinj.core.Coin;
 
 import com.google.inject.Inject;
 
+import viewfx.ViewModel;
+import viewfx.WithDelegate;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
index 3d6cabd4ca..acec0a3840 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
@@ -20,8 +20,6 @@ package io.bitsquare.gui.main.account.content.restrictions;
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.arbitrator.Reputation;
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.LanguageUtil;
@@ -41,6 +39,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
index 95401c6db6..cd22b49464 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
@@ -18,11 +18,8 @@
 package io.bitsquare.gui.main.account.content.restrictions;
 
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.util.ImageUtil;
@@ -33,6 +30,10 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+import viewfx.View;
+import viewfx.Wizard;
+
 import javafx.fxml.FXML;
 import javafx.scene.*;
 import javafx.scene.control.*;
@@ -144,8 +145,7 @@ public class RestrictionsView extends ActivatableViewAndModel<GridPane, Restrict
         Help.openWindow(HelpId.SETUP_RESTRICTION_ARBITRATORS);
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
 
         final Stage stage = new Stage();
@@ -165,8 +165,6 @@ public class RestrictionsView extends ActivatableViewAndModel<GridPane, Restrict
                 updateArbitratorList();
         });
         stage.show();
-
-        return (View) loaded.controller;
     }
 
     void updateArbitratorList() {
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
index 866c400eee..611a383acf 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.main.account.content.restrictions;
 
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
 
@@ -27,6 +25,9 @@ import com.google.inject.Inject;
 
 import java.util.Locale;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
index 5fa3459f92..11dbd49435 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
@@ -17,13 +17,14 @@
 
 package io.bitsquare.gui.main.account.content.seedwords;
 
-import io.bitsquare.gui.InitializableView;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 
 import javax.inject.Inject;
 
+import viewfx.InitializableView;
+import viewfx.Wizard;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
index 9212833292..b2706ead5b 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
@@ -18,13 +18,14 @@
 package io.bitsquare.gui.main.account.content.seedwords;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.inject.Inject;
 
 import java.util.List;
 
+import viewfx.ViewModel;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
index e0711947b4..daefd4bc51 100644
--- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
@@ -17,15 +17,16 @@
 
 package io.bitsquare.gui.main.account.settings;
 
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.util.Colors;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+import viewfx.View;
+import viewfx.Wizard;
+
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
@@ -107,14 +108,12 @@ class AccountSettingsView extends ActivatableViewAndModel {
         navigation.removeListener(listener);
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         content.getChildren().setAll(loaded.view);
         View child = (View) loaded.controller;
         if (child instanceof Wizard.Step)
             ((Wizard.Step) child).hideWizardNavigation();
-        return child;
     }
 
     private void selectMainMenuButton(Navigation.Item item) {
diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
index e43269c436..d42ff5b209 100644
--- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
+++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
@@ -17,11 +17,8 @@
 
 package io.bitsquare.gui.main.account.setup;
 
-import io.bitsquare.gui.ActivatableView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
-import io.bitsquare.gui.Wizard;
 import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
 import io.bitsquare.gui.main.account.content.password.PasswordView;
 import io.bitsquare.gui.main.account.content.registration.RegistrationView;
@@ -30,6 +27,10 @@ import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableView;
+import viewfx.View;
+import viewfx.Wizard;
+
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
 import javafx.scene.control.*;
@@ -151,14 +152,12 @@ class AccountSetupWizard extends ActivatableView implements Wizard {
         }
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    protected void loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         content.getChildren().setAll(loaded.view);
         View child = (View) loaded.controller;
         if (child instanceof Wizard.Step)
             ((Step) child).setParent(this);
-        return child;
     }
 }
 
diff --git a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
index dabfa727d8..42268e7c04 100644
--- a/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
+++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
@@ -17,14 +17,14 @@
 
 package io.bitsquare.gui.main.funds;
 
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
+import viewfx.Activatable;
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -79,8 +79,7 @@ class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
         navigation.removeListener(navigationListener);
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
         // we want to get activate/deactivate called, so we remove the old view on tab change
         if (currentTab != null)
             currentTab.setContent(null);
@@ -96,7 +95,6 @@ class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
         }
         currentTab.setContent(loaded.view);
         root.getSelectionModel().select(currentTab);
-        return (View) loaded.controller;
     }
 }
 
diff --git a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
index 4306c00d60..2c0103afe2 100644
--- a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
+++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
@@ -18,7 +18,6 @@
 package io.bitsquare.gui.main.funds.transactions;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 
@@ -29,6 +28,8 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
index 9dadc3d14e..4c1a739867 100644
--- a/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
+++ b/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
@@ -22,7 +22,6 @@ import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.Restrictions;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.util.Utilities;
@@ -39,6 +38,8 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/src/main/java/io/bitsquare/gui/main/home/HomeView.java
index 942cdb5b3f..26a5cbd02b 100644
--- a/src/main/java/io/bitsquare/gui/main/home/HomeView.java
+++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.home;
 
-import io.bitsquare.gui.AbstractView;
+import viewfx.AbstractView;
 
 // 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/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
index 2f22d3942d..02d01d6973 100644
--- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
+++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
@@ -17,9 +17,7 @@
 
 package io.bitsquare.gui.main.msg;
 
-import io.bitsquare.gui.AbstractView;
-
-import javax.inject.Inject;
+import viewfx.AbstractView;
 
 // will be probably only used for arbitration communication, will be renamed and the icon changed
 class MsgView extends AbstractView {
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
index 1d3a1b22a3..1a961fb541 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
@@ -17,15 +17,15 @@
 
 package io.bitsquare.gui.main.portfolio;
 
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.trade.TradeManager;
 
 import javax.inject.Inject;
 
+import viewfx.Activatable;
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -86,8 +86,7 @@ class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable> {
         currentTab = null;
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
 
         // we want to get activate/deactivate called, so we remove the old view on tab change
         if (currentTab != null)
@@ -107,7 +106,6 @@ class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable> {
         }
         currentTab.setContent(loaded.view);
         root.getSelectionModel().select(currentTab);
-        return (View) loaded.controller;
     }
 }
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
index 6d53b672b7..060974f183 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.gui.main.portfolio.closed;
 
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Trade;
@@ -27,6 +25,9 @@ import io.bitsquare.user.User;
 
 import com.google.inject.Inject;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
index 4287f8a6f4..4334f5538e 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
@@ -17,11 +17,12 @@
 
 package io.bitsquare.gui.main.portfolio.closed;
 
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.components.Popups;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
index 936904cd34..3af0a618e0 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
@@ -17,12 +17,13 @@
 
 package io.bitsquare.gui.main.portfolio.closed;
 
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.inject.Inject;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.collections.ObservableList;
 
 class ClosedTradesViewModel extends ActivatableWithDelegate<ClosedTradesDataModel> implements ViewModel {
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
index d85907797d..b9957b9288 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.gui.main.portfolio.offer;
 
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.TradeManager;
@@ -28,6 +26,9 @@ import com.google.inject.Inject;
 
 import java.util.stream.Collectors;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
index 587d613915..f6d7b280eb 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
@@ -17,12 +17,13 @@
 
 package io.bitsquare.gui.main.portfolio.offer;
 
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.util.Utilities;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
index f898f64f66..d0882d6abe 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
@@ -17,12 +17,13 @@
 
 package io.bitsquare.gui.main.portfolio.offer;
 
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.inject.Inject;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.collections.ObservableList;
 
 class OffersViewModel extends ActivatableWithDelegate<OffersDataModel> implements ViewModel {
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
index 3f9a3ba721..ee3feb1098 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
@@ -21,8 +21,6 @@ import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.TxConfidenceListener;
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Trade;
@@ -41,6 +39,9 @@ import com.google.inject.Inject;
 
 import java.util.Optional;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
index eeadb1aba0..40dd3d5ec1 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
@@ -17,7 +17,6 @@
 
 package io.bitsquare.gui.main.portfolio.pending;
 
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.InputTextField;
@@ -41,6 +40,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
index 97983b3fe5..4a976f36c1 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.main.portfolio.pending;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcAddressValidator;
 import io.bitsquare.locale.BSResources;
@@ -32,6 +30,9 @@ import com.google.inject.Inject;
 
 import java.util.Date;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
index 48e354e296..b2a9b5f4d5 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
@@ -17,15 +17,15 @@
 
 package io.bitsquare.gui.main.settings;
 
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.settings.Preferences;
 
 import javax.inject.Inject;
 
+import viewfx.Activatable;
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -87,8 +87,7 @@ class SettingsView extends ActivatableViewAndModel<TabPane, Activatable> {
         navigation.removeListener(navigationListener);
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private void loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         final Tab tab;
         switch (navigationItem) {
@@ -103,7 +102,6 @@ class SettingsView extends ActivatableViewAndModel<TabPane, Activatable> {
         }
         tab.setContent(loaded.view);
         root.getSelectionModel().select(tab);
-        return (View) loaded.controller;
     }
 }
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
index faed7bbd74..1b25f47409 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
@@ -17,12 +17,13 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.settings.Preferences;
 
 import com.google.inject.Inject;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
index e75cda6e21..42b0f35aca 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
@@ -17,10 +17,10 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.gui.ActivatableViewAndModel;
-
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
index 9a4ee16ea8..95a7b0c41a 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
@@ -17,11 +17,11 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
-
 import com.google.inject.Inject;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index 282786f8f8..f05adafb13 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -18,11 +18,12 @@
 package io.bitsquare.gui.main.settings.network;
 
 import io.bitsquare.btc.BitcoinNetwork;
-import io.bitsquare.gui.InitializableView;
 import io.bitsquare.network.ClientNode;
 
 import javax.inject.Inject;
 
+import viewfx.InitializableView;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
index 72ffa9c96e..4aeb2d16ae 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
@@ -17,9 +17,7 @@
 
 package io.bitsquare.gui.main.trade;
 
-import io.bitsquare.gui.ActivatableView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.main.trade.createoffer.CreateOfferView;
@@ -33,6 +31,9 @@ import org.bitcoinj.utils.Fiat;
 
 import java.util.List;
 
+import viewfx.ActivatableView;
+import viewfx.View;
+
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.scene.*;
@@ -117,8 +118,7 @@ public class TradeView extends ActivatableView<TabPane, Void> {
         navigation.navigationTo(Navigation.Item.MAIN, navigationItem, Navigation.Item.TAKE_OFFER);
     }
 
-    @Override
-    protected View loadView(Navigation.Item navigationItem) {
+    private View loadView(Navigation.Item navigationItem) {
         TabPane tabPane = root;
         if (navigationItem == Navigation.Item.OFFER_BOOK && offerBookView == null) {
             // Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens.
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
index 6581f82cc5..6c1ba95bf7 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
@@ -24,8 +24,6 @@ import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.Country;
 import io.bitsquare.offer.Direction;
@@ -43,6 +41,9 @@ import com.google.inject.Inject;
 import java.util.Locale;
 import java.util.UUID;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
index 6aecc7424c..9ae332f0b3 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
@@ -17,7 +17,6 @@
 
 package io.bitsquare.gui.main.trade.createoffer;
 
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.AddressTextField;
@@ -40,6 +39,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
index e61726d94c..c37e84fa7d 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.main.trade.createoffer;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.FiatValidator;
@@ -33,6 +31,9 @@ import org.bitcoinj.utils.Fiat;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
index e1cd7ca0be..1368b353a3 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.main.trade.offerbook;
 
 import io.bitsquare.bank.BankAccount;
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;
@@ -37,6 +35,9 @@ import com.google.inject.Inject;
 
 import java.util.Comparator;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
index beb143c10f..6918fd02c6 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.gui.main.trade.offerbook;
 
-import io.bitsquare.gui.ActivatableViewAndModel;
-import io.bitsquare.gui.ChildView;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.InputTextField;
@@ -37,6 +35,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+import viewfx.ChildView;
+
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.transformation.SortedList;
 import javafx.event.ActionEvent;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
index 5699bb3abb..be5bd4166a 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.gui.main.trade.offerbook;
 
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.OptionalBtcValidator;
@@ -32,6 +30,9 @@ import org.bitcoinj.utils.Fiat;
 
 import com.google.inject.Inject;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.transformation.SortedList;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
index 44868fcb5a..a96a7ba9a2 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
@@ -21,8 +21,6 @@ import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.Activatable;
-import io.bitsquare.gui.DataModel;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.settings.Preferences;
@@ -35,6 +33,9 @@ import org.bitcoinj.utils.Fiat;
 
 import com.google.inject.Inject;
 
+import viewfx.Activatable;
+import viewfx.DataModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
index b571c923d3..2c13c416d7 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
@@ -18,7 +18,6 @@
 package io.bitsquare.gui.main.trade.takeoffer;
 
 
-import io.bitsquare.gui.ActivatableViewAndModel;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.AddressTextField;
@@ -41,6 +40,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableViewAndModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
index 3a7eec89af..fef24e88ab 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.main.trade.takeoffer;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ActivatableWithDelegate;
-import io.bitsquare.gui.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
@@ -32,6 +30,9 @@ import org.bitcoinj.core.Coin;
 
 import javax.inject.Inject;
 
+import viewfx.ActivatableWithDelegate;
+import viewfx.ViewModel;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/io/bitsquare/gui/AbstractView.java b/src/main/java/viewfx/AbstractView.java
similarity index 86%
rename from src/main/java/io/bitsquare/gui/AbstractView.java
rename to src/main/java/viewfx/AbstractView.java
index f1dd0433c2..4ad427dd0e 100644
--- a/src/main/java/io/bitsquare/gui/AbstractView.java
+++ b/src/main/java/viewfx/AbstractView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 import javafx.fxml.FXML;
 import javafx.scene.*;
@@ -37,8 +37,4 @@ public abstract class AbstractView<R extends Node, M> implements View {
     public AbstractView() {
         this(null);
     }
-
-    protected View loadView(Navigation.Item navigationItem) {
-        throw new UnsupportedOperationException("loadView not implemented");
-    }
 }
diff --git a/src/main/java/io/bitsquare/gui/Activatable.java b/src/main/java/viewfx/Activatable.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/Activatable.java
rename to src/main/java/viewfx/Activatable.java
index 7dbd073f7f..ca94d3751d 100644
--- a/src/main/java/io/bitsquare/gui/Activatable.java
+++ b/src/main/java/viewfx/Activatable.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public interface Activatable {
     void activate();
diff --git a/src/main/java/io/bitsquare/gui/ActivatableView.java b/src/main/java/viewfx/ActivatableView.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/ActivatableView.java
rename to src/main/java/viewfx/ActivatableView.java
index 7a5f856c44..703afab0c2 100644
--- a/src/main/java/io/bitsquare/gui/ActivatableView.java
+++ b/src/main/java/viewfx/ActivatableView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 import javafx.scene.*;
 
diff --git a/src/main/java/io/bitsquare/gui/ActivatableViewAndModel.java b/src/main/java/viewfx/ActivatableViewAndModel.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/ActivatableViewAndModel.java
rename to src/main/java/viewfx/ActivatableViewAndModel.java
index 3fca65258b..a5447dbe49 100644
--- a/src/main/java/io/bitsquare/gui/ActivatableViewAndModel.java
+++ b/src/main/java/viewfx/ActivatableViewAndModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 import javafx.scene.*;
 
diff --git a/src/main/java/io/bitsquare/gui/ActivatableWithDelegate.java b/src/main/java/viewfx/ActivatableWithDelegate.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/ActivatableWithDelegate.java
rename to src/main/java/viewfx/ActivatableWithDelegate.java
index 0d38dd09d2..5eb8068eb2 100644
--- a/src/main/java/io/bitsquare/gui/ActivatableWithDelegate.java
+++ b/src/main/java/viewfx/ActivatableWithDelegate.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public abstract class ActivatableWithDelegate<D extends Activatable> extends WithDelegate<D> implements  Activatable {
 
diff --git a/src/main/java/io/bitsquare/gui/ChildView.java b/src/main/java/viewfx/ChildView.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/ChildView.java
rename to src/main/java/viewfx/ChildView.java
index 93a250f16b..8cfcc3f65b 100644
--- a/src/main/java/io/bitsquare/gui/ChildView.java
+++ b/src/main/java/viewfx/ChildView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public interface ChildView<Parent extends View> extends View {
     void setParent(Parent parent);
diff --git a/src/main/java/io/bitsquare/gui/DataModel.java b/src/main/java/viewfx/DataModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/DataModel.java
rename to src/main/java/viewfx/DataModel.java
index 86eb5f3ba4..a1f6cac8a1 100644
--- a/src/main/java/io/bitsquare/gui/DataModel.java
+++ b/src/main/java/viewfx/DataModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public interface DataModel extends Model {
 }
diff --git a/src/main/java/io/bitsquare/gui/InitializableView.java b/src/main/java/viewfx/InitializableView.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/InitializableView.java
rename to src/main/java/viewfx/InitializableView.java
index 67cf88f68a..324f892f58 100644
--- a/src/main/java/io/bitsquare/gui/InitializableView.java
+++ b/src/main/java/viewfx/InitializableView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 import java.net.URL;
 
diff --git a/src/main/java/io/bitsquare/gui/Model.java b/src/main/java/viewfx/Model.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/Model.java
rename to src/main/java/viewfx/Model.java
index dd9f24447b..01dc1427b8 100644
--- a/src/main/java/io/bitsquare/gui/Model.java
+++ b/src/main/java/viewfx/Model.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public interface Model {
 }
diff --git a/src/main/java/io/bitsquare/gui/View.java b/src/main/java/viewfx/View.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/View.java
rename to src/main/java/viewfx/View.java
index 8a5d8eaead..3e7a37bb8a 100644
--- a/src/main/java/io/bitsquare/gui/View.java
+++ b/src/main/java/viewfx/View.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public interface View {
 }
diff --git a/src/main/java/io/bitsquare/gui/ViewModel.java b/src/main/java/viewfx/ViewModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/ViewModel.java
rename to src/main/java/viewfx/ViewModel.java
index 9739d090c9..b099615b97 100644
--- a/src/main/java/io/bitsquare/gui/ViewModel.java
+++ b/src/main/java/viewfx/ViewModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public interface ViewModel extends Model {
 }
diff --git a/src/main/java/io/bitsquare/gui/WithDelegate.java b/src/main/java/viewfx/WithDelegate.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/WithDelegate.java
rename to src/main/java/viewfx/WithDelegate.java
index ba964d0944..ca8e7db06a 100644
--- a/src/main/java/io/bitsquare/gui/WithDelegate.java
+++ b/src/main/java/viewfx/WithDelegate.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/src/main/java/io/bitsquare/gui/Wizard.java b/src/main/java/viewfx/Wizard.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/Wizard.java
rename to src/main/java/viewfx/Wizard.java
index 93bdeffa6c..5b510ca05a 100644
--- a/src/main/java/io/bitsquare/gui/Wizard.java
+++ b/src/main/java/viewfx/Wizard.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui;
+package viewfx;
 
 public interface Wizard extends View {
     void nextStep(Step currentStep);
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 8f89fd0d22..fe780b595e 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -38,11 +38,6 @@
     <logger name="io.netty.channel" level="WARN"/>
     <logger name="io.netty.buffer" level="WARN"/>
 
-    <logger name="io.bitsquare.gui.DataModel" level="WARN"/>
-    <logger name="io.bitsquare.gui.ActivatableWithDelegate" level="WARN"/>
-    <logger name="io.bitsquare.gui.ViewController" level="WARN"/>
-    <logger name="io.bitsquare.gui.ActivatableView" level="WARN"/>
-    <logger name="io.bitsquare.gui.ActivatableViewAndModel" level="WARN"/>
     <logger name="io.bitsquare.gui.util.Profiler" level="WARN"/>
     <logger name="io.bitsquare.persistence.Persistence" level="WARN"/>
     <logger name="io.bitsquare.locale.BSResources" level="OFF"/>