Rename *ViewCB => *View

src/main/java/io/bitsquare/app/BitsquareEnvironment.java

@@ -20,7 +20,7 @@ package io.bitsquare.app;
 import io.bitsquare.BitsquareException;
 import io.bitsquare.btc.UserAgent;
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.util.Utilities;
 import io.bitsquare.util.spring.JOptCommandLinePropertySource;
@@ -122,7 +122,7 @@ public class BitsquareEnvironment extends StandardEnvironment {
             setProperty(Persistence.DIR_KEY, appDataDir);
             setProperty(Persistence.PREFIX_KEY, appName + "_pref");
 
-            setProperty(ViewCB.TITLE_KEY, appName);
+            setProperty(View.TITLE_KEY, appName);
         }});
     }
 

src/main/java/io/bitsquare/gui/CachedView.java

@@ -30,14 +30,14 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * If caching is used for loader we use the CachedViewController for turning the controller into sleep mode if not
  * active and awake it at reactivation.
  */
-public abstract class CachedViewCB<M extends Activatable> extends ViewCB<M> implements Activatable {
+public abstract class CachedView<M extends Activatable> extends View<M> implements Activatable {
-    private static final Logger log = LoggerFactory.getLogger(CachedViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(CachedView.class);
 
-    public CachedViewCB(M model) {
+    public CachedView(M model) {
         super(checkNotNull(model, "Model must not be null"));
     }
 
-    public CachedViewCB() {
+    public CachedView() {
         this((M) Activatable.NOOP_INSTANCE);
     }
 

src/main/java/io/bitsquare/gui/GuiModule.java

@@ -63,6 +63,6 @@ public class GuiModule extends BitsquareModule {
         bind(Stage.class).toInstance(primaryStage);
         Popups.primaryStage = primaryStage;
 
-        bindConstant().annotatedWith(Names.named(ViewCB.TITLE_KEY)).to(env.getRequiredProperty(ViewCB.TITLE_KEY));
+        bindConstant().annotatedWith(Names.named(View.TITLE_KEY)).to(env.getRequiredProperty(View.TITLE_KEY));
     }
 }

src/main/java/io/bitsquare/gui/View.java

@@ -31,9 +31,9 @@ import org.slf4j.LoggerFactory;
 /**
  * Non caching version for code behind classes using the PM pattern
  */
-public abstract class ViewCB<M> implements Initializable {
+public abstract class View<M> implements Initializable {
 
-    private static final Logger log = LoggerFactory.getLogger(ViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(View.class);
 
     public static final String TITLE_KEY = "view.title";
 
@@ -44,11 +44,11 @@ public abstract class ViewCB<M> implements Initializable {
 
     @FXML protected Parent root;
 
-    public ViewCB(M model) {
+    public View(M model) {
         this.model = model;
     }
 
-    public ViewCB() {
+    public View() {
         this(null);
     }
 

src/main/java/io/bitsquare/gui/main/MainViewCB.java

@@ -22,7 +22,7 @@ import io.bitsquare.bank.BankAccount;
 import io.bitsquare.gui.FxmlController;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.SystemNotification;
@@ -125,8 +125,8 @@ public class MainViewCB extends FxmlController<Pane, MainModel> {
 
             ViewLoader.Item loaded = viewLoader.load(navItems[1].getFxmlUrl());
             contentContainer.getChildren().setAll(loaded.view);
-            if (loaded.controller instanceof ViewCB)
+            if (loaded.controller instanceof View)
-                ((ViewCB) loaded.controller).setParent(this);
+                ((View) loaded.controller).setParent(this);
 
             navButtons.getToggles().stream()
                     .filter(toggle -> toggle instanceof ToggleButton)

src/main/java/io/bitsquare/gui/main/account/AccountView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountView"
          prefHeight="630.0" prefWidth="1000.0"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"

src/main/java/io/bitsquare/gui/main/account/AccountView.java

@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 
 import java.net.URL;
@@ -36,9 +36,9 @@ import javafx.scene.control.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AccountViewCB extends CachedViewCB {
+public class AccountView extends CachedView {
 
-    private static final Logger log = LoggerFactory.getLogger(AccountViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(AccountView.class);
 
     private Navigation.Listener navigationListener;
     private ChangeListener<Tab> tabChangeListener;
@@ -55,7 +55,7 @@ public class AccountViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private AccountViewCB(AccountPM model, ViewLoader viewLoader, Navigation navigation) {
+    private AccountView(AccountPM model, ViewLoader viewLoader, Navigation navigation) {
         this.model = model;
         this.viewLoader = viewLoader;
         this.navigation = navigation;
@@ -157,7 +157,7 @@ public class AccountViewCB extends CachedViewCB {
         tab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(tab);
         Initializable childController = loaded.controller;
-        ((ViewCB) childController).setParent(this);
+        ((View) childController).setParent(this);
 
         return childController;
     }

src/main/java/io/bitsquare/gui/main/account/MultiStepNavigation.java

@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 
 public interface MultiStepNavigation {
-    void nextStep(ViewCB useSettingsContext);
+    void nextStep(View useSettingsContext);
 }

src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView"
             prefHeight="660.0" prefWidth="1000.0"
             xmlns:fx="http://javafx.com/fxml">
     <VBox spacing="20">

src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java

@@ -17,14 +17,10 @@
 
 package io.bitsquare.gui.main.account.arbitrator;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.ViewLoader;
-import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationViewCB;
+import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
-
-import java.net.URL;
-
-import java.util.ResourceBundle;
 
 import javax.inject.Inject;
 
@@ -35,13 +31,13 @@ import javafx.stage.Modality;
 import javafx.stage.Stage;
 
 // TODO Arbitration is very basic yet
-public class ArbitratorSettingsViewCB extends CachedViewCB {
+public class ArbitratorSettingsView extends CachedView {
 
     private final ViewLoader viewLoader;
     private final Navigation navigation;
     private final Stage primaryStage;
 
-    private ArbitratorRegistrationViewCB arbitratorRegistrationViewCB;
+    private ArbitratorRegistrationView arbitratorRegistrationViewCB;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -49,7 +45,7 @@ public class ArbitratorSettingsViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private ArbitratorSettingsViewCB(ViewLoader viewLoader, Navigation navigation, Stage primaryStage) {
+    private ArbitratorSettingsView(ViewLoader viewLoader, Navigation navigation, Stage primaryStage) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
         this.primaryStage = primaryStage;
@@ -64,7 +60,7 @@ public class ArbitratorSettingsViewCB extends CachedViewCB {
     @Override
     protected Initializable loadView(Navigation.Item navigationItem) {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
-        arbitratorRegistrationViewCB = (ArbitratorRegistrationViewCB) loaded.controller;
+        arbitratorRegistrationViewCB = (ArbitratorRegistrationView) loaded.controller;
 
         final Stage stage = new Stage();
         stage.setTitle("Arbitrator");

src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml

@@ -18,7 +18,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.browser.ArbitratorBrowserViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.browser.ArbitratorBrowserView"
             prefHeight="600" prefWidth="800" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
             AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
             xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java

@@ -19,11 +19,11 @@ package io.bitsquare.gui.main.account.arbitrator.browser;
 
 import io.bitsquare.account.AccountSettings;
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
-import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileViewCB;
+import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.ArbitratorListener;
@@ -44,7 +44,7 @@ import javafx.scene.layout.*;
 import javafx.stage.Stage;
 
 // TODO Arbitration is very basic yet
-public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorListener {
+public class ArbitratorBrowserView extends CachedView implements ArbitratorListener {
 
     private final ViewLoader viewLoader;
     private final AccountSettings accountSettings;
@@ -54,7 +54,7 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL
     private final List<Arbitrator> allArbitrators = new ArrayList<>();
 
     private Arbitrator currentArbitrator;
-    private ArbitratorProfileViewCB arbitratorProfileViewCB;
+    private ArbitratorProfileView arbitratorProfileViewCB;
     private int index = -1;
 
     @FXML Button prevButton, nextButton, selectButton, closeButton;
@@ -66,8 +66,8 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public ArbitratorBrowserViewCB(ViewLoader viewLoader, AccountSettings accountSettings, Persistence persistence,
+    public ArbitratorBrowserView(ViewLoader viewLoader, AccountSettings accountSettings, Persistence persistence,
-                                   MessageService messageService) {
+                                 MessageService messageService) {
         this.viewLoader = viewLoader;
         this.accountSettings = accountSettings;
         this.persistence = persistence;
@@ -121,8 +121,8 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL
 
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         ((Pane) root).getChildren().set(0, loaded.view);
-        Initializable childController = arbitratorProfileViewCB = (ArbitratorProfileViewCB) loaded.controller;
+        Initializable childController = arbitratorProfileViewCB = (ArbitratorProfileView) loaded.controller;
-        ((ViewCB) childController).setParent(this);
+        ((View) childController).setParent(this);
 
         return childController;
     }

src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml

@@ -19,7 +19,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileViewCB"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView"
           hgap="5.0" vgap="5.0" AnchorPane.bottomAnchor="80.0" AnchorPane.leftAnchor="10.0"
           AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java

@@ -18,22 +18,18 @@
 package io.bitsquare.gui.main.account.arbitrator.profile;
 
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.settings.Preferences;
 
-import java.net.URL;
-
-import java.util.ResourceBundle;
-
 import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
 // TODO Arbitration is very basic yet
-public class ArbitratorProfileViewCB extends CachedViewCB {
+public class ArbitratorProfileView extends CachedView {
 
     private final Preferences preferences;
 
@@ -53,8 +49,8 @@ public class ArbitratorProfileViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public ArbitratorProfileViewCB(Preferences preferences, Persistence persistence,
+    public ArbitratorProfileView(Preferences preferences, Persistence persistence,
-                                   BSFormatter formatter) {
+                                 BSFormatter formatter) {
         this.preferences = preferences;
         this.persistence = persistence;
 

src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <AnchorPane fx:id="root"
-            fx:controller="io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationViewCB"
+            fx:controller="io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView"
             prefHeight="600" prefWidth="800" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
             AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
             xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java

@@ -20,7 +20,7 @@ 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.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
@@ -61,8 +61,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 // TODO Arbitration is very basic yet
-public class ArbitratorRegistrationViewCB extends CachedViewCB {
+public class ArbitratorRegistrationView extends CachedView {
-    private static final Logger log = LoggerFactory.getLogger(ArbitratorRegistrationViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(ArbitratorRegistrationView.class);
 
     private final Persistence persistence;
     private final WalletService walletService;
@@ -100,8 +100,8 @@ public class ArbitratorRegistrationViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private ArbitratorRegistrationViewCB(Persistence persistence, WalletService walletService,
+    private ArbitratorRegistrationView(Persistence persistence, WalletService walletService,
-                                         MessageService messageService, User user, BSFormatter formatter) {
+                                       MessageService messageService, User user, BSFormatter formatter) {
         this.persistence = persistence;
         this.walletService = walletService;
         this.messageService = messageService;

src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml

@@ -22,7 +22,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.changepassword.ChangePasswordViewCB"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.changepassword.ChangePasswordView"
           hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.account.content.changepassword;
 
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.main.account.MultiStepNavigation;
 import io.bitsquare.gui.main.account.content.ContextAware;
 import io.bitsquare.gui.main.help.Help;
@@ -36,9 +36,9 @@ import javafx.scene.layout.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ChangePasswordViewCB extends ViewCB<ChangePasswordPM> implements ContextAware {
+public class ChangePasswordView extends View<ChangePasswordPM> implements ContextAware {
 
-    private static final Logger log = LoggerFactory.getLogger(ChangePasswordViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(ChangePasswordView.class);
 
     @FXML HBox buttonsHBox;
     @FXML Button saveButton, skipButton;
@@ -50,7 +50,7 @@ public class ChangePasswordViewCB extends ViewCB<ChangePasswordPM> implements Co
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private ChangePasswordViewCB(ChangePasswordPM model) {
+    private ChangePasswordView(ChangePasswordPM model) {
         super(model);
     }
 

src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml

@@ -24,7 +24,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.fiat.FiatAccountViewCB" hgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.fiat.FiatAccountView" hgap="5.0"
           vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java

@@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.fiat;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
@@ -56,9 +56,9 @@ import org.slf4j.LoggerFactory;
 
 import static javafx.beans.binding.Bindings.createBooleanBinding;
 
-public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements ContextAware {
+public class FiatAccountView extends CachedView<FiatAccountPM> implements ContextAware {
 
-    private static final Logger log = LoggerFactory.getLogger(FiatAccountViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(FiatAccountView.class);
 
     @FXML HBox buttonsHBox;
     @FXML ComboBox<Region> regionComboBox;
@@ -76,7 +76,7 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    FiatAccountViewCB(FiatAccountPM model, OverlayManager overlayManager) {
+    FiatAccountView(FiatAccountPM model, OverlayManager overlayManager) {
         super(model);
 
         this.overlayManager = overlayManager;

src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml

@@ -24,7 +24,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.irc.IrcAccountViewCB" hgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.irc.IrcAccountView" hgap="5.0"
           vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java

@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main.account.content.irc;
 
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.account.MultiStepNavigation;
@@ -47,9 +47,9 @@ import org.slf4j.LoggerFactory;
 /*
 Just temporary for giving the user a possibility to test the app via simulating the bank transfer in a IRC chat.
  */
-public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements ContextAware {
+public class IrcAccountView extends CachedView<IrcAccountPM> implements ContextAware {
 
-    private static final Logger log = LoggerFactory.getLogger(IrcAccountViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(IrcAccountView.class);
 
     @FXML HBox buttonsHBox;
     @FXML InputTextField ircNickNameTextField;
@@ -63,7 +63,7 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    IrcAccountViewCB(IrcAccountPM model) {
+    IrcAccountView(IrcAccountPM model) {
         super(model);
     }
 

src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml

@@ -22,7 +22,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.password.PasswordViewCB" hgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.password.PasswordView" hgap="5.0"
           vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.account.content.password;
 
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.main.account.MultiStepNavigation;
 import io.bitsquare.gui.main.account.content.ContextAware;
 import io.bitsquare.gui.main.help.Help;
@@ -36,9 +36,9 @@ import javafx.scene.layout.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PasswordViewCB extends ViewCB<PasswordPM> implements ContextAware {
+public class PasswordView extends View<PasswordPM> implements ContextAware {
 
-    private static final Logger log = LoggerFactory.getLogger(PasswordViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(PasswordView.class);
 
     @FXML HBox buttonsHBox;
     @FXML Button saveButton, skipButton;
@@ -50,7 +50,7 @@ public class PasswordViewCB extends ViewCB<PasswordPM> implements ContextAware {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private PasswordViewCB(PasswordPM model) {
+    private PasswordView(PasswordPM model) {
         super(model);
     }
 

src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml

@@ -24,7 +24,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.registration.RegistrationViewCB" hgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.registration.RegistrationView" hgap="5.0"
           vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java

@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main.account.content.registration;
 
 import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.components.AddressTextField;
 import io.bitsquare.gui.components.BalanceTextField;
 import io.bitsquare.gui.components.Popups;
@@ -48,9 +48,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public class RegistrationViewCB extends ViewCB<RegistrationPM> implements ContextAware {
+public class RegistrationView extends View<RegistrationPM> implements ContextAware {
 
-    private static final Logger log = LoggerFactory.getLogger(RegistrationViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(RegistrationView.class);
 
     private final OverlayManager overlayManager;
 
@@ -67,7 +67,7 @@ public class RegistrationViewCB extends ViewCB<RegistrationPM> implements Contex
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private RegistrationViewCB(RegistrationPM model, OverlayManager overlayManager) {
+    private RegistrationView(RegistrationPM model, OverlayManager overlayManager) {
         super(model);
         this.overlayManager = overlayManager;
     }
@@ -127,7 +127,7 @@ public class RegistrationViewCB extends ViewCB<RegistrationPM> implements Contex
                         getProperties().put("type", "CLOSE");
                         try {
                             if (parent instanceof MultiStepNavigation)
-                                ((MultiStepNavigation) parent).nextStep(RegistrationViewCB.this);
+                                ((MultiStepNavigation) parent).nextStep(RegistrationView.this);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }

src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml

@@ -22,13 +22,13 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.restrictions.RestrictionsViewCB" hgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.restrictions.RestrictionsView" hgap="5.0"
           vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
           xmlns:fx="http://javafx.com/fxml">
 
-    <!-- 
+    <!--
     languages
      -->
     <TitledGroupBg text="Add languages" GridPane.rowSpan="3"/>
@@ -47,7 +47,7 @@
     <InfoDisplay gridPane="$root" onAction="#onOpenLanguagesHelp" rowIndex="2"
                  text="Trade with users who have at least 1 shared language."/>
 
-    <!-- 
+    <!--
     countries
     -->
     <TitledGroupBg text="Add countries" GridPane.rowIndex="3" GridPane.rowSpan="3">
@@ -84,7 +84,7 @@
                  text="Restrict trades with these payments account countries."/>
 
 
-    <!-- 
+    <!--
     arbitrators
      -->
     <TitledGroupBg text="Add arbitrators" GridPane.rowIndex="6" GridPane.rowSpan="3">

src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java

@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main.account.content.restrictions;
 
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.MultiStepNavigation;
@@ -50,9 +50,9 @@ import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements ContextAware {
+public class RestrictionsView extends CachedView<RestrictionsPM> implements ContextAware {
 
-    private static final Logger log = LoggerFactory.getLogger(RestrictionsViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(RestrictionsView.class);
 
     @FXML ListView<Locale> languagesListView;
     @FXML ListView<Country> countriesListView;
@@ -71,7 +71,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private RestrictionsViewCB(RestrictionsPM model, ViewLoader viewLoader, Stage primaryStage) {
+    private RestrictionsView(RestrictionsPM model, ViewLoader viewLoader, Stage primaryStage) {
         super(model);
         this.viewLoader = viewLoader;
         this.primaryStage = primaryStage;

src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml

@@ -23,7 +23,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.seedwords.SeedWordsViewCB" hgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.seedwords.SeedWordsView" hgap="5.0"
           vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.account.content.seedwords;
 
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.main.account.MultiStepNavigation;
 import io.bitsquare.gui.main.account.content.ContextAware;
 import io.bitsquare.gui.main.help.Help;
@@ -36,9 +36,9 @@ import javafx.scene.layout.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SeedWordsViewCB extends ViewCB<SeedWordsPM> implements ContextAware {
+public class SeedWordsView extends View<SeedWordsPM> implements ContextAware {
 
-    private static final Logger log = LoggerFactory.getLogger(SeedWordsViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(SeedWordsView.class);
 
     @FXML Button completedButton;
     @FXML TextArea seedWordsTextArea;
@@ -49,7 +49,7 @@ public class SeedWordsViewCB extends ViewCB<SeedWordsPM> implements ContextAware
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private SeedWordsViewCB(SeedWordsPM model) {
+    private SeedWordsView(SeedWordsPM model) {
         super(model);
     }
 

src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml

@@ -19,7 +19,7 @@
 
 
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.settings.AccountSettingsViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.settings.AccountSettingsView"
             prefHeight="660.0" prefWidth="1000.0"
             xmlns:fx="http://javafx.com/fxml">
 

src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java

@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.account.settings;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.content.ContextAware;
 import io.bitsquare.gui.util.Colors;
@@ -43,9 +43,9 @@ import de.jensd.fx.fontawesome.AwesomeIcon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AccountSettingsViewCB extends CachedViewCB {
+public class AccountSettingsView extends CachedView {
 
-    private static final Logger log = LoggerFactory.getLogger(AccountSettingsViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(AccountSettingsView.class);
 
     private final ViewLoader viewLoader;
     private final Navigation navigation;
@@ -62,7 +62,7 @@ public class AccountSettingsViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private AccountSettingsViewCB(ViewLoader viewLoader, Navigation navigation) {
+    private AccountSettingsView(ViewLoader viewLoader, Navigation navigation) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
     }
@@ -139,7 +139,7 @@ public class AccountSettingsViewCB extends CachedViewCB {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         content.getChildren().setAll(loaded.view);
         childController = loaded.controller;
-        ((ViewCB) childController).setParent(this);
+        ((View) childController).setParent(this);
         ((ContextAware) childController).useSettingsContext(true);
         return childController;
     }

src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml

@@ -19,7 +19,7 @@
 
 
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.setup.AccountSetupViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.setup.AccountSetupView"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" spacing="5" prefWidth="300" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"

src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupView.java

@@ -17,17 +17,16 @@
 
 package io.bitsquare.gui.main.account.setup;
 
-import io.bitsquare.gui.Model;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.main.account.MultiStepNavigation;
 import io.bitsquare.gui.main.account.content.ContextAware;
-import io.bitsquare.gui.main.account.content.irc.IrcAccountViewCB;
+import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
-import io.bitsquare.gui.main.account.content.password.PasswordViewCB;
+import io.bitsquare.gui.main.account.content.password.PasswordView;
-import io.bitsquare.gui.main.account.content.registration.RegistrationViewCB;
+import io.bitsquare.gui.main.account.content.registration.RegistrationView;
-import io.bitsquare.gui.main.account.content.restrictions.RestrictionsViewCB;
+import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
-import io.bitsquare.gui.main.account.content.seedwords.SeedWordsViewCB;
+import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 
 import java.net.URL;
 
@@ -48,9 +47,9 @@ import org.slf4j.LoggerFactory;
 /**
  * This UI is not cached as it is normally only needed once.
  */
-public class AccountSetupViewCB extends ViewCB implements MultiStepNavigation {
+public class AccountSetupView extends View implements MultiStepNavigation {
 
-    private static final Logger log = LoggerFactory.getLogger(AccountSetupViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(AccountSetupView.class);
 
     private WizardItem seedWords, password, fiatAccount, restrictions, registration;
     private Navigation.Listener listener;
@@ -67,7 +66,7 @@ public class AccountSetupViewCB extends ViewCB implements MultiStepNavigation {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private AccountSetupViewCB(ViewLoader viewLoader, Navigation navigation) {
+    private AccountSetupView(ViewLoader viewLoader, Navigation navigation) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
     }
@@ -153,24 +152,24 @@ public class AccountSetupViewCB extends ViewCB implements MultiStepNavigation {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void nextStep(ViewCB childView) {
+    public void nextStep(View childView) {
-        if (childView instanceof SeedWordsViewCB) {
+        if (childView instanceof SeedWordsView) {
             seedWords.onCompleted();
             childController = password.show();
         }
-        else if (childView instanceof PasswordViewCB) {
+        else if (childView instanceof PasswordView) {
             password.onCompleted();
             childController = restrictions.show();
         }
-        else if (childView instanceof RestrictionsViewCB) {
+        else if (childView instanceof RestrictionsView) {
             restrictions.onCompleted();
             childController = fiatAccount.show();
         }
-        else if (childView instanceof IrcAccountViewCB) {
+        else if (childView instanceof IrcAccountView) {
             fiatAccount.onCompleted();
             childController = registration.show();
         }
-        else if (childView instanceof RegistrationViewCB) {
+        else if (childView instanceof RegistrationView) {
             registration.onCompleted();
             childController = null;
 
@@ -191,7 +190,7 @@ public class AccountSetupViewCB extends ViewCB implements MultiStepNavigation {
         ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl());
         content.getChildren().setAll(loaded.view);
         childController = loaded.controller;
-        ((ViewCB) childController).setParent(this);
+        ((View) childController).setParent(this);
         ((ContextAware) childController).useSettingsContext(false);
         return childController;
     }
@@ -200,15 +199,15 @@ public class AccountSetupViewCB extends ViewCB implements MultiStepNavigation {
 class WizardItem extends HBox {
     private static final Logger log = LoggerFactory.getLogger(WizardItem.class);
 
-    private ViewCB childController;
+    private View childController;
 
     private final ImageView imageView;
     private final Label titleLabel;
     private final Label subTitleLabel;
-    private final AccountSetupViewCB host;
+    private final AccountSetupView host;
     private final Navigation.Item navigationItem;
 
-    WizardItem(AccountSetupViewCB host, String title, String subTitle,
+    WizardItem(AccountSetupView host, String title, String subTitle,
                Navigation.Item navigationItem) {
         this.host = host;
         this.navigationItem = navigationItem;
@@ -247,7 +246,7 @@ class WizardItem extends HBox {
         getChildren().addAll(imageView, vBox);
     }
 
-    ViewCB show() {
+    View show() {
         host.loadView(navigationItem);
        /* navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, Navigation
                         .Item.ACCOUNT_SETUP,

src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml

@@ -18,7 +18,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.funds.FundsViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.funds.FundsView"
          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
          AnchorPane.topAnchor="0.0"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/funds/FundsView.java

@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.funds;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 
 import java.net.URL;
@@ -33,7 +33,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
 
-public class FundsViewCB extends CachedViewCB {
+public class FundsView extends CachedView {
 
     private Navigation.Listener navigationListener;
     private ChangeListener<Tab> tabChangeListener;
@@ -50,7 +50,7 @@ public class FundsViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    FundsViewCB(ViewLoader viewLoader, Navigation navigation) {
+    FundsView(ViewLoader viewLoader, Navigation navigation) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
     }
@@ -120,7 +120,7 @@ public class FundsViewCB extends CachedViewCB {
         currentTab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(currentTab);
         Initializable childController = loaded.controller;
-        ((ViewCB) childController).setParent(this);
+        ((View) childController).setParent(this);
 
         return childController;
     }

src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.transactions.TransactionsViewCB"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.transactions.TransactionsView"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java

@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main.funds.transactions;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 
@@ -42,8 +42,8 @@ import javafx.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TransactionsViewCB extends CachedViewCB {
+public class TransactionsView extends CachedView {
-    private static final Logger log = LoggerFactory.getLogger(TransactionsViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(TransactionsView.class);
 
     private final WalletService walletService;
     private final BSFormatter formatter;
@@ -59,7 +59,7 @@ public class TransactionsViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private TransactionsViewCB(WalletService walletService, BSFormatter formatter) {
+    private TransactionsView(WalletService walletService, BSFormatter formatter) {
         this.walletService = walletService;
         this.formatter = formatter;
     }

src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.withdrawal.WithdrawalViewCB"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.withdrawal.WithdrawalView"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java

@@ -22,7 +22,7 @@ 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.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.util.Utilities;
@@ -59,8 +59,8 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class WithdrawalViewCB extends CachedViewCB {
+public class WithdrawalView extends CachedView {
-    private static final Logger log = LoggerFactory.getLogger(WithdrawalViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(WithdrawalView.class);
 
 
     private final WalletService walletService;
@@ -79,7 +79,7 @@ public class WithdrawalViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private WithdrawalViewCB(WalletService walletService, BSFormatter formatter) {
+    private WithdrawalView(WalletService walletService, BSFormatter formatter) {
         this.walletService = walletService;
         this.formatter = formatter;
     }

src/main/java/io/bitsquare/gui/main/home/HomeView.fxml

@@ -20,7 +20,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.home.HomeViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.home.HomeView"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/home/HomeView.java

@@ -17,19 +17,15 @@
 
 package io.bitsquare.gui.main.home;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
-
-import java.net.URL;
-
-import java.util.ResourceBundle;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 // 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
-public class HomeViewCB extends CachedViewCB {
+public class HomeView extends CachedView {
-    private static final Logger log = LoggerFactory.getLogger(HomeViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(HomeView.class);
 
 
 }

src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml

@@ -20,7 +20,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.msg.MsgViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.msg.MsgView"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/msg/MsgView.java

@@ -17,13 +17,9 @@
 
 package io.bitsquare.gui.main.msg;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
 
-import java.net.URL;
-
-import java.util.ResourceBundle;
-
 import javax.inject.Inject;
 
 import javafx.fxml.Initializable;
@@ -34,8 +30,8 @@ import org.slf4j.LoggerFactory;
 // will be probably only used for arbitration communication, will be renamed and the icon changed
 
 
-public class MsgViewCB extends CachedViewCB {
+public class MsgView extends CachedView {
-    private static final Logger log = LoggerFactory.getLogger(MsgViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(MsgView.class);
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -43,7 +39,7 @@ public class MsgViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private MsgViewCB() {
+    private MsgView() {
     }
 
 

src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.PortfolioViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.PortfolioView"
          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
          AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" tabClosingPolicy="UNAVAILABLE"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java

@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.portfolio;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.trade.TradeManager;
 
@@ -34,7 +34,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
 
-public class PortfolioViewCB extends CachedViewCB {
+public class PortfolioView extends CachedView {
 
     private Tab currentTab;
     private Navigation.Listener navigationListener;
@@ -52,7 +52,7 @@ public class PortfolioViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    PortfolioViewCB(ViewLoader viewLoader, Navigation navigation, TradeManager tradeManager) {
+    PortfolioView(ViewLoader viewLoader, Navigation navigation, TradeManager tradeManager) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
         this.tradeManager = tradeManager;
@@ -130,7 +130,7 @@ public class PortfolioViewCB extends CachedViewCB {
         currentTab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(currentTab);
         Initializable childController = loaded.controller;
-        ((ViewCB) childController).setParent(this);
+        ((View) childController).setParent(this);
 
         return childController;
     }

src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.closed.ClosedTradesViewCB"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.closed.ClosedTradesView"
           hgap="5.0" vgap="5"
           xmlns:fx="http://javafx.com/fxml">
     <padding>

src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.portfolio.closed;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.components.Popups;
 
 import java.net.URL;
@@ -34,8 +34,8 @@ import javafx.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
+public class ClosedTradesView extends CachedView<ClosedTradesPM> {
-    private static final Logger log = LoggerFactory.getLogger(ClosedTradesViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(ClosedTradesView.class);
 
     @FXML TableColumn<ClosedTradesListItem, ClosedTradesListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, tradeIdColumn;
@@ -47,7 +47,7 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private ClosedTradesViewCB(ClosedTradesPM model) {
+    private ClosedTradesView(ClosedTradesPM model) {
         super(model);
     }
 

src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.offer.OffersViewCB"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.offer.OffersView"
           hgap="5.0" vgap="5"
           xmlns:fx="http://javafx.com/fxml">
     <padding>

src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.portfolio.offer;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.util.Utilities;
 
@@ -36,8 +36,8 @@ import javafx.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OffersViewCB extends CachedViewCB<OffersPM> {
+public class OffersView extends CachedView<OffersPM> {
-    private static final Logger log = LoggerFactory.getLogger(OffersViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(OffersView.class);
 
     @FXML TableColumn<OfferListItem, OfferListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, offerIdColumn, removeItemColumn;
@@ -49,7 +49,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private OffersViewCB(OffersPM model) {
+    private OffersView(OffersPM model) {
         super(model);
     }
 

src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml

@@ -28,7 +28,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.pending.PendingTradesViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.pending.PendingTradesView"
             xmlns:fx="http://javafx.com/fxml">
 
     <ScrollPane fx:id="scrollPane" fitToWidth="true" fitToHeight="true"
@@ -121,7 +121,7 @@
                 </GridPane.margin>
             </Button>
 
-            <!-- 
+            <!--
             Payments
             -->
             <TitledGroupBg fx:id="paymentsGroupBg" text="Payments details" GridPane.rowIndex="5" GridPane.rowSpan="6"
@@ -173,7 +173,7 @@
                 </GridPane.margin>
             </Button>
 
-            <!-- 
+            <!--
             Summary
             -->
             <TitledGroupBg fx:id="summaryGroupBg" text="Summary" GridPane.rowIndex="5" GridPane.rowSpan="5"
@@ -211,7 +211,7 @@
             <InfoDisplay fx:id="summaryInfoDisplay" onAction="#onOpenSummaryHelp" rowIndex="9" gridPane="$gridPane"
                          managed="false" visible="false"/>
 
-            <!-- 
+            <!--
             Withdraw
             -->
             <TitledGroupBg fx:id="withdrawGroupBg" text="Withdraw your bitcoins" GridPane.rowIndex="10"
@@ -272,4 +272,3 @@
         </GridPane>
     </ScrollPane>
 </AnchorPane>
-   

src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.portfolio.pending;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.InputTextField;
@@ -58,8 +58,8 @@ import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
+public class PendingTradesView extends CachedView<PendingTradesPM> {
-    private static final Logger log = LoggerFactory.getLogger(PendingTradesViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(PendingTradesView.class);
 
 
     private ChangeListener<PendingTradesListItem> selectedItemChangeListener;
@@ -99,7 +99,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    PendingTradesViewCB(PendingTradesPM model, Navigation navigation) {
+    PendingTradesView(PendingTradesPM model, Navigation navigation) {
         super(model);
 
         this.navigation = navigation;

src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsView"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/settings/SettingsView.java

@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.settings;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.ViewCB;
+import io.bitsquare.gui.View;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.settings.Preferences;
 
@@ -34,7 +34,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
 
-public class SettingsViewCB extends CachedViewCB {
+public class SettingsView extends CachedView {
 
     private final ViewLoader viewLoader;
     private final Navigation navigation;
@@ -51,7 +51,7 @@ public class SettingsViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    SettingsViewCB(ViewLoader viewLoader, Navigation navigation, Preferences preferences) {
+    SettingsView(ViewLoader viewLoader, Navigation navigation, Preferences preferences) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
         this.preferences = preferences;
@@ -127,8 +127,8 @@ public class SettingsViewCB extends CachedViewCB {
         tab.setContent(loaded.view);
         ((TabPane) root).getSelectionModel().select(tab);
         Initializable childController = loaded.controller;
-        if (childController instanceof ViewCB)
+        if (childController instanceof View)
-            ((ViewCB) childController).setParent(this);
+            ((View) childController).setParent(this);
 
         return childController;
     }

src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml

@@ -22,7 +22,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.application.PreferencesViewCB"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.application.PreferencesView"
           hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"

src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 
 import java.net.URL;
 
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
 /**
  * This UI is not cached as it is normally only needed once.
  */
-public class PreferencesViewCB extends CachedViewCB<PreferencesPM> {
+public class PreferencesView extends CachedView<PreferencesPM> {
 
-    private static final Logger log = LoggerFactory.getLogger(PreferencesViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(PreferencesView.class);
 
     @FXML ComboBox<String> btcDenominationComboBox;
     @FXML CheckBox useAnimationsCheckBox, useEffectsCheckBox;
@@ -47,7 +47,7 @@ public class PreferencesViewCB extends CachedViewCB<PreferencesPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private PreferencesViewCB(PreferencesPM model) {
+    private PreferencesView(PreferencesPM model) {
         super(model);
     }
 

src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.BuyViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.BuyView"
          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
          AnchorPane.topAnchor="0.0"
          xmlns:fx="http://javafx.com/fxml"/>

src/main/java/io/bitsquare/gui/main/trade/BuyView.java

@@ -22,10 +22,10 @@ import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
-public class BuyViewCB extends TradeViewCB {
+public class BuyView extends TradeView {
 
     @Inject
-    public BuyViewCB(ViewLoader viewLoader, Navigation navigation) {
+    public BuyView(ViewLoader viewLoader, Navigation navigation) {
         super(viewLoader, navigation);
     }
 }

src/main/java/io/bitsquare/gui/main/trade/SellView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.SellViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.SellView"
          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
          AnchorPane.topAnchor="0.0"
          xmlns:fx="http://javafx.com/fxml"/>

src/main/java/io/bitsquare/gui/main/trade/SellView.java

@@ -22,10 +22,10 @@ import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
-public class SellViewCB extends TradeViewCB {
+public class SellView extends TradeView {
 
     @Inject
-    public SellViewCB(ViewLoader viewLoader, Navigation navigation) {
+    public SellView(ViewLoader viewLoader, Navigation navigation) {
         super(viewLoader, navigation);
     }
 }

src/main/java/io/bitsquare/gui/main/trade/TradeView.java

@@ -17,13 +17,13 @@
 
 package io.bitsquare.gui.main.trade;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.ViewLoader;
 import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB;
+import io.bitsquare.gui.main.trade.createoffer.CreateOfferView;
-import io.bitsquare.gui.main.trade.offerbook.OfferBookViewCB;
+import io.bitsquare.gui.main.trade.offerbook.OfferBookView;
-import io.bitsquare.gui.main.trade.takeoffer.TakeOfferViewCB;
+import io.bitsquare.gui.main.trade.takeoffer.TakeOfferView;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 
@@ -44,12 +44,12 @@ import javafx.scene.control.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TradeViewCB extends CachedViewCB implements TradeNavigator {
+public class TradeView extends CachedView implements TradeNavigator {
-    private static final Logger log = LoggerFactory.getLogger(TradeViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(TradeView.class);
 
-    private OfferBookViewCB offerBookViewCB;
+    private OfferBookView offerBookViewCB;
-    private CreateOfferViewCB createOfferViewCB;
+    private CreateOfferView createOfferViewCB;
-    private TakeOfferViewCB takeOfferViewCB;
+    private TakeOfferView takeOfferViewCB;
     private Node createOfferView;
     private Node takeOfferView;
     private Navigation.Listener listener;
@@ -67,7 +67,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator {
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    protected TradeViewCB(ViewLoader viewLoader, Navigation navigation) {
+    protected TradeView(ViewLoader viewLoader, Navigation navigation) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
     }
@@ -79,7 +79,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator {
 
     @Override
     public void initialize(URL url, ResourceBundle rb) {
-        direction = (this instanceof BuyViewCB) ? Direction.BUY : Direction.SELL;
+        direction = (this instanceof BuyView) ? Direction.BUY : Direction.SELL;
         navigationItem = (direction == Direction.BUY) ? Navigation.Item.BUY : Navigation.Item.SELL;
 
         listener = navigationItems -> {
@@ -160,7 +160,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator {
             tab.setClosable(false);
             tab.setContent(loaded.view);
             tabPane.getTabs().add(tab);
-            offerBookViewCB = (OfferBookViewCB) loaded.controller;
+            offerBookViewCB = (OfferBookView) loaded.controller;
             offerBookViewCB.setParent(this);
 
             offerBookViewCB.setDirection(direction);
@@ -173,7 +173,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator {
             // in different graphs
             ViewLoader.Item loaded = viewLoader.load(navigationItem.getFxmlUrl(), false);
             createOfferView = loaded.view;
-            createOfferViewCB = (CreateOfferViewCB) loaded.controller;
+            createOfferViewCB = (CreateOfferView) loaded.controller;
             createOfferViewCB.setParent(this);
             createOfferViewCB.initWithData(direction, amount, price);
             final Tab tab = new Tab("Create offer");
@@ -189,7 +189,7 @@ public class TradeViewCB extends CachedViewCB implements TradeNavigator {
             // in different graphs
             ViewLoader.Item loaded = viewLoader.load(Navigation.Item.TAKE_OFFER.getFxmlUrl(), false);
             takeOfferView = loaded.view;
-            takeOfferViewCB = (TakeOfferViewCB) loaded.controller;
+            takeOfferViewCB = (TakeOfferView) loaded.controller;
             takeOfferViewCB.setParent(this);
             takeOfferViewCB.initWithData(direction, amount, offer);
             final Tab tab = new Tab("Take offer");

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml

@@ -27,7 +27,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.createoffer.CreateOfferView"
             xmlns:fx="http://javafx.com/fxml">
 
     <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" vbarPolicy="NEVER" fitToWidth="true" fitToHeight="true"
@@ -40,7 +40,7 @@
                 <Insets bottom="-10.0" left="25.0" top="30.0" right="25"/>
             </padding>
 
-            <!-- 
+            <!--
             Amount/Price group
              -->
             <TitledGroupBg fx:id="priceAmountPane" text="%createOffer.amountPriceBox.title"
@@ -136,8 +136,8 @@
                 </GridPane.margin>
             </Button>
 
-            <!-- 
+            <!--
-            Pay funds group 
+            Pay funds group
             -->
             <TitledGroupBg fx:id="payFundsPane" text="%createOffer.fundsBox.title" GridPane.rowIndex="4"
                            GridPane.rowSpan="4" GridPane.columnSpan="3" visible="false"/>
@@ -195,7 +195,7 @@
                 </GridPane.margin>
             </HBox>
 
-            <!-- 
+            <!--
             Advanced settings group
             -->
             <TitledGroupBg fx:id="showDetailsPane" text="%createOffer.advancedBox.title" GridPane.columnSpan="3"
@@ -282,4 +282,3 @@
         </GridPane>
     </ScrollPane>
 </AnchorPane>
-   

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.trade.createoffer;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.CloseListener;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
@@ -73,8 +73,8 @@ import static javafx.beans.binding.Bindings.createStringBinding;
 // TODO Implement other positioning method in InoutTextField to display it over the field instead of right side
 // priceAmountHBox is too large after redesign as to be used as layoutReference.
 
-public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
+public class CreateOfferView extends CachedView<CreateOfferPM> {
-    private static final Logger log = LoggerFactory.getLogger(CreateOfferViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(CreateOfferView.class);
 
 
     private final Navigation navigation;
@@ -117,8 +117,8 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private CreateOfferViewCB(CreateOfferPM model, Navigation navigation,
+    private CreateOfferView(CreateOfferPM model, Navigation navigation,
-                              OverlayManager overlayManager) {
+                            OverlayManager overlayManager) {
         super(model);
         this.navigation = navigation;
         this.overlayManager = overlayManager;

src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml

@@ -24,7 +24,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.offerbook.OfferBookViewCB"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.offerbook.OfferBookView"
           hgap="5.0" vgap="0"
           xmlns:fx="http://javafx.com/fxml">
     <padding>

src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.trade.offerbook;
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.InputTextField;
@@ -62,8 +62,8 @@ import static javafx.beans.binding.Bindings.createStringBinding;
  * TODO: The advanced filters are not impl. yet
  * The restrictions handling is open from the concept and is only implemented for countries yet.
  */
-public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
+public class OfferBookView extends CachedView<OfferBookPM> {
-    private static final Logger log = LoggerFactory.getLogger(OfferBookViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(OfferBookView.class);
 
     private final Navigation navigation;
     private final OverlayManager overlayManager;
@@ -90,11 +90,11 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    OfferBookViewCB(OfferBookPM model,
+    OfferBookView(OfferBookPM model,
-                    Navigation navigation,
+                  Navigation navigation,
-                    OverlayManager overlayManager,
+                  OverlayManager overlayManager,
-                    OptionalBtcValidator optionalBtcValidator,
+                  OptionalBtcValidator optionalBtcValidator,
-                    OptionalFiatValidator optionalFiatValidator) {
+                  OptionalFiatValidator optionalFiatValidator) {
         super(model);
 
         this.navigation = navigation;

src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml

@@ -27,7 +27,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.takeoffer.TakeOfferViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.takeoffer.TakeOfferView"
             AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0"
             AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
             xmlns:fx="http://javafx.com/fxml">
@@ -42,7 +42,7 @@
                 <Insets bottom="-10.0" left="25.0" top="30.0" right="25"/>
             </padding>
 
-            <!-- 
+            <!--
             Amount/Price group
              -->
             <TitledGroupBg fx:id="priceAmountPane" text="%takeOffer.amountPriceBox.title"
@@ -129,8 +129,8 @@
                 </GridPane.margin>
             </Button>
 
-            <!-- 
+            <!--
-            Pay funds group 
+            Pay funds group
             -->
             <TitledGroupBg fx:id="payFundsPane" text="%takeOffer.fundsBox.title" GridPane.rowIndex="4"
                            GridPane.rowSpan="4" GridPane.columnSpan="3" visible="false"/>
@@ -188,7 +188,7 @@
                 </GridPane.margin>
             </HBox>
 
-            <!-- 
+            <!--
             Advanced settings group
             -->
             <TitledGroupBg fx:id="showDetailsPane" text="%takeOffer.advancedBox.title" GridPane.columnSpan="3"
@@ -269,4 +269,3 @@
         </GridPane>
     </ScrollPane>
 </AnchorPane>
-   

src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java

@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main.trade.takeoffer;
 
 
-import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.CachedView;
 import io.bitsquare.gui.CloseListener;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
@@ -69,8 +69,8 @@ import org.controlsfx.dialog.Dialog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
+public class TakeOfferView extends CachedView<TakeOfferPM> {
-    private static final Logger log = LoggerFactory.getLogger(TakeOfferViewCB.class);
+    private static final Logger log = LoggerFactory.getLogger(TakeOfferView.class);
 
     private final Navigation navigation;
     private final OverlayManager overlayManager;
@@ -112,8 +112,8 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private TakeOfferViewCB(TakeOfferPM model, Navigation navigation,
+    private TakeOfferView(TakeOfferPM model, Navigation navigation,
-                            OverlayManager overlayManager) {
+                          OverlayManager overlayManager) {
         super(model);
 
         this.navigation = navigation;

src/main/resources/logback.xml

@@ -41,8 +41,8 @@
     <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.ViewCB" level="WARN"/>
+    <logger name="io.bitsquare.gui.View" level="WARN"/>
-    <logger name="io.bitsquare.gui.CachedViewCB" level="WARN"/>
+    <logger name="io.bitsquare.gui.CachedView" 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"/>