From 87d89f2dc606200270541a9253e4d65df59002af Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 26 Sep 2014 14:20:04 +0200
Subject: [PATCH] Move arbitration screens to new account tab

---
 src/main/java/io/bitsquare/BitSquare.java     |   8 +-
 .../java/io/bitsquare/gui/Navigation.java     |   9 +-
 .../gui/main/account/AccountView.fxml         |   4 +-
 .../gui/main/account/AccountViewCB.java       |  59 ++++++--
 .../arbitrator/ArbitratorSettingsView.fxml    |  38 +++++
 .../arbitrator/ArbitratorSettingsViewCB.java  | 143 ++++++++++++++++++
 .../browser/ArbitratorBrowserView.fxml        |   2 +-
 .../browser/ArbitratorBrowserViewCB.java      |  20 +--
 .../profile/ArbitratorProfileView.fxml        |   2 +-
 .../profile/ArbitratorProfileViewCB.java      |   6 +-
 .../ArbitratorRegistrationView.fxml           |   3 +-
 .../ArbitratorRegistrationViewCB.java         |   6 +-
 .../io/bitsquare/gui/main/home/HomeView.fxml  |   5 +-
 .../bitsquare/gui/main/home/HomeViewCB.java   |  65 --------
 .../io/bitsquare/gui/main/msg/MsgView.fxml    |   2 +-
 .../java/io/bitsquare/msg/MessageFacade.java  |   1 +
 16 files changed, 266 insertions(+), 107 deletions(-)
 create mode 100644 src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
 create mode 100644 src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java
 rename src/main/java/io/bitsquare/gui/main/{arbitrators => account/arbitrator}/browser/ArbitratorBrowserView.fxml (93%)
 rename src/main/java/io/bitsquare/gui/main/{arbitrators => account/arbitrator}/browser/ArbitratorBrowserViewCB.java (96%)
 rename src/main/java/io/bitsquare/gui/main/{arbitrators => account/arbitrator}/profile/ArbitratorProfileView.fxml (97%)
 rename src/main/java/io/bitsquare/gui/main/{arbitrators => account/arbitrator}/profile/ArbitratorProfileViewCB.java (96%)
 rename src/main/java/io/bitsquare/gui/main/{arbitrators => account/arbitrator}/registration/ArbitratorRegistrationView.fxml (98%)
 rename src/main/java/io/bitsquare/gui/main/{arbitrators => account/arbitrator}/registration/ArbitratorRegistrationViewCB.java (98%)

diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java
index 0422edfb5c..ae726fc9f8 100644
--- a/src/main/java/io/bitsquare/BitSquare.java
+++ b/src/main/java/io/bitsquare/BitSquare.java
@@ -125,8 +125,14 @@ public class BitSquare extends Application {
             setupCloseHandlers(primaryStage, scene);
 
             primaryStage.setScene(scene);
+
+            // TODO resizing not fully supported yet
+            /*
             primaryStage.setMinWidth(750);
-            primaryStage.setMinHeight(500);
+            primaryStage.setMinHeight(500);*/
+
+            primaryStage.setMinWidth(1000);
+            primaryStage.setMinHeight(750);
 
             Profiler.initScene(primaryStage.getScene());
 
diff --git a/src/main/java/io/bitsquare/gui/Navigation.java b/src/main/java/io/bitsquare/gui/Navigation.java
index 4ee0c88be5..8fbdbdada6 100644
--- a/src/main/java/io/bitsquare/gui/Navigation.java
+++ b/src/main/java/io/bitsquare/gui/Navigation.java
@@ -186,6 +186,7 @@ public class Navigation {
         // account
         ACCOUNT_SETUP("/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml"),
         ACCOUNT_SETTINGS("/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml"),
+        ARBITRATOR_SETTINGS("/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml"),
 
 
         ///////////////////////////////////////////////////////////////////////////////////////////
@@ -206,9 +207,11 @@ public class Navigation {
         ///////////////////////////////////////////////////////////////////////////////////////////
 
         // arbitrator
-        ARBITRATOR_PROFILE("/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml"),
-        ARBITRATOR_BROWSER("/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml"),
-        ARBITRATOR_REGISTRATION("/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml");
+
+        ARBITRATOR_PROFILE("/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml"),
+        ARBITRATOR_BROWSER("/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml"),
+        ARBITRATOR_REGISTRATION("/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView" +
+                ".fxml");
 
 
         private final String fxmlUrl;
diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml b/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
index f776441a9a..fbeab9caa4 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
@@ -24,7 +24,7 @@
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">
-    <Tab fx:id="tab" closable="false">
+    <Tab fx:id="accountSettingsTab" closable="false"/>
+    <Tab fx:id="arbitratorSettingsTab" text="Arbitrator settings" closable="false"/>
 
-    </Tab>
 </TabPane>
\ No newline at end of file
diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java
index af49605afa..0e22f48f92 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java
@@ -30,10 +30,11 @@ import java.util.ResourceBundle;
 
 import javax.inject.Inject;
 
+import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.*;
 import javafx.scene.control.*;
-import javafx.scene.layout.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,9 +44,11 @@ public class AccountViewCB extends CachedViewCB<AccountPM> {
     private static final Logger log = LoggerFactory.getLogger(AccountViewCB.class);
 
     private final Navigation navigation;
-    private Navigation.Listener listener;
+    private Navigation.Listener navigationListener;
 
-    @FXML Tab tab;
+    private ChangeListener<Tab> tabChangeListener;
+
+    @FXML Tab accountSettingsTab, arbitratorSettingsTab;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -66,13 +69,23 @@ public class AccountViewCB extends CachedViewCB<AccountPM> {
 
     @Override
     public void initialize(URL url, ResourceBundle rb) {
-        listener = navigationItems -> {
+        navigationListener = navigationItems -> {
             if (navigationItems != null &&
                     navigationItems.length == 3 &&
                     navigationItems[1] == Navigation.Item.ACCOUNT)
                 loadView(navigationItems[2]);
         };
 
+        tabChangeListener = (ov, oldValue, newValue) -> {
+            if (newValue == accountSettingsTab)
+                navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT,
+                        Navigation.Item.ACCOUNT_SETTINGS);
+            else
+                navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT,
+                        Navigation.Item.ARBITRATOR_SETTINGS);
+
+        };
+
         super.initialize(url, rb);
     }
 
@@ -80,16 +93,23 @@ public class AccountViewCB extends CachedViewCB<AccountPM> {
     public void activate() {
         super.activate();
 
-        navigation.addListener(listener);
+        navigation.addListener(navigationListener);
+        ((TabPane) root).getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
 
         if (navigation.getCurrentItems().length == 2 &&
                 navigation.getCurrentItems()[1] == Navigation.Item.ACCOUNT) {
-            if (presentationModel.getNeedRegistration())
+            if (presentationModel.getNeedRegistration()) {
                 navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT,
                         Navigation.Item.ACCOUNT_SETUP);
-            else
-                navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT,
-                        Navigation.Item.ACCOUNT_SETTINGS);
+            }
+            else {
+                if (((TabPane) root).getSelectionModel().getSelectedItem() == accountSettingsTab)
+                    navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT,
+                            Navigation.Item.ACCOUNT_SETTINGS);
+                else
+                    navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT,
+                            Navigation.Item.ARBITRATOR_SETTINGS);
+            }
         }
     }
 
@@ -97,7 +117,8 @@ public class AccountViewCB extends CachedViewCB<AccountPM> {
     public void deactivate() {
         super.deactivate();
 
-        navigation.removeListener(listener);
+        navigation.removeListener(navigationListener);
+        ((TabPane) root).getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
     }
 
     @SuppressWarnings("EmptyMethod")
@@ -115,11 +136,25 @@ public class AccountViewCB extends CachedViewCB<AccountPM> {
     protected Initializable loadView(Navigation.Item navigationItem) {
         super.loadView(navigationItem);
 
-        tab.setText((navigationItem == Navigation.Item.ACCOUNT_SETUP) ? "Account setup" : "Account settings");
         final ViewLoader loader = new ViewLoader(getClass().getResource(navigationItem.getFxmlUrl()));
         try {
-            AnchorPane view = loader.load();
+            Node view = loader.load();
+            Tab tab = null;
+            switch (navigationItem) {
+                case ACCOUNT_SETTINGS:
+                    tab = accountSettingsTab;
+                    tab.setText("Account settings");
+                case ACCOUNT_SETUP:
+                    tab = accountSettingsTab;
+                    tab.setText("Account setup");
+                    break;
+                case ARBITRATOR_SETTINGS:
+                    tab = arbitratorSettingsTab;
+                    break;
+            }
+
             tab.setContent(view);
+            ((TabPane) root).getSelectionModel().select(tab);
             Initializable childController = loader.getController();
             ((ViewCB) childController).setParent(this);
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
new file mode 100644
index 0000000000..b4fe8c6109
--- /dev/null
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ This file is part of Bitsquare.
+  ~
+  ~ Bitsquare is free software: you can redistribute it and/or modify it
+  ~ under the terms of the GNU Affero General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+  ~ License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+
+<?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"
+            prefHeight="660.0" prefWidth="1000.0"
+            xmlns:fx="http://javafx.com/fxml">
+    <VBox spacing="20">
+        <padding>
+            <Insets left="10" top="10" right="10"/>
+        </padding>
+        <Label text="TODO: Just very basic prototype yet..."/>
+        <Button text="Register yourself as an arbitrator" onAction="#onArbitratorRegistration"/>
+        <Button text="Edit my arbitrator details" onAction="#onArbitratorEdit"/>
+    </VBox>
+</AnchorPane>
+
+
+
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java
new file mode 100644
index 0000000000..9dc40f1061
--- /dev/null
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java
@@ -0,0 +1,143 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.main.account.arbitrator;
+
+import io.bitsquare.BitSquare;
+import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.Navigation;
+import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationViewCB;
+import io.bitsquare.util.ViewLoader;
+
+import java.io.IOException;
+
+import java.net.URL;
+
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.*;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+// TODO Arbitration is very basic yet
+public class ArbitratorSettingsViewCB extends CachedViewCB {
+
+    private static final Logger log = LoggerFactory.getLogger(ArbitratorSettingsViewCB.class);
+
+    private Navigation navigation;
+
+    private ArbitratorRegistrationViewCB arbitratorRegistrationViewCB;
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    private ArbitratorSettingsViewCB(Navigation navigation) {
+        super();
+        this.navigation = navigation;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void initialize(URL url, ResourceBundle rb) {
+        super.initialize(url, rb);
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void deactivate() {
+        super.deactivate();
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void activate() {
+        super.activate();
+    }
+
+    @SuppressWarnings("EmptyMethod")
+    @Override
+    public void terminate() {
+        super.terminate();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Navigation
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected Initializable loadView(Navigation.Item navigationItem) {
+        // don't use caching here, cause exc. -> need to investigate and is rarely called so no caching is better
+        final ViewLoader loader = new ViewLoader(getClass().getResource(navigationItem.getFxmlUrl()), false);
+        try {
+            final Parent view = loader.load();
+            arbitratorRegistrationViewCB = loader.getController();
+
+            final Stage rootStage = BitSquare.getPrimaryStage();
+            final Stage stage = new Stage();
+            stage.setTitle("Arbitrator");
+            stage.setMinWidth(800);
+            stage.setMinHeight(400);
+            stage.setWidth(800);
+            stage.setHeight(600);
+            stage.setX(rootStage.getX() + 50);
+            stage.setY(rootStage.getY() + 50);
+            stage.initModality(Modality.WINDOW_MODAL);
+            stage.initOwner(rootStage);
+            Scene scene = new Scene(view, 800, 600);
+            stage.setScene(scene);
+            stage.show();
+
+            return arbitratorRegistrationViewCB;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // UI Handlers
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @FXML
+    public void onArbitratorRegistration() {
+        loadView(Navigation.Item.ARBITRATOR_REGISTRATION);
+    }
+
+    @FXML
+    public void onArbitratorEdit() {
+        loadView(Navigation.Item.ARBITRATOR_REGISTRATION);
+        arbitratorRegistrationViewCB.setEditMode(true);
+    }
+}
+
diff --git a/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml
similarity index 93%
rename from src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml
rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml
index 359625dc02..6e29b0e11b 100644
--- a/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml
+++ b/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.arbitrators.browser.ArbitratorBrowserViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.browser.ArbitratorBrowserViewCB"
             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">
diff --git a/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserViewCB.java
rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java
index 2b9d2fe030..966e00ba42 100644
--- a/src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserViewCB.java
@@ -15,13 +15,13 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.arbitrators.browser;
+package io.bitsquare.gui.main.account.arbitrator.browser;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.CachedViewCB;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.ViewCB;
-import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileViewCB;
+import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileViewCB;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.ArbitratorListener;
@@ -49,14 +49,13 @@ import javafx.stage.Stage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Arbitration is not much developed yet
- */
+// TODO Arbitration is very basic yet
 public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorListener {
     private static final Logger log = LoggerFactory.getLogger(ArbitratorBrowserViewCB.class);
 
     private final Settings settings;
     private final Persistence persistence;
+    private MessageFacade messageFacade;
 
     private final List<Arbitrator> allArbitrators = new ArrayList<>();
     private Arbitrator currentArbitrator;
@@ -72,12 +71,9 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL
 
     @Inject
     public ArbitratorBrowserViewCB(Settings settings, Persistence persistence, MessageFacade messageFacade) {
-
         this.settings = settings;
         this.persistence = persistence;
-
-        messageFacade.addArbitratorListener(this);
-        messageFacade.getArbitrators(LanguageUtil.getDefaultLanguageLocale());
+        this.messageFacade = messageFacade;
     }
 
 
@@ -87,10 +83,14 @@ public class ArbitratorBrowserViewCB extends CachedViewCB implements ArbitratorL
 
     @Override
     public void initialize(URL url, ResourceBundle rb) {
-        super.initialize(url, rb);
+        messageFacade.addArbitratorListener(this);
+        messageFacade.getArbitrators(LanguageUtil.getDefaultLanguageLocale());
 
         loadView(Navigation.Item.ARBITRATOR_PROFILE);
         checkButtonState();
+
+        super.initialize(url, rb);
+
     }
 
     @SuppressWarnings("EmptyMethod")
diff --git a/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml
rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml
index 5212c0a70b..ceb85b3167 100644
--- a/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml
+++ b/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.arbitrators.profile.ArbitratorProfileViewCB"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileViewCB"
           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">
diff --git a/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileViewCB.java
rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java
index 282e7e002d..de9561ad06 100644
--- a/src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.arbitrators.profile;
+package io.bitsquare.gui.main.account.arbitrator.profile;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.CachedViewCB;
@@ -32,7 +32,7 @@ import javax.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
-// Arbitration is not much developed yet
+// TODO Arbitration is very basic yet
 public class ArbitratorProfileViewCB extends CachedViewCB {
 
     private final Settings settings;
@@ -98,7 +98,7 @@ public class ArbitratorProfileViewCB extends CachedViewCB {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public void applyArbitrator(Arbitrator arbitrator) {
-        if (arbitrator != null) {
+        if (arbitrator != null && arbitrator.getIdType() != null) {
             String name = "";
             switch (arbitrator.getIdType()) {
                 case REAL_LIFE_ID:
diff --git a/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
similarity index 98%
rename from src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml
rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
index b3dd7677f8..ed5a356a21 100644
--- a/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
@@ -20,7 +20,8 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationViewCB"
+<AnchorPane fx:id="root"
+            fx:controller="io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationViewCB"
             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">
diff --git a/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationViewCB.java
rename to src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java
index 65ad15941c..ecabd6388b 100644
--- a/src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java
@@ -15,14 +15,14 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.arbitrators.registration;
+package io.bitsquare.gui.main.account.arbitrator.registration;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.arbitrator.Reputation;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewCB;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
-import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileViewCB;
+import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileViewCB;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.LanguageUtil;
@@ -61,7 +61,7 @@ import de.jensd.fx.fontawesome.AwesomeIcon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// Arbitration is not much developed yet
+// TODO Arbitration is very basic yet
 public class ArbitratorRegistrationViewCB extends CachedViewCB {
     private static final Logger log = LoggerFactory.getLogger(ArbitratorRegistrationViewCB.class);
 
diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
index 701690e39c..3cfab9e766 100644
--- a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
@@ -29,10 +29,7 @@
             <padding>
                 <Insets left="10" top="10" right="10"/>
             </padding>
-            <Label
-                    text="TODO: Overview section. The buttons here are just temporary for accessing the arbitration management system."/>
-            <Button text="Register yourself as an arbitrator" onAction="#onArbitratorRegistration"/>
-            <Button text="Edit my arbitrator details" onAction="#onArbitratorEdit"/>
+            <Label text="TODO: Overview"/>
         </VBox>
     </Tab>
 </TabPane>
diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java b/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java
index 9e43c36a8e..82bad072aa 100644
--- a/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/home/HomeViewCB.java
@@ -17,24 +17,12 @@
 
 package io.bitsquare.gui.main.home;
 
-import io.bitsquare.BitSquare;
 import io.bitsquare.gui.CachedViewCB;
-import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationViewCB;
-import io.bitsquare.util.ViewLoader;
-
-import java.io.IOException;
 
 import java.net.URL;
 
 import java.util.ResourceBundle;
 
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.*;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,8 +31,6 @@ import org.slf4j.LoggerFactory;
 public class HomeViewCB extends CachedViewCB {
     private static final Logger log = LoggerFactory.getLogger(HomeViewCB.class);
 
-    private ArbitratorRegistrationViewCB arbitratorRegistrationViewCB;
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -74,56 +60,5 @@ public class HomeViewCB extends CachedViewCB {
     }
 
 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Navigation
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected Initializable loadView(Navigation.Item navigationItem) {
-        // don't use caching here, cause exc. -> need to investigate and is rarely called so no caching is better
-        final ViewLoader loader = new ViewLoader(getClass().getResource(navigationItem.getFxmlUrl()), false);
-        try {
-            final Parent view = loader.load();
-            arbitratorRegistrationViewCB = loader.getController();
-
-            final Stage rootStage = BitSquare.getPrimaryStage();
-            final Stage stage = new Stage();
-            stage.setTitle("Arbitrator");
-            stage.setMinWidth(800);
-            stage.setMinHeight(400);
-            stage.setWidth(800);
-            stage.setHeight(600);
-            stage.setX(rootStage.getX() + 50);
-            stage.setY(rootStage.getY() + 50);
-            stage.initModality(Modality.WINDOW_MODAL);
-            stage.initOwner(rootStage);
-            Scene scene = new Scene(view, 800, 600);
-            stage.setScene(scene);
-            stage.show();
-
-            return arbitratorRegistrationViewCB;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // UI Handlers
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @FXML
-    public void onArbitratorRegistration() {
-        loadView(Navigation.Item.ARBITRATOR_REGISTRATION);
-    }
-
-    @FXML
-    public void onArbitratorEdit() {
-        loadView(Navigation.Item.ARBITRATOR_REGISTRATION);
-        arbitratorRegistrationViewCB.setEditMode(true);
-    }
-
-
 }
 
diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
index 1ab8c0331f..427ebcae57 100644
--- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
@@ -30,7 +30,7 @@
             <padding>
                 <Insets left="10" top="10" right="10"/>
             </padding>
-            <Label text="TODO: Communication tools with arbitrators..."/>
+            <Label text="TODO: Communication tools with arbitrators, Mailbox for trade messages if client was offline"/>
         </VBox>
     </Tab>
 </TabPane>
diff --git a/src/main/java/io/bitsquare/msg/MessageFacade.java b/src/main/java/io/bitsquare/msg/MessageFacade.java
index 4ef36defc7..e56393496b 100644
--- a/src/main/java/io/bitsquare/msg/MessageFacade.java
+++ b/src/main/java/io/bitsquare/msg/MessageFacade.java
@@ -424,6 +424,7 @@ public class MessageFacade implements MessageBroker {
                             }
                         } catch (ClassNotFoundException | IOException e) {
                             e.printStackTrace();
+                            log.error("Get arbitrators from DHT failed with exception:" + e.getMessage());
                         }
                     }