diff --git a/.gitignore b/.gitignore
index c965dc5076..a1e6c4336a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ build
 .project
 .settings
 *.java.hsp
+
+gui/updatefx
\ No newline at end of file
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index c5c60b8c1d..84c6b86a03 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -3,88 +3,9 @@
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
       <value>
-        <option name="LINE_SEPARATOR" value="&#10;" />
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2" />
-        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-          <value>
-            <package name="java.awt" withSubpackages="false" static="false" />
-            <package name="javafx.scene" withSubpackages="true" static="false" />
-            <package name="javax.swing" withSubpackages="false" static="false" />
-            <package name="org.junit.Assert" withSubpackages="true" static="true" />
-          </value>
-        </option>
-        <option name="IMPORT_LAYOUT_TABLE">
-          <value>
-            <package name="io.bitsquare" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org.bitcoinj" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="com.google.common" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="com.google.gson" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="com.google.inject" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.awt" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.io" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.math" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.net" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.nio" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.security" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.text" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java.util" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javax.annotation" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javax.inject" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javax.swing" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="viewfx" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javafx" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="com.sun.javafx" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="de.jensd.fx" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="net.glxn" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="net.tomp2p" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org.controlsfx" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org.jetbrains" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org.junit" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org.slf4j" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org.spongycastle" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="true" />
-          </value>
-        </option>
-        <option name="RIGHT_MARGIN" value="160" />
-        <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
-        <codeStyleSettings language="JAVA">
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="WRAP_LONG_LINES" value="true" />
-          <option name="FIELD_ANNOTATION_WRAP" value="0" />
-        </codeStyleSettings>
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
diff --git a/.idea/copyright/Bitsquare_Affero_GPLv3.xml b/.idea/copyright/Bitsquare_Affero_GPLv3.xml
deleted file mode 100644
index 20bcc836bb..0000000000
--- a/.idea/copyright/Bitsquare_Affero_GPLv3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="This file is part of Bitsquare.&#10;&#10;Bitsquare is free software: you can redistribute it and/or modify it&#10;under the terms of the GNU Affero General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or (at&#10;your option) any later version.&#10;&#10;Bitsquare is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public&#10;License for more details.&#10;&#10;You should have received a copy of the GNU Affero General Public License&#10;along with Bitsquare. If not, see &lt;http://www.gnu.org/licenses/&gt;." />
-    <option name="keyword" value="GNU Affero General Public License" />
-    <option name="allowReplaceKeyword" value="" />
-    <option name="myName" value="Bitsquare Affero GPLv3" />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index f6fb94b193..e7bedf3377 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +1,3 @@
 <component name="CopyrightManager">
-  <settings default="Bitsquare Affero GPLv3" />
+  <settings default="" />
 </component>
\ No newline at end of file
diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
deleted file mode 100644
index b300ea334e..0000000000
--- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * 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.app.bootstrap;
-
-import io.bitsquare.app.Logging;
-import io.bitsquare.app.Version;
-import io.bitsquare.p2p.BootstrapNodes;
-import io.bitsquare.p2p.Node;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import net.tomp2p.connection.ChannelClientConfiguration;
-import net.tomp2p.connection.ChannelServerConfiguration;
-import net.tomp2p.dht.PeerBuilderDHT;
-import net.tomp2p.nat.PeerBuilderNAT;
-import net.tomp2p.p2p.Peer;
-import net.tomp2p.p2p.PeerBuilder;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.PeerAddress;
-import net.tomp2p.peers.PeerMapChangeListener;
-import net.tomp2p.peers.PeerStatistic;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.netty.util.concurrent.DefaultEventExecutorGroup;
-import org.springframework.core.env.Environment;
-
-public class BootstrapNode {
-    private static final Logger log = LoggerFactory.getLogger(BootstrapNode.class);
-
-    private static Peer peer = null;
-
-    private final Environment env;
-    private boolean noPeersInfoPrinted;
-
-    public BootstrapNode(Environment env) {
-        this.env = env;
-    }
-
-    public void start() {
-        BootstrapNodes bootstrapNodes = new BootstrapNodes();
-        int p2pId = env.getProperty(Node.P2P_ID_KEY, Integer.class, Node.REG_TEST_P2P_ID); // use regtest as default
-        bootstrapNodes.initWithNetworkId(p2pId);
-        String name = env.getProperty(Node.NAME_KEY, bootstrapNodes.getLocalhostNode().getName());
-        int port = env.getProperty(Node.PORT_KEY, Integer.class, bootstrapNodes.getLocalhostNode().getPort());
-
-        Logging.setup(name + "_" + port);
-
-        try {
-            Number160 peerId = Number160.createHash(name);
-
-            DefaultEventExecutorGroup eventExecutorGroup = new DefaultEventExecutorGroup(50);
-            ChannelClientConfiguration clientConf = PeerBuilder.createDefaultChannelClientConfiguration();
-            clientConf.pipelineFilter(new PeerBuilder.EventExecutorGroupFilter(eventExecutorGroup));
-
-            ChannelServerConfiguration serverConf = PeerBuilder.createDefaultChannelServerConfiguration();
-            serverConf.pipelineFilter(new PeerBuilder.EventExecutorGroupFilter(eventExecutorGroup));
-            serverConf.connectionTimeoutTCPMillis(5000);
-
-            peer = new PeerBuilder(peerId)
-                    .ports(port)
-                    .p2pId(p2pId)
-                    .channelClientConfiguration(clientConf)
-                    .channelServerConfiguration(serverConf)
-                    .start();
-            
-            /*peer.objectDataReply((sender, request) -> {
-                log.trace("received request: " + request.toString());
-                return "pong";
-            });*/
-
-            new PeerBuilderDHT(peer).start();
-            new PeerBuilderNAT(peer).start();
-
-            final int _port = port;
-            if (!name.equals(bootstrapNodes.getLocalhostNode().getName())) {
-                List<Node> bootstrapNodesExcludingMyself = bootstrapNodes.getBootstrapNodes().stream().filter(e -> !e.getName().equals
-                        (name)).collect(Collectors.toList());
-                log.info("Bootstrapping to bootstrapNodes " + bootstrapNodesExcludingMyself);
-                long ts = System.currentTimeMillis();
-                List<PeerAddress> bootstrapAddressesExcludingMyself = bootstrapNodesExcludingMyself.stream()
-                        .map(e -> e.toPeerAddressWithPort(_port)).collect(Collectors.toList());
-                peer.bootstrap().bootstrapTo(bootstrapAddressesExcludingMyself).start().awaitUninterruptibly();
-                log.info("Bootstrapping done after {} msec", System.currentTimeMillis() - ts);
-            }
-            else {
-                log.info("When using localhost we do not bootstrap to other nodes");
-            }
-            peer.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() {
-                @Override
-                public void peerInserted(PeerAddress peerAddress, boolean verified) {
-                    log.info("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
-                }
-
-                @Override
-                public void peerRemoved(PeerAddress peerAddress, PeerStatistic peerStatistics) {
-                    log.info("Peer removed: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
-                }
-
-                @Override
-                public void peerUpdated(PeerAddress peerAddress, PeerStatistic peerStatistics) {
-                    //log.info("Peer updated: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
-                }
-            });
-
-            log.info("Bootstrap node started with name=" + name + " ,p2pId=" + p2pId + " ,port=" + port +
-                    " and network protocol version=" + Version.NETWORK_PROTOCOL_VERSION);
-            new Thread(() -> {
-                while (true) {
-                    if (peer.peerBean().peerMap().all().size() > 0) {
-                        noPeersInfoPrinted = false;
-                        int relayed = 0;
-                        for (PeerAddress peerAddress : peer.peerBean().peerMap().all()) {
-                            log.info("Peer: " + peerAddress.toString());
-                            if (peerAddress.isRelayed())
-                                relayed++;
-                        }
-                        log.info("Number of peers online = " + peer.peerBean().peerMap().all().size());
-                        log.info("Relayed peers = " + relayed);
-                    }
-                    else if (noPeersInfoPrinted) {
-                        log.info("No peers online");
-                        noPeersInfoPrinted = true;
-                    }
-                    try {
-                        Thread.sleep(10000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                        return;
-                    }
-                }
-            }).start();
-
-        } catch (Throwable t) {
-            log.error("Fatal exception " + t.getMessage());
-            if (peer != null)
-                peer.shutdown().awaitUninterruptibly();
-        }
-    }
-}
diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
deleted file mode 100644
index 5f50cde526..0000000000
--- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.app.bootstrap;
-
-import io.bitsquare.app.BitsquareEnvironment;
-import io.bitsquare.app.BitsquareExecutable;
-import io.bitsquare.p2p.BootstrapNodes;
-import io.bitsquare.p2p.Node;
-
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-
-public class BootstrapNodeMain extends BitsquareExecutable {
-
-    public static void main(String[] args) throws Exception {
-        new BootstrapNodeMain().execute(args);
-    }
-
-    protected void customizeOptionParsing(OptionParser parser) {
-        BootstrapNodes bootstrapNodes = new BootstrapNodes();
-        bootstrapNodes.initWithNetworkId(Node.REG_TEST_P2P_ID); // use regtest as default
-        parser.accepts(Node.NAME_KEY, description("Name of this node", bootstrapNodes.getLocalhostNode().getName()))
-                .withRequiredArg()
-                .ofType(String.class);
-        parser.accepts(Node.P2P_ID_KEY, description("P2P network ID",
-                bootstrapNodes.getLocalhostNode().getP2pId()))
-                .withRequiredArg()
-                .ofType(int.class);
-        parser.accepts(Node.PORT_KEY, description("Port to listen on", bootstrapNodes.getLocalhostNode().getPort()))
-                .withRequiredArg()
-                .ofType(int.class);
-    }
-
-    protected void doExecute(OptionSet options) {
-        new BootstrapNode(new BitsquareEnvironment(options)).start();
-    }
-}
diff --git a/bootstrap/src/main/resources/logback.xml b/bootstrap/src/main/resources/logback.xml
index cdb9ad3c35..152498c74f 100644
--- a/bootstrap/src/main/resources/logback.xml
+++ b/bootstrap/src/main/resources/logback.xml
@@ -23,8 +23,10 @@
         </encoder>
     </appender>
 
-    <root level="INFO">
+    <root level="TRACE">
         <appender-ref ref="CONSOLE_APPENDER"/>
     </root>
 
+    <logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="WARN"/>
+
 </configuration>
diff --git a/core/src/main/java/io/bitsquare/app/Logging.java b/common/src/main/java/io/bitsquare/app/Logging.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/app/Logging.java
rename to common/src/main/java/io/bitsquare/app/Logging.java
index dc1ca1f18e..39bb17a4a2 100644
--- a/core/src/main/java/io/bitsquare/app/Logging.java
+++ b/common/src/main/java/io/bitsquare/app/Logging.java
@@ -17,18 +17,14 @@
 
 package io.bitsquare.app;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
 import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
+import org.slf4j.LoggerFactory;
 
 public class Logging {
-    private static final Logger log = LoggerFactory.getLogger(Logging.class);
-
     public static void setup(String fileName) {
         LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
 
diff --git a/core/src/main/java/io/bitsquare/crypto/CryptoException.java b/common/src/main/java/io/bitsquare/common/crypto/CryptoException.java
similarity index 77%
rename from core/src/main/java/io/bitsquare/crypto/CryptoException.java
rename to common/src/main/java/io/bitsquare/common/crypto/CryptoException.java
index f060f706c8..129b2a5a45 100644
--- a/core/src/main/java/io/bitsquare/crypto/CryptoException.java
+++ b/common/src/main/java/io/bitsquare/common/crypto/CryptoException.java
@@ -15,15 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.crypto;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package io.bitsquare.common.crypto;
 
 public class CryptoException extends Exception {
-    private static final Logger log = LoggerFactory.getLogger(CryptoException.class);
 
-    public CryptoException() {
+    private CryptoException() {
     }
 
     public CryptoException(String message) {
@@ -38,7 +34,7 @@ public class CryptoException extends Exception {
         super(cause);
     }
 
-    public CryptoException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+    private CryptoException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
 }
diff --git a/common/src/main/java/io/bitsquare/common/crypto/CryptoUtil.java b/common/src/main/java/io/bitsquare/common/crypto/CryptoUtil.java
new file mode 100644
index 0000000000..2f36198076
--- /dev/null
+++ b/common/src/main/java/io/bitsquare/common/crypto/CryptoUtil.java
@@ -0,0 +1,136 @@
+/*
+ * 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.common.crypto;
+
+import io.bitsquare.common.util.Utilities;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.Utils;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.util.encoders.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.security.*;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+
+public class CryptoUtil {
+    private static final Logger log = LoggerFactory.getLogger(CryptoUtil.class);
+    public static final String STORAGE_SIGN_KEY_ALGO = "DSA";
+    public static final String MSG_SIGN_KEY_ALGO = "DSA";
+    public static final String MSG_ENCR_KEY_ALGO = "RSA";
+
+    public static final String SYM_ENCR_KEY_ALGO = "AES";
+    public static final String SYM_CIPHER = "AES";
+    public static final String ASYM_CIPHER = "RSA"; //RSA/ECB/PKCS1Padding
+    public static final String MSG_SIGN_ALGO = "SHA1withDSA";
+
+
+    public static KeyPair generateStorageSignatureKeyPair() throws NoSuchAlgorithmException {
+        long ts = System.currentTimeMillis();
+        final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(STORAGE_SIGN_KEY_ALGO);
+        keyPairGenerator.initialize(1024);
+        KeyPair keyPair = keyPairGenerator.genKeyPair();
+        log.trace("Generate storageSignatureKeyPair needed {} ms", System.currentTimeMillis() - ts);
+        return keyPair;
+    }
+
+    public static KeyPair generateMsgSignatureKeyPair() throws NoSuchAlgorithmException {
+        long ts = System.currentTimeMillis();
+        final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(MSG_SIGN_KEY_ALGO);
+        keyPairGenerator.initialize(1024);
+        KeyPair keyPair = keyPairGenerator.genKeyPair();
+        log.trace("Generate msgSignatureKeyPair needed {} ms", System.currentTimeMillis() - ts);
+        return keyPair;
+    }
+
+    public static KeyPair generateMsgEncryptionKeyPair() throws NoSuchAlgorithmException {
+        long ts = System.currentTimeMillis();
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(MSG_ENCR_KEY_ALGO);
+        keyPairGenerator.initialize(2048);
+        KeyPair keyPair = keyPairGenerator.genKeyPair();
+        log.trace("Generate msgEncryptionKeyPair needed {} ms", System.currentTimeMillis() - ts);
+        return keyPair;
+    }
+
+    static {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    public static String signMessage(PrivateKey privateKey, String message)
+            throws SignatureException, NoSuchAlgorithmException, InvalidKeyException {
+        Signature sig = Signature.getInstance(MSG_SIGN_ALGO);
+        sig.initSign(privateKey);
+        sig.update(message.getBytes());
+        return Base64.toBase64String(sig.sign());
+    }
+
+    public static boolean verifyMessage(PublicKey publicKey, String message, String signature)
+            throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+        Signature sig = Signature.getInstance(MSG_SIGN_ALGO);
+        sig.initVerify(publicKey);
+        sig.update(message.getBytes());
+        return sig.verify(Base64.decode(signature));
+    }
+
+    public static byte[] signStorageData(PrivateKey privateKey, byte[] data)
+            throws SignatureException, NoSuchAlgorithmException, InvalidKeyException {
+        Signature sig = Signature.getInstance(MSG_SIGN_ALGO);
+        sig.initSign(privateKey);
+        sig.update(data);
+        return sig.sign();
+    }
+
+    public static boolean verifyStorageData(PublicKey publicKey, byte[] data, byte[] signature)
+            throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+        Signature sig = Signature.getInstance(MSG_SIGN_ALGO);
+        sig.initVerify(publicKey);
+        sig.update(data);
+        return sig.verify(signature);
+    }
+
+    public static byte[] getHash(Integer data) {
+        return Sha256Hash.hash(ByteBuffer.allocate(4).putInt(data).array());
+    }
+
+    public static byte[] getHash(Object data) {
+        return Sha256Hash.hash(Utilities.objectToByteArray(data));
+    }
+
+    public static byte[] getHash(String message) {
+        return Sha256Hash.hash(Utils.formatMessageForSigning(message));
+    }
+
+    public static String getHashAsHex(String text) {
+        return Utils.HEX.encode(Sha256Hash.hash(Utils.formatMessageForSigning(text)));
+    }
+
+    public static String pubKeyToString(PublicKey publicKey) {
+        final X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(publicKey.getEncoded());
+        return java.util.Base64.getEncoder().encodeToString(x509EncodedKeySpec.getEncoded());
+    }
+
+    // TODO just temp for arbitrator
+    public static PublicKey decodeDSAPubKeyHex(String pubKeyHex) throws NoSuchAlgorithmException, InvalidKeySpecException {
+        X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(Utils.HEX.decode(pubKeyHex));
+        KeyFactory keyFactory = KeyFactory.getInstance("DSA");
+        return keyFactory.generatePublic(pubKeySpec);
+    }
+}
+
diff --git a/core/src/main/java/io/bitsquare/crypto/KeyRing.java b/common/src/main/java/io/bitsquare/common/crypto/KeyRing.java
similarity index 63%
rename from core/src/main/java/io/bitsquare/crypto/KeyRing.java
rename to common/src/main/java/io/bitsquare/common/crypto/KeyRing.java
index 0ce1e159f5..6f2f244e18 100644
--- a/core/src/main/java/io/bitsquare/crypto/KeyRing.java
+++ b/common/src/main/java/io/bitsquare/common/crypto/KeyRing.java
@@ -15,21 +15,20 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.crypto;
-
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-
-import javax.inject.Inject;
+package io.bitsquare.common.crypto;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+
 public class KeyRing {
     private static final Logger log = LoggerFactory.getLogger(KeyRing.class);
 
-    // Public key is used as ID in DHT network. Used for data protection mechanism in TomP2P DHT
-    private KeyPair dhtSignatureKeyPair;
+    // Used for signing storage data
+    private KeyPair storageSignatureKeyPair;
     // Used for signing messages sent over the wire
     private KeyPair msgSignatureKeyPair;
     // Used for encrypting messages sent over the wire (hybrid encryption scheme is used, so it is used only to encrypt a symmetric session key) 
@@ -46,18 +45,17 @@ public class KeyRing {
     }
 
     // consider extra thread for loading (takes about 264 ms at first startup, then load only takes nearly no time)
-    public void init(KeyStorage keyStorage) throws CryptoException {
+    private void init(KeyStorage keyStorage) throws CryptoException {
         if (keyStorage.allKeyFilesExist()) {
-            dhtSignatureKeyPair = keyStorage.loadKeyPair(KeyStorage.Key.DHT_SIGNATURE);
+            storageSignatureKeyPair = keyStorage.loadKeyPair(KeyStorage.Key.STORAGE_SIGNATURE);
             msgSignatureKeyPair = keyStorage.loadKeyPair(KeyStorage.Key.MSG_SIGNATURE);
             msgEncryptionKeyPair = keyStorage.loadKeyPair(KeyStorage.Key.MSG_ENCRYPTION);
-        }
-        else {
+        } else {
             // First time we create key pairs
             try {
-                this.dhtSignatureKeyPair = CryptoService.generateDhtSignatureKeyPair();
-                this.msgSignatureKeyPair = CryptoService.generateMsgSignatureKeyPair();
-                this.msgEncryptionKeyPair = CryptoService.generateMsgEncryptionKeyPair();
+                this.storageSignatureKeyPair = CryptoUtil.generateStorageSignatureKeyPair();
+                this.msgSignatureKeyPair = CryptoUtil.generateMsgSignatureKeyPair();
+                this.msgEncryptionKeyPair = CryptoUtil.generateMsgEncryptionKeyPair();
             } catch (NoSuchAlgorithmException e) {
                 e.printStackTrace();
                 throw new CryptoException("Error at KeyRing constructor ", e);
@@ -65,28 +63,28 @@ public class KeyRing {
             keyStorage.saveKeyRing(this);
         }
 
-        pubKeyRing = new PubKeyRing(dhtSignatureKeyPair.getPublic(), msgSignatureKeyPair.getPublic(), msgEncryptionKeyPair.getPublic());
+        pubKeyRing = new PubKeyRing(storageSignatureKeyPair.getPublic(), msgSignatureKeyPair.getPublic(), msgEncryptionKeyPair.getPublic());
     }
 
     // For unit testing
     KeyRing() throws NoSuchAlgorithmException {
         keyStorage = null;
-        this.dhtSignatureKeyPair = CryptoService.generateDhtSignatureKeyPair();
-        this.msgSignatureKeyPair = CryptoService.generateMsgSignatureKeyPair();
-        this.msgEncryptionKeyPair = CryptoService.generateMsgEncryptionKeyPair();
-        pubKeyRing = new PubKeyRing(dhtSignatureKeyPair.getPublic(), msgSignatureKeyPair.getPublic(), msgEncryptionKeyPair.getPublic());
+        this.storageSignatureKeyPair = CryptoUtil.generateStorageSignatureKeyPair();
+        this.msgSignatureKeyPair = CryptoUtil.generateMsgSignatureKeyPair();
+        this.msgEncryptionKeyPair = CryptoUtil.generateMsgEncryptionKeyPair();
+        pubKeyRing = new PubKeyRing(storageSignatureKeyPair.getPublic(), msgSignatureKeyPair.getPublic(), msgEncryptionKeyPair.getPublic());
     }
 
-    KeyRing(KeyPair dhtSignatureKeyPair, KeyPair msgSignatureKeyPair, KeyPair msgEncryptionKeyPair) {
+    KeyRing(KeyPair storageSignatureKeyPair, KeyPair msgSignatureKeyPair, KeyPair msgEncryptionKeyPair) {
         this.keyStorage = null;
-        this.dhtSignatureKeyPair = dhtSignatureKeyPair;
+        this.storageSignatureKeyPair = storageSignatureKeyPair;
         this.msgSignatureKeyPair = msgSignatureKeyPair;
         this.msgEncryptionKeyPair = msgEncryptionKeyPair;
-        pubKeyRing = new PubKeyRing(dhtSignatureKeyPair.getPublic(), msgSignatureKeyPair.getPublic(), msgEncryptionKeyPair.getPublic());
+        pubKeyRing = new PubKeyRing(storageSignatureKeyPair.getPublic(), msgSignatureKeyPair.getPublic(), msgEncryptionKeyPair.getPublic());
     }
 
-    public KeyPair getDhtSignatureKeyPair() {
-        return dhtSignatureKeyPair;
+    public KeyPair getStorageSignatureKeyPair() {
+        return storageSignatureKeyPair;
     }
 
     public KeyPair getMsgSignatureKeyPair() {
diff --git a/core/src/main/java/io/bitsquare/crypto/KeyStorage.java b/common/src/main/java/io/bitsquare/common/crypto/KeyStorage.java
similarity index 86%
rename from core/src/main/java/io/bitsquare/crypto/KeyStorage.java
rename to common/src/main/java/io/bitsquare/common/crypto/KeyStorage.java
index c9c9cb924a..0c82548910 100644
--- a/core/src/main/java/io/bitsquare/crypto/KeyStorage.java
+++ b/common/src/main/java/io/bitsquare/common/crypto/KeyStorage.java
@@ -15,34 +15,25 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.crypto;
+package io.bitsquare.common.crypto;
 
 import com.google.inject.Inject;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.inject.Named;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
+import java.security.*;
 import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
 public class KeyStorage {
     private static final Logger log = LoggerFactory.getLogger(KeyStorage.class);
 
@@ -52,11 +43,10 @@ public class KeyStorage {
         Security.addProvider(new BouncyCastleProvider());
     }
 
-
     public enum Key {
-        DHT_SIGNATURE("dhtSignature", CryptoService.DHT_SIGN_KEY_ALGO),
-        MSG_SIGNATURE("msgSignature", CryptoService.MSG_SIGN_KEY_ALGO),
-        MSG_ENCRYPTION("msgEncryption", CryptoService.MSG_ENCR_KEY_ALGO);
+        STORAGE_SIGNATURE("storageSignature", CryptoUtil.STORAGE_SIGN_KEY_ALGO),
+        MSG_SIGNATURE("msgSignature", CryptoUtil.MSG_SIGN_KEY_ALGO),
+        MSG_ENCRYPTION("msgEncryption", CryptoUtil.MSG_ENCR_KEY_ALGO);
 
         private final String fileName;
         private final String algorithm;
@@ -74,6 +64,7 @@ public class KeyStorage {
             return algorithm;
         }
 
+        @NotNull
         @Override
         public String toString() {
             return "Key{" +
@@ -91,15 +82,15 @@ public class KeyStorage {
     }
 
     public boolean allKeyFilesExist() throws CryptoException {
-        return fileExists(KeyStorage.Key.DHT_SIGNATURE) && fileExists(KeyStorage.Key.MSG_SIGNATURE) && fileExists(KeyStorage.Key.MSG_ENCRYPTION);
+        return fileExists(KeyStorage.Key.STORAGE_SIGNATURE) && fileExists(KeyStorage.Key.MSG_SIGNATURE) && fileExists(KeyStorage.Key.MSG_ENCRYPTION);
     }
 
-    private boolean fileExists(Key key) throws CryptoException {
+    private boolean fileExists(Key key) {
         return new File(storageDir + "/" + key.getFileName() + "Pub.key").exists();
     }
 
     public KeyPair loadKeyPair(Key key) throws CryptoException {
-        long now = System.currentTimeMillis();
+        // long now = System.currentTimeMillis();
         try {
             KeyFactory keyFactory = KeyFactory.getInstance(key.getAlgorithm());
             PublicKey publicKey;
@@ -130,7 +121,7 @@ public class KeyStorage {
                 log.error(e.getMessage());
                 throw new CryptoException("Could not load key " + key.toString(), e);
             }
-            log.info("load completed in {} msec", System.currentTimeMillis() - now);
+            //log.info("load completed in {} msec", System.currentTimeMillis() - now);
             return new KeyPair(publicKey, privateKey);
 
         } catch (NoSuchAlgorithmException e) {
@@ -141,7 +132,7 @@ public class KeyStorage {
     }
 
     public void saveKeyRing(KeyRing keyRing) throws CryptoException {
-        saveKeyPair(keyRing.getDhtSignatureKeyPair(), Key.DHT_SIGNATURE.getFileName());
+        saveKeyPair(keyRing.getStorageSignatureKeyPair(), Key.STORAGE_SIGNATURE.getFileName());
         saveKeyPair(keyRing.getMsgSignatureKeyPair(), Key.MSG_SIGNATURE.getFileName());
         saveKeyPair(keyRing.getMsgEncryptionKeyPair(), Key.MSG_ENCRYPTION.getFileName());
     }
diff --git a/core/src/main/java/io/bitsquare/crypto/PubKeyRing.java b/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java
similarity index 65%
rename from core/src/main/java/io/bitsquare/crypto/PubKeyRing.java
rename to common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java
index 1894aa2ac9..05ecf93f7e 100644
--- a/core/src/main/java/io/bitsquare/crypto/PubKeyRing.java
+++ b/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java
@@ -15,24 +15,20 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.crypto;
+package io.bitsquare.common.crypto;
 
 import io.bitsquare.app.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
-
 import java.security.KeyFactory;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.PublicKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
-
 import java.util.Arrays;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Same as KeyRing but with public keys only.
  * Used to sent over the wire to other peer.
@@ -41,43 +37,43 @@ public class PubKeyRing implements Serializable {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
-    private static final Logger log = LoggerFactory.getLogger(PubKeyRing.class);
+    transient private static final Logger log = LoggerFactory.getLogger(PubKeyRing.class);
 
-    private final byte[] dhtSignaturePubKeyBytes;
+    private final byte[] storageSignaturePubKeyBytes;
     private final byte[] msgSignaturePubKeyBytes;
     private final byte[] msgEncryptionPubKeyBytes;
 
-    transient private PublicKey dhtSignaturePubKey;
+    transient private PublicKey storageSignaturePubKey;
     transient private PublicKey msgSignaturePubKey;
     transient private PublicKey msgEncryptionPubKey;
 
-    public PubKeyRing(PublicKey dhtSignaturePubKey, PublicKey msgSignaturePubKey, PublicKey msgEncryptionPubKey) {
-        this.dhtSignaturePubKey = dhtSignaturePubKey;
+    public PubKeyRing(PublicKey storageSignaturePubKey, PublicKey msgSignaturePubKey, PublicKey msgEncryptionPubKey) {
+        this.storageSignaturePubKey = storageSignaturePubKey;
         this.msgSignaturePubKey = msgSignaturePubKey;
         this.msgEncryptionPubKey = msgEncryptionPubKey;
 
-        this.dhtSignaturePubKeyBytes = new X509EncodedKeySpec(dhtSignaturePubKey.getEncoded()).getEncoded();
+        this.storageSignaturePubKeyBytes = new X509EncodedKeySpec(storageSignaturePubKey.getEncoded()).getEncoded();
         this.msgSignaturePubKeyBytes = new X509EncodedKeySpec(msgSignaturePubKey.getEncoded()).getEncoded();
         this.msgEncryptionPubKeyBytes = new X509EncodedKeySpec(msgEncryptionPubKey.getEncoded()).getEncoded();
     }
 
-    public PublicKey getDhtSignaturePubKey() {
-        if (dhtSignaturePubKey == null) {
+    public PublicKey getStorageSignaturePubKey() {
+        if (storageSignaturePubKey == null) {
             try {
-                dhtSignaturePubKey = KeyFactory.getInstance(CryptoService.DHT_SIGN_KEY_ALGO).generatePublic(new X509EncodedKeySpec(dhtSignaturePubKeyBytes));
+                storageSignaturePubKey = KeyFactory.getInstance(CryptoUtil.STORAGE_SIGN_KEY_ALGO).generatePublic(new X509EncodedKeySpec(storageSignaturePubKeyBytes));
             } catch (InvalidKeySpecException | NoSuchAlgorithmException e) {
                 e.printStackTrace();
                 log.error(e.getMessage());
             }
         }
-        return dhtSignaturePubKey;
+        return storageSignaturePubKey;
     }
 
 
     public PublicKey getMsgSignaturePubKey() {
         if (msgSignaturePubKey == null) {
             try {
-                msgSignaturePubKey = KeyFactory.getInstance(CryptoService.MSG_SIGN_KEY_ALGO).generatePublic(new X509EncodedKeySpec(msgSignaturePubKeyBytes));
+                msgSignaturePubKey = KeyFactory.getInstance(CryptoUtil.MSG_SIGN_KEY_ALGO).generatePublic(new X509EncodedKeySpec(msgSignaturePubKeyBytes));
             } catch (InvalidKeySpecException | NoSuchAlgorithmException e) {
                 e.printStackTrace();
                 log.error(e.getMessage());
@@ -89,7 +85,7 @@ public class PubKeyRing implements Serializable {
     public PublicKey getMsgEncryptionPubKey() {
         if (msgEncryptionPubKey == null) {
             try {
-                msgEncryptionPubKey = KeyFactory.getInstance(CryptoService.MSG_ENCR_KEY_ALGO).generatePublic(new X509EncodedKeySpec(msgEncryptionPubKeyBytes));
+                msgEncryptionPubKey = KeyFactory.getInstance(CryptoUtil.MSG_ENCR_KEY_ALGO).generatePublic(new X509EncodedKeySpec(msgEncryptionPubKeyBytes));
             } catch (InvalidKeySpecException | NoSuchAlgorithmException e) {
                 e.printStackTrace();
                 log.error(e.getMessage());
@@ -105,7 +101,7 @@ public class PubKeyRing implements Serializable {
 
         PubKeyRing that = (PubKeyRing) o;
 
-        if (!Arrays.equals(dhtSignaturePubKeyBytes, that.dhtSignaturePubKeyBytes)) return false;
+        if (!Arrays.equals(storageSignaturePubKeyBytes, that.storageSignaturePubKeyBytes)) return false;
         if (!Arrays.equals(msgSignaturePubKeyBytes, that.msgSignaturePubKeyBytes)) return false;
         return Arrays.equals(msgEncryptionPubKeyBytes, that.msgEncryptionPubKeyBytes);
 
@@ -113,31 +109,18 @@ public class PubKeyRing implements Serializable {
 
     @Override
     public int hashCode() {
-        int result = dhtSignaturePubKeyBytes != null ? Arrays.hashCode(dhtSignaturePubKeyBytes) : 0;
+        int result = storageSignaturePubKeyBytes != null ? Arrays.hashCode(storageSignaturePubKeyBytes) : 0;
         result = 31 * result + (msgSignaturePubKeyBytes != null ? Arrays.hashCode(msgSignaturePubKeyBytes) : 0);
         result = 31 * result + (msgEncryptionPubKeyBytes != null ? Arrays.hashCode(msgEncryptionPubKeyBytes) : 0);
         return result;
     }
 
-
-    public String getHashString() {
-        try {
-            MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
-            messageDigest.update(dhtSignaturePubKeyBytes);
-            messageDigest.update(msgSignaturePubKeyBytes);
-            messageDigest.update(msgEncryptionPubKeyBytes);
-            return new String(messageDigest.digest());
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException("Hash Algorithm not found.", e);
-        }
-    }
-
     @Override
     public String toString() {
         return "PubKeyRing{" +
-                "\ndhtSignaturePubKey=\n" + Util.pubKeyToString(getDhtSignaturePubKey()) +
-                "\n\nmsgSignaturePubKey=\n" + Util.pubKeyToString(getMsgSignaturePubKey()) +
-                "\n\nmsgEncryptionPubKey=\n" + Util.pubKeyToString(getMsgEncryptionPubKey()) +
+                "\nstorageSignaturePubKey=\n" + CryptoUtil.pubKeyToString(getStorageSignaturePubKey()) +
+                "\n\nmsgSignaturePubKey=\n" + CryptoUtil.pubKeyToString(getMsgSignaturePubKey()) +
+                "\n\nmsgEncryptionPubKey=\n" + CryptoUtil.pubKeyToString(getMsgEncryptionPubKey()) +
                 '}';
     }
 
diff --git a/core/src/main/java/io/bitsquare/util/DesktopUtil.java b/common/src/main/java/io/bitsquare/common/util/DesktopUtil.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/util/DesktopUtil.java
rename to common/src/main/java/io/bitsquare/common/util/DesktopUtil.java
index 68f9a5a91e..5c707073da 100644
--- a/core/src/main/java/io/bitsquare/util/DesktopUtil.java
+++ b/common/src/main/java/io/bitsquare/common/util/DesktopUtil.java
@@ -1,12 +1,9 @@
-package io.bitsquare.util;
+package io.bitsquare.common.util;
 
 import java.awt.*;
-
 import java.io.File;
 import java.io.IOException;
-
 import java.net.URI;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -154,8 +151,7 @@ class DesktopUtil {
                 if (retval == 0) {
                     logErr("Process ended immediately.");
                     return false;
-                }
-                else {
+                } else {
                     logErr("Process crashed.");
                     return false;
                 }
@@ -221,7 +217,7 @@ class DesktopUtil {
     }
 
 
-    public static EnumOS getOs() {
+    private static EnumOS getOs() {
 
         String s = System.getProperty("os.name").toLowerCase();
 
@@ -247,8 +243,7 @@ class DesktopUtil {
 
         if (s.contains("unix")) {
             return EnumOS.linux;
-        }
-        else {
+        } else {
             return EnumOS.unknown;
         }
     }
diff --git a/core/src/main/java/io/bitsquare/util/Utilities.java b/common/src/main/java/io/bitsquare/common/util/Utilities.java
similarity index 65%
rename from core/src/main/java/io/bitsquare/util/Utilities.java
rename to common/src/main/java/io/bitsquare/common/util/Utilities.java
index c231289766..676e576ba4 100644
--- a/core/src/main/java/io/bitsquare/util/Utilities.java
+++ b/common/src/main/java/io/bitsquare/common/util/Utilities.java
@@ -15,43 +15,24 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util;
-
-import io.bitsquare.common.handlers.ResultHandler;
-
-import org.bitcoinj.utils.Threading;
+package io.bitsquare.common.util;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
-
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import java.awt.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-
-import java.net.URI;
-import java.net.URLConnection;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
+import com.google.gson.*;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import javafx.scene.web.WebEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.awt.*;
+import java.io.*;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+
 
 /**
  * General utilities
@@ -60,36 +41,20 @@ public class Utilities {
     private static final Logger log = LoggerFactory.getLogger(Utilities.class);
     private static long lastTimeStamp = System.currentTimeMillis();
 
-    public static Timer setTimeout(long delay, ResultHandler handler) {
-        Timer timer = new Timer();
-        TimerTask task = new TimerTask() {
-            @Override
-            public void run() {
-                Threading.USER_THREAD.execute(() -> handler.handleResult());
-            }
-        };
-        timer.schedule(task, delay);
-        return timer;
-    }
-
-    public static Timer setInterval(long delay, ResultHandler handler) {
-        Timer timer = new Timer();
-        TimerTask task = new TimerTask() {
-            @Override
-            public void run() {
-                Threading.USER_THREAD.execute(() -> handler.handleResult());
-            }
-        };
-        timer.scheduleAtFixedRate(task, delay, delay);
-        return timer;
-    }
-
     public static String objectToJson(Object object) {
-        Gson gson =
-                new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE).setPrettyPrinting().create();
+        Gson gson = new GsonBuilder()
+                .setExclusionStrategies(new AnnotationExclusionStrategy())
+                /*.excludeFieldsWithModifiers(Modifier.TRANSIENT)*/
+              /*  .setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE)*/
+                .setPrettyPrinting()
+                .create();
         return gson.toJson(object);
     }
 
+    public static boolean isUnix() {
+        return isOSX() || isLinux() || getOSName().contains("freebsd");
+    }
+
     public static boolean isWindows() {
         return getOSName().contains("win");
     }
@@ -98,7 +63,7 @@ public class Utilities {
         return getOSName().contains("mac") || getOSName().contains("darwin");
     }
 
-    public static boolean isLinux() {
+    private static boolean isLinux() {
         return getOSName().contains("linux");
     }
 
@@ -111,8 +76,11 @@ public class Utilities {
                 && Desktop.isDesktopSupported()
                 && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
             Desktop.getDesktop().browse(uri);
-        }
-        else {
+        } else {
+            // Maybe Application.HostServices works in those cases?
+            // HostServices hostServices = getHostServices();
+            // hostServices.showDocument(uri.toString());
+
             // On Linux Desktop is poorly implemented.
             // See https://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform
             if (!DesktopUtil.browse(uri))
@@ -120,21 +88,76 @@ public class Utilities {
         }
     }
 
-    public static void openWebPage(String target) throws Exception {
-        openURI(new URI(target));
+    public static void openWebPage(String target) {
+        try {
+            openURI(new URI(target));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+    }
+
+    public static void printSystemLoad() {
+        Runtime runtime = Runtime.getRuntime();
+        long free = runtime.freeMemory() / 1024 / 1024;
+        long total = runtime.totalMemory() / 1024 / 1024;
+        long used = total - free;
+        log.info("System load (nr. threads/used memory (MB)): " + Thread.activeCount() + "/" + used);
+    }
+
+    // Opens links with http and _blank in default web browser instead of webView
+    // WebView has not feature to open link in default browser, so we use the hack recommended here:
+    // https://stackoverflow.com/questions/15555510/javafx-stop-opening-url-in-webview-open-in-browser-instead
+    public static void setupWebViewPopupHandler(WebEngine webEngine) {
+        webEngine.setCreatePopupHandler(
+                config -> {
+                    // grab the last hyperlink that has :hover pseudoclass
+                    Object result = webEngine
+                            .executeScript(
+                                    "var list = document.querySelectorAll( ':hover' );"
+                                            + "for (i=list.length-1; i>-1; i--) "
+                                            + "{ if ( list.item(i).getAttribute('href') ) "
+                                            + "{ list.item(i).getAttribute('href'); break; } }");
+
+                    if (result instanceof String && ((String) result).contains("http")) {
+                        openWebPage((String) result);
+                        return null;
+                    } else {
+                        return webEngine;
+                    }
+                });
+    }
+
+    public static void openMail(String to, String subject, String body) {
+        try {
+            subject = URLEncoder.encode(subject, "UTF-8").replace("+", "%20");
+            body = URLEncoder.encode(body, "UTF-8").replace("+", "%20");
+            Desktop.getDesktop().mail(new URI("mailto:" + to + "?subject=" + subject + "&body=" + body));
+        } catch (IOException | URISyntaxException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void copyToClipboard(String content) {
+        if (content != null && content.length() > 0) {
+            Clipboard clipboard = Clipboard.getSystemClipboard();
+            ClipboardContent clipboardContent = new ClipboardContent();
+            clipboardContent.putString(content);
+            clipboard.setContent(clipboardContent);
+        }
     }
 
     public static byte[] concatByteArrays(byte[]... arrays) {
         int totalLength = 0;
-        for (int i = 0; i < arrays.length; i++) {
-            totalLength += arrays[i].length;
+        for (byte[] array : arrays) {
+            totalLength += array.length;
         }
 
         byte[] result = new byte[totalLength];
         int currentIndex = 0;
-        for (int i = 0; i < arrays.length; i++) {
-            System.arraycopy(arrays[i], 0, result, currentIndex, arrays[i].length);
-            currentIndex += arrays[i].length;
+        for (byte[] array : arrays) {
+            System.arraycopy(array, 0, result, currentIndex, array.length);
+            currentIndex += array.length;
         }
         return result;
     }
@@ -146,7 +169,7 @@ public class Utilities {
     }
 
 
-    public static Object deserializeHexStringToObject(String serializedHexString) {
+/*    public static Object deserializeHexStringToObject(String serializedHexString) {
         Object result = null;
         try {
             ByteArrayInputStream byteInputStream =
@@ -183,7 +206,7 @@ public class Utilities {
             e.printStackTrace();
         }
         return result;
-    }
+    }*/
 
     public static <T> T byteArrayToObject(byte[] data) {
         ByteArrayInputStream bis = new ByteArrayInputStream(data);
@@ -211,7 +234,7 @@ public class Utilities {
         return (T) result;
     }
 
-    public static byte[] objectToBytArray(Object object) {
+    public static byte[] objectToByteArray(Object object) {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         ObjectOutput out = null;
         byte[] result = null;
@@ -286,7 +309,7 @@ public class Utilities {
      *
      * @param folder folder to empty
      */
-    public static void removeDirectory(final File folder) {
+    private static void removeDirectory(final File folder) {
         // check if folder file is a real folder
         if (folder.isDirectory()) {
             File[] list = folder.listFiles();
@@ -311,11 +334,23 @@ public class Utilities {
         connection.setConnectTimeout(10 * 1000);
         connection.addRequestProperty("User-Agent", userAgent);
         connection.connect();
-        try (InputStream inputStream = connection.getInputStream();) {
+        try (InputStream inputStream = connection.getInputStream()) {
             return CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8));
         } catch (IOException e) {
             e.printStackTrace();
             throw e;
         }
     }
+
+    private static class AnnotationExclusionStrategy implements ExclusionStrategy {
+        @Override
+        public boolean shouldSkipField(FieldAttributes f) {
+            return f.getAnnotation(JsonExclude.class) != null;
+        }
+
+        @Override
+        public boolean shouldSkipClass(Class<?> clazz) {
+            return false;
+        }
+    }
 }
diff --git a/core/pom.xml b/core/pom.xml
index 25a9f8294a..f2f31c4112 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -38,50 +38,46 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>io.bitsquare</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.bitsquare</groupId>
+            <artifactId>network</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.msopentech.thali</groupId>
+            <artifactId>universal</artifactId>
+            <version>0.0.3-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.msopentech.thali</groupId>
+            <artifactId>java</artifactId>
+            <version>0.0.3-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.bitcoinj</groupId>
             <artifactId>bitcoinj-core</artifactId>
-            <version>0.13.d13665c-SNAPSHOT</version>
+            <version>0.13.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>net.tomp2p</groupId>
-            <artifactId>tomp2p-all</artifactId>
-            <version>5.0-Beta7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.52</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>16.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.2.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>4.1.1.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
@@ -93,27 +89,6 @@
             <artifactId>qrgen</artifactId>
             <version>1.3</version>
         </dependency>
-        <!-- <dependency>
-             <groupId>com.google.code.findbugs</groupId>
-             <artifactId>jsr305</artifactId>
-             <version>2.0.1</version>
-         </dependency>-->
-        <!-- <dependency>
-             <groupId>net.jcip</groupId>
-             <artifactId>jcip-annotations</artifactId>
-             <version>1.0</version>
-         </dependency>-->
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>13.0</version>
-        </dependency>
-
-        <!-- <dependency>
-             <groupId>org.fxmisc.easybind</groupId>
-             <artifactId>easybind</artifactId>
-             <version>1.0.2</version>
-         </dependency>-->
 
         <dependency>
             <groupId>com.codahale.metrics</groupId>
@@ -121,17 +96,16 @@
             <version>3.0.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-
+        <!-- <dependency>
+           <groupId>com.google.code.findbugs</groupId>
+           <artifactId>jsr305</artifactId>
+           <version>2.0.1</version>
+       </dependency>-->
+        <!-- <dependency>
+             <groupId>net.jcip</groupId>
+             <artifactId>jcip-annotations</artifactId>
+             <version>1.0</version>
+         </dependency>-->
 
     </dependencies>
 </project>
diff --git a/core/src/main/java/io/bitsquare/BitsquareModule.java b/core/src/main/java/io/bitsquare/BitsquareModule.java
deleted file mode 100644
index 9048c51879..0000000000
--- a/core/src/main/java/io/bitsquare/BitsquareModule.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Injector;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.core.env.Environment;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public abstract class BitsquareModule extends AbstractModule {
-    private static final Logger log = LoggerFactory.getLogger(BitsquareModule.class);
-    protected final Environment env;
-
-    private final List<BitsquareModule> modules = new ArrayList<>();
-
-    protected BitsquareModule(Environment env) {
-        checkNotNull(env, "Environment must not be null");
-        this.env = env;
-    }
-
-    protected void install(BitsquareModule module) {
-        super.install(module);
-        modules.add(module);
-    }
-
-    /**
-     * Close any instances this module is responsible for and recursively close any
-     * sub-modules installed via {@link #install(BitsquareModule)}. This method
-     * must be called manually, e.g. at the end of a main() method or in the stop() method
-     * of a JavaFX Application; alternatively it may be registered as a JVM shutdown hook.
-     *
-     * @param injector the Injector originally initialized with this module
-     * @see #doClose(com.google.inject.Injector)
-     */
-    public final void close(Injector injector) {
-        modules.forEach(module -> module.close(injector));
-        doClose(injector);
-    }
-
-    /**
-     * Actually perform closing of any instances this module is responsible for. Called by
-     * {@link #close(Injector)}.
-     *
-     * @param injector the Injector originally initialized with this module
-     */
-    protected void doClose(Injector injector) {
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
index a68ee01032..643637087c 100644
--- a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
@@ -21,24 +21,13 @@ import io.bitsquare.BitsquareException;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.btc.UserAgent;
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.crypto.KeyStorage;
-import io.bitsquare.p2p.tomp2p.TomP2PModule;
+import io.bitsquare.common.crypto.KeyStorage;
+import io.bitsquare.common.util.Utilities;
 import io.bitsquare.storage.Storage;
-import io.bitsquare.util.Utilities;
 import io.bitsquare.util.spring.JOptCommandLinePropertySource;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import java.nio.file.Paths;
-
-import java.util.Properties;
-
+import joptsimple.OptionSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import joptsimple.OptionSet;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
@@ -48,6 +37,12 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePropertySource;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Properties;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BitsquareEnvironment extends StandardEnvironment {
@@ -79,11 +74,11 @@ public class BitsquareEnvironment extends StandardEnvironment {
     private final String userDataDir;
     private final String appDataDir;
     private final String btcNetworkDir;
-    private final String bootstrapNodePort;
     private BitcoinNetwork bitcoinNetwork;
 
     public BitsquareEnvironment(OptionSet options) {
-        this(new JOptCommandLinePropertySource(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(options)));
+        this(new JOptCommandLinePropertySource(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(
+                options)));
     }
 
     public BitcoinNetwork getBitcoinNetwork() {
@@ -99,8 +94,7 @@ public class BitsquareEnvironment extends StandardEnvironment {
                 Object propertiesObject = appDirProperties().getSource();
                 if (propertiesObject instanceof Properties) {
                     properties = (Properties) propertiesObject;
-                }
-                else {
+                } else {
                     log.warn("propertiesObject not instance of Properties");
                 }
             }
@@ -129,9 +123,6 @@ public class BitsquareEnvironment extends StandardEnvironment {
                 (String) commandLineProperties.getProperty(APP_DATA_DIR_KEY) :
                 appDataDir(userDataDir, appName);
 
-        bootstrapNodePort = commandLineProperties.containsProperty(TomP2PModule.BOOTSTRAP_NODE_PORT_KEY) ?
-                (String) commandLineProperties.getProperty(TomP2PModule.BOOTSTRAP_NODE_PORT_KEY) : "-1";
-
         MutablePropertySources propertySources = this.getPropertySources();
         propertySources.addFirst(commandLineProperties);
         try {
@@ -166,7 +157,7 @@ public class BitsquareEnvironment extends StandardEnvironment {
         return new ResourcePropertySource(BITSQUARE_APP_DIR_PROPERTY_SOURCE_NAME, resource);
     }
 
-    PropertySource<?> homeDirProperties() throws Exception {
+    private PropertySource<?> homeDirProperties() throws Exception {
         String location = String.format("file:%s/.bitsquare/bitsquare.properties", getProperty("user.home"));
         Resource resource = resourceLoader.getResource(location);
 
@@ -176,12 +167,12 @@ public class BitsquareEnvironment extends StandardEnvironment {
         return new ResourcePropertySource(BITSQUARE_HOME_DIR_PROPERTY_SOURCE_NAME, resource);
     }
 
-    PropertySource<?> classpathProperties() throws Exception {
+    private PropertySource<?> classpathProperties() throws Exception {
         Resource resource = resourceLoader.getResource("classpath:bitsquare.properties");
         return new ResourcePropertySource(BITSQUARE_CLASSPATH_PROPERTY_SOURCE_NAME, resource);
     }
 
-    protected PropertySource<?> defaultProperties() {
+    private PropertySource<?> defaultProperties() {
         return new PropertiesPropertySource(BITSQUARE_DEFAULT_PROPERTY_SOURCE_NAME, new Properties() {
             private static final long serialVersionUID = -8478089705207326165L;
 
@@ -200,8 +191,7 @@ public class BitsquareEnvironment extends StandardEnvironment {
 
                 setProperty(Storage.DIR_KEY, Paths.get(btcNetworkDir, "db").toString());
                 setProperty(KeyStorage.DIR_KEY, Paths.get(btcNetworkDir, "keys").toString());
-
-                setProperty(TomP2PModule.BOOTSTRAP_NODE_PORT_KEY, bootstrapNodePort);
+                setProperty(ProgramArguments.TOR_DIR, Paths.get(btcNetworkDir, "tor").toString());
             }
         });
     }
diff --git a/core/src/main/java/io/bitsquare/app/BitsquareExecutable.java b/core/src/main/java/io/bitsquare/app/BitsquareExecutable.java
index f48a2719a6..5465f6ee32 100644
--- a/core/src/main/java/io/bitsquare/app/BitsquareExecutable.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareExecutable.java
@@ -22,12 +22,13 @@ import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import org.springframework.util.StringUtils;
 
-import static java.lang.String.*;
+import static java.lang.String.format;
+import static java.lang.String.join;
 
 public abstract class BitsquareExecutable {
-    public static final int EXIT_SUCCESS = 0;
+    private static final int EXIT_SUCCESS = 0;
     public static final int EXIT_FAILURE = 1;
-    public static final String HELP_KEY = "help";
+    private static final String HELP_KEY = "help";
 
     public void execute(String[] args) throws Exception {
         OptionParser parser = new OptionParser();
diff --git a/core/src/main/java/io/bitsquare/app/Version.java b/core/src/main/java/io/bitsquare/app/Version.java
deleted file mode 100644
index ece16c10bb..0000000000
--- a/core/src/main/java/io/bitsquare/app/Version.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.app;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Version {
-    private static final Logger log = LoggerFactory.getLogger(Version.class);
-
-    public static final int MAJOR_VERSION = 0;
-    public static final int MINOR_VERSION = 3;
-    public static final int PATCH_VERSION = 1;
-
-    public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + PATCH_VERSION;
-
-    // If objects are used for both network and database the network version is applied.
-    public static final long NETWORK_PROTOCOL_VERSION = 1;
-    public static final long LOCAL_DB_VERSION = 1;
-}
diff --git a/core/src/main/java/io/bitsquare/arbitration/ArbitrationRepository.java b/core/src/main/java/io/bitsquare/arbitration/ArbitrationRepository.java
deleted file mode 100644
index b7becc43e3..0000000000
--- a/core/src/main/java/io/bitsquare/arbitration/ArbitrationRepository.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.arbitration;
-
-import io.bitsquare.app.Version;
-import io.bitsquare.crypto.Util;
-import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.storage.Storage;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.Utils;
-
-import com.google.inject.Inject;
-
-import java.io.Serializable;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javafx.collections.FXCollections;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableMap;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ArbitrationRepository implements Serializable {
-    // That object is saved to disc. We need to take care of changes to not break deserialization.
-    private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
-    transient private static final Logger log = LoggerFactory.getLogger(ArbitrationRepository.class);
-
-    transient private final ArbitratorService arbitratorService;
-    transient private final Arbitrator defaultArbitrator;
-    transient private final ObservableMap<String, Arbitrator> arbitratorsObservableMap = FXCollections.observableHashMap();
-    transient private boolean allArbitratorsSynced;
-
-    // Persisted fields
-    private final Map<String, Arbitrator> arbitratorsMap = new HashMap<>();
-
-
-    @Inject
-    public ArbitrationRepository(Storage<ArbitrationRepository> storage,
-                                 Storage<Arbitrator> arbitratorStorage,
-                                 ArbitratorService arbitratorService) throws InvalidKeySpecException, NoSuchAlgorithmException {
-        this.arbitratorService = arbitratorService;
-
-        byte[] walletPubKey = Utils.HEX.decode("03a418bf0cb60a35ce217c7f80a2db08a4f5efbe56a0e7602fbc392dea6b63f840");
-        PublicKey p2pSigPubKey = null;
-        p2pSigPubKey = Util.decodeDSAPubKeyHex
-                ("308201b83082012c06072a8648ce3804013082011f02818100fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c70215009760508f15230bccb292b982a2eb840bf0581cf502818100f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d0782675159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243bcca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a0381850002818100db47d4cf76e9bfcc0ba1e98c21c19ba45d1440fa2fec732f664dc8fd63e98877e648aac6db8d1035cd640fe5ff2e0030c2f8694ed124e81bd42c5446a1ce5288d5c8b4073d1cd890fe61ee4527f4e3184279f394cb9c2a4e7924cb2e82320a846cc140304eac6d41d4eaebc4d69b92725715497a82890be9f49d348fda20b095");
-        this.defaultArbitrator = new Arbitrator(arbitratorStorage,
-                "default-524f-46c0-b96e-de5a11d3475d",
-                walletPubKey,
-                p2pSigPubKey,
-                "Mr. Default",
-                new Reputation(),
-                Arbitrator.ID_TYPE.REAL_LIFE_ID,
-                Arrays.asList(LanguageUtil.getDefaultLanguageLocaleAsCode()),
-                Coin.parseCoin("0.1"),
-                Arrays.asList(Arbitrator.METHOD.TLS_NOTARY),
-                Arrays.asList(Arbitrator.ID_VERIFICATION.PASSPORT),
-                "https://bitsquare.io",
-                "Bla bla...");
-
-        ArbitrationRepository persisted = storage.initAndGetPersisted(this);
-        if (persisted != null) {
-            arbitratorsMap.putAll(persisted.getArbitratorsMap());
-        }
-        arbitratorsMap.put(defaultArbitrator.getId(), defaultArbitrator);
-
-        arbitratorsObservableMap.putAll(arbitratorsMap);
-        arbitratorsObservableMap.addListener((MapChangeListener<String, Arbitrator>) change -> storage.queueUpForSave());
-        allArbitratorsSynced = false;
-    }
-
-    // Is called when all services are ready
-    public void loadAllArbitrators() {
-        log.debug("loadAllArbitrators");
-        arbitratorService.loadAllArbitrators((Map<String, Arbitrator> arbitratorsMap) -> {
-                    log.debug("Arbitrators successful loaded.");
-                    log.debug("arbitratorsMap.size()=" + arbitratorsMap.size());
-                    ArbitrationRepository.this.arbitratorsMap.clear();
-                    ArbitrationRepository.this.arbitratorsMap.put(defaultArbitrator.getId(), defaultArbitrator);
-                    ArbitrationRepository.this.arbitratorsMap.putAll(arbitratorsMap);
-                    ArbitrationRepository.this.arbitratorsObservableMap.clear();
-                    ArbitrationRepository.this.arbitratorsObservableMap.putAll(ArbitrationRepository.this.arbitratorsMap);
-                    allArbitratorsSynced = true;
-                },
-                (log::error));
-    }
-
-    public Map<String, Arbitrator> getArbitratorsMap() {
-        return arbitratorsMap;
-    }
-
-    public ObservableMap<String, Arbitrator> getArbitratorsObservableMap() {
-        return arbitratorsObservableMap;
-    }
-
-    public boolean areAllArbitratorsSynced() {
-        return allArbitratorsSynced;
-    }
-
-    @NotNull
-    public Arbitrator getDefaultArbitrator() {
-        return defaultArbitrator;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java b/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
index c31e4647de..975462be55 100644
--- a/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
+++ b/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
@@ -18,165 +18,47 @@
 package io.bitsquare.arbitration;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.storage.Storage;
-
-import org.bitcoinj.core.Coin;
-
-import java.io.Serializable;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.storage.data.PubKeyProtectedExpirablePayload;
 
 import java.security.PublicKey;
-
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
-public class Arbitrator implements Serializable {
+public final class Arbitrator implements PubKeyProtectedExpirablePayload {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Enums
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public enum ID_TYPE {
-        REAL_LIFE_ID,
-        NICKNAME,
-        COMPANY
-    }
-
-    public enum METHOD {
-        TLS_NOTARY,
-        SKYPE_SCREEN_SHARING,
-        SMART_PHONE_VIDEO_CHAT,
-        REQUIRE_REAL_ID,
-        BANK_STATEMENT,
-        OTHER
-    }
-
-    public enum ID_VERIFICATION {
-        PASSPORT,
-        GOV_ID,
-        UTILITY_BILLS,
-        FACEBOOK,
-        GOOGLE_PLUS,
-        TWITTER,
-        PGP,
-        BTC_OTC,
-        OTHER
-    }
-
-
-    final transient private Storage<Arbitrator> storage;
+    public static final long TTL = 10 * 24 * 60 * 60 * 1000; // 10 days
 
     // Persisted fields
-    private final String id;
-    private final byte[] pubKey;
-    private final PublicKey p2pSigPubKey;
-    private final String name;
-    private final Reputation reputation;
+    private final byte[] btcPubKey;
+    private final PubKeyRing pubKeyRing;
+    private final Address arbitratorAddress;
+    private final List<String> languageCodes;
+    private final String btcAddress;
+    private final long registrationDate;
+    private final String registrationSignature;
+    private final byte[] registrationPubKey;
 
-    // Mutable
-    private ID_TYPE idType;
-    private List<String> languageCodes;
-    private Coin fee;
-    private List<METHOD> arbitrationMethods;
-    private List<ID_VERIFICATION> idVerifications;
-    private String webUrl;
-    private String description;
-
-    public Arbitrator(Storage<Arbitrator> storage,
-                      String id,
-                      byte[] pubKey,
-                      PublicKey p2pSigPubKey,
-                      String name,
-                      Reputation reputation,
-                      ID_TYPE idType,
+    public Arbitrator(Address arbitratorAddress,
+                      byte[] btcPubKey,
+                      String btcAddress,
+                      PubKeyRing pubKeyRing,
                       List<String> languageCodes,
-                      Coin fee,
-                      List<METHOD> arbitrationMethods,
-                      List<ID_VERIFICATION> idVerifications,
-                      String webUrl,
-                      String description) {
-        this.storage = storage;
-        this.id = id;
-        this.pubKey = pubKey;
-        this.p2pSigPubKey = p2pSigPubKey;
-        this.name = name;
-        this.reputation = reputation;
-        this.idType = idType;
+                      Date registrationDate,
+                      byte[] registrationPubKey,
+                      String registrationSignature) {
+        this.arbitratorAddress = arbitratorAddress;
+        this.btcPubKey = btcPubKey;
+        this.btcAddress = btcAddress;
+        this.pubKeyRing = pubKeyRing;
         this.languageCodes = languageCodes;
-        this.fee = fee;
-        this.arbitrationMethods = arbitrationMethods;
-        this.idVerifications = idVerifications;
-        this.webUrl = webUrl;
-        this.description = description;
-    }
-
-    public void save() {
-        storage.queueUpForSave();
-    }
-
-    @Override
-    public int hashCode() {
-        if (id != null) {
-            return Objects.hashCode(id);
-        }
-        else {
-            return 0;
-        }
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof Arbitrator)) {
-            return false;
-        }
-        if (obj == this) {
-            return true;
-        }
-
-        Arbitrator other = (Arbitrator) obj;
-        return id != null && id.equals(other.getId());
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setDescription(String description) {
-        this.description = description;
-        save();
-    }
-
-    public void setIdType(ID_TYPE idType) {
-        this.idType = idType;
-        save();
-    }
-
-    public void setLanguageCodes(List<String> languageCodes) {
-        this.languageCodes = languageCodes;
-        save();
-    }
-
-    public void setFee(Coin fee) {
-        this.fee = fee;
-        save();
-    }
-
-    public void setArbitrationMethods(List<METHOD> arbitrationMethods) {
-        this.arbitrationMethods = arbitrationMethods;
-        save();
-    }
-
-    public void setIdVerifications(List<ID_VERIFICATION> idVerifications) {
-        this.idVerifications = idVerifications;
-        save();
-    }
-
-    public void setWebUrl(String webUrl) {
-        this.webUrl = webUrl;
-        save();
+        this.registrationDate = registrationDate.getTime();
+        this.registrationPubKey = registrationPubKey;
+        this.registrationSignature = registrationSignature;
     }
 
 
@@ -184,51 +66,88 @@ public class Arbitrator implements Serializable {
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public String getId() {
-        return id;
+    @Override
+    public long getTTL() {
+        return TTL;
     }
 
-    public byte[] getPubKey() {
-        return pubKey;
+    @Override
+    public PublicKey getPubKey() {
+        return pubKeyRing.getStorageSignaturePubKey();
     }
 
-    public PublicKey getP2pSigPubKey() {
-        return p2pSigPubKey;
+    public byte[] getBtcPubKey() {
+        return btcPubKey;
     }
 
-    public String getName() {
-        return name;
+    public PubKeyRing getPubKeyRing() {
+        return pubKeyRing;
     }
 
-    public ID_TYPE getIdType() {
-        return idType;
+    public Address getArbitratorAddress() {
+        return arbitratorAddress;
+    }
+
+    public Date getRegistrationDate() {
+        return new Date(registrationDate);
+    }
+
+    public String getBtcAddress() {
+        return btcAddress;
     }
 
     public List<String> getLanguageCodes() {
         return languageCodes;
     }
 
-    public Reputation getReputation() {
-        return reputation;
+    public String getRegistrationSignature() {
+        return registrationSignature;
     }
 
-    public Coin getFee() {
-        return fee;
+    public byte[] getRegistrationPubKey() {
+        return registrationPubKey;
     }
 
-    public List<METHOD> getArbitrationMethods() {
-        return arbitrationMethods;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Arbitrator)) return false;
+
+        Arbitrator that = (Arbitrator) o;
+
+        if (registrationDate != that.registrationDate) return false;
+        if (!Arrays.equals(btcPubKey, that.btcPubKey)) return false;
+        if (pubKeyRing != null ? !pubKeyRing.equals(that.pubKeyRing) : that.pubKeyRing != null) return false;
+        if (arbitratorAddress != null ? !arbitratorAddress.equals(that.arbitratorAddress) : that.arbitratorAddress != null)
+            return false;
+        if (languageCodes != null ? !languageCodes.equals(that.languageCodes) : that.languageCodes != null)
+            return false;
+        if (btcAddress != null ? !btcAddress.equals(that.btcAddress) : that.btcAddress != null) return false;
+        if (registrationSignature != null ? !registrationSignature.equals(that.registrationSignature) : that.registrationSignature != null)
+            return false;
+        return Arrays.equals(registrationPubKey, that.registrationPubKey);
+
     }
 
-    public List<ID_VERIFICATION> getIdVerifications() {
-        return idVerifications;
+    @Override
+    public int hashCode() {
+        int result = btcPubKey != null ? Arrays.hashCode(btcPubKey) : 0;
+        result = 31 * result + (pubKeyRing != null ? pubKeyRing.hashCode() : 0);
+        result = 31 * result + (arbitratorAddress != null ? arbitratorAddress.hashCode() : 0);
+        result = 31 * result + (languageCodes != null ? languageCodes.hashCode() : 0);
+        result = 31 * result + (btcAddress != null ? btcAddress.hashCode() : 0);
+        result = 31 * result + (int) (registrationDate ^ (registrationDate >>> 32));
+        result = 31 * result + (registrationSignature != null ? registrationSignature.hashCode() : 0);
+        result = 31 * result + (registrationPubKey != null ? Arrays.hashCode(registrationPubKey) : 0);
+        return result;
     }
 
-    public String getWebUrl() {
-        return webUrl;
-    }
-
-    public String getDescription() {
-        return description;
+    @Override
+    public String toString() {
+        return "Arbitrator{" +
+                "arbitratorAddress='" + arbitratorAddress + '\'' +
+                ", languageCodes=" + languageCodes +
+                ", btcAddress='" + btcAddress + '\'' +
+                '}';
     }
 }
diff --git a/core/src/main/java/io/bitsquare/arbitration/ArbitratorModule.java b/core/src/main/java/io/bitsquare/arbitration/ArbitratorModule.java
index 3ddf6b5be1..a832ceda5a 100644
--- a/core/src/main/java/io/bitsquare/arbitration/ArbitratorModule.java
+++ b/core/src/main/java/io/bitsquare/arbitration/ArbitratorModule.java
@@ -17,25 +17,28 @@
 
 package io.bitsquare.arbitration;
 
-import io.bitsquare.BitsquareModule;
-
 import com.google.inject.Singleton;
-
+import com.google.inject.name.Names;
+import io.bitsquare.app.AppModule;
+import io.bitsquare.app.ProgramArguments;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 
-public abstract class ArbitratorModule extends BitsquareModule {
+public class ArbitratorModule extends AppModule {
+    private static final Logger log = LoggerFactory.getLogger(ArbitratorModule.class);
 
-    protected ArbitratorModule(Environment env) {
+    public ArbitratorModule(Environment env) {
         super(env);
     }
 
     @Override
     protected final void configure() {
-        bind(ArbitrationRepository.class).in(Singleton.class);
+        bind(ArbitratorManager.class).in(Singleton.class);
+        bind(DisputeManager.class).in(Singleton.class);
+        bind(ArbitratorService.class).in(Singleton.class);
 
-        doConfigure();
-    }
-
-    protected void doConfigure() {
+        Boolean devTest = env.getProperty(ProgramArguments.DEV_TEST, boolean.class, false);
+        bind(boolean.class).annotatedWith(Names.named(ProgramArguments.DEV_TEST)).toInstance(devTest);
     }
 }
diff --git a/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java b/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
index c1e7b2f6c2..2cf612904b 100644
--- a/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
+++ b/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java
@@ -17,33 +17,75 @@
 
 package io.bitsquare.arbitration;
 
-
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.p2p.DHTService;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.storage.HashSetChangedListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
 import java.util.Map;
+import java.util.stream.Collectors;
 
-public interface ArbitratorService extends DHTService {
+/**
+ * Used to store arbitrators profile and load map of arbitrators
+ */
+public class ArbitratorService {
+    private static final Logger log = LoggerFactory.getLogger(ArbitratorService.class);
 
-    void addListener(Listener listener);
-
-    void removeListener(Listener listener);
-
-    void addArbitrator(Arbitrator arbitrator, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler);
-
-    void loadAllArbitrators(ArbitratorMapResultHandler resultHandler, ErrorMessageHandler errorMessageHandler);
-
-    interface Listener {
-        void onArbitratorAdded(Arbitrator arbitrator);
-
-        void onAllArbitratorsLoaded(Map<String, Arbitrator> arbitratorsMap);
-
-        void onArbitratorRemoved(Arbitrator arbitrator);
-    }
+    private P2PService p2PService;
 
     interface ArbitratorMapResultHandler {
         void handleResult(Map<String, Arbitrator> arbitratorsMap);
     }
-}
 
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    public ArbitratorService(P2PService p2PService) {
+        this.p2PService = p2PService;
+    }
+
+    public void addHashSetChangedListener(HashSetChangedListener hashSetChangedListener) {
+        p2PService.addHashSetChangedListener(hashSetChangedListener);
+    }
+
+    public void addArbitrator(Arbitrator arbitrator, final ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        log.debug("addArbitrator arbitrator.hashCode() " + arbitrator.hashCode());
+        boolean result = p2PService.addData(arbitrator);
+        if (result) {
+            log.trace("Add arbitrator to network was successful. Arbitrator = " + arbitrator);
+            resultHandler.handleResult();
+        } else {
+            errorMessageHandler.handleErrorMessage("Add arbitrator failed");
+        }
+    }
+
+    public void removeArbitrator(Arbitrator arbitrator, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        log.debug("removeArbitrator arbitrator.hashCode() " + arbitrator.hashCode());
+        if (p2PService.removeData(arbitrator)) {
+            log.trace("Remove arbitrator from network was successful. Arbitrator = " + arbitrator);
+            resultHandler.handleResult();
+        } else {
+            errorMessageHandler.handleErrorMessage("Remove arbitrator failed");
+        }
+    }
+
+    P2PService getP2PService() {
+        return p2PService;
+    }
+
+    public Map<Address, Arbitrator> getArbitrators() {
+        final Map<Address, Arbitrator> arbitratorsMap = p2PService.getDataMap().values().stream()
+                .filter(e -> e.expirablePayload instanceof Arbitrator)
+                .map(e -> (Arbitrator) e.expirablePayload)
+                .collect(Collectors.toMap(e -> e.getArbitratorAddress(), e -> e));
+
+        return arbitratorsMap;
+    }
+}
diff --git a/core/src/main/java/io/bitsquare/arbitration/Reputation.java b/core/src/main/java/io/bitsquare/arbitration/Reputation.java
deleted file mode 100644
index d85e67c088..0000000000
--- a/core/src/main/java/io/bitsquare/arbitration/Reputation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.arbitration;
-
-import io.bitsquare.app.Version;
-
-import java.io.Serializable;
-
-//TODO still open if we use that really...
-
-/**
- * Reputation for Arbitrators
- */
-public class Reputation implements Serializable {
-    // That object is sent over the wire, so we need to take care of version compatibility.
-    private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
-
-    //TODO
-    public Reputation() {
-    }
-
-
-    @Override
-    public String toString() {
-        return "4 positive ratings in 5 cases";
-    }
-
-}
diff --git a/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorModule.java b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorModule.java
deleted file mode 100644
index b5b29f6386..0000000000
--- a/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorModule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.arbitration.tomp2p;
-
-import io.bitsquare.arbitration.ArbitratorModule;
-import io.bitsquare.arbitration.ArbitratorService;
-
-import com.google.inject.Singleton;
-
-import org.springframework.core.env.Environment;
-
-public class TomP2PArbitratorModule extends ArbitratorModule {
-
-    public TomP2PArbitratorModule(Environment env) {
-        super(env);
-    }
-
-    @Override
-    protected void doConfigure() {
-        bind(ArbitratorService.class).to(TomP2PArbitratorService.class).in(Singleton.class);
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java
deleted file mode 100644
index a8308f6a1d..0000000000
--- a/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorService.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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.arbitration.tomp2p;
-
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.arbitration.ArbitratorService;
-import io.bitsquare.common.handlers.ErrorMessageHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.p2p.tomp2p.TomP2PDHTService;
-import io.bitsquare.p2p.tomp2p.TomP2PNode;
-
-import java.io.IOException;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.inject.Inject;
-
-import net.tomp2p.dht.FutureGet;
-import net.tomp2p.dht.FuturePut;
-import net.tomp2p.dht.FutureRemove;
-import net.tomp2p.futures.BaseFuture;
-import net.tomp2p.futures.BaseFutureAdapter;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.storage.Data;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class TomP2PArbitratorService extends TomP2PDHTService implements ArbitratorService {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PArbitratorService.class);
-
-    private static final Number160 LOCATION_KEY = Number160.createHash("ArbitratorService");
-
-    private final CopyOnWriteArrayList<Listener> listeners = new CopyOnWriteArrayList<>();
-
-    @Inject
-    public TomP2PArbitratorService(TomP2PNode tomP2PNode, KeyRing keyRing) {
-        super(tomP2PNode, keyRing);
-    }
-
-    public void addArbitrator(Arbitrator arbitrator, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        try {
-            final Data arbitratorData = new Data(arbitrator);
-
-            openRequestsUp();
-            FuturePut addFuture = addProtectedDataToMap(LOCATION_KEY, arbitratorData);
-            addFuture.addListener(new BaseFutureAdapter<BaseFuture>() {
-                @Override
-                public void operationComplete(BaseFuture future) throws Exception {
-                    openRequestsDown();
-                    if (future.isSuccess()) {
-                        log.trace("Add arbitrator to DHT was successful. Stored data: [key: " + LOCATION_KEY + ", " +
-                                "values: " + arbitratorData + "]");
-                        Object arbitratorDataObject = arbitratorData.object();
-                        if (arbitratorDataObject instanceof Arbitrator) {
-                            Arbitrator result = (Arbitrator) arbitratorDataObject;
-                            executor.execute(() -> {
-                                resultHandler.handleResult();
-                                listeners.stream().forEach(listener -> listener.onArbitratorAdded(result));
-                            });
-                        }
-                    }
-                    else {
-                        log.error("Add arbitrator to DHT failed with reason:" + addFuture.failedReason());
-                        errorMessageHandler.handleErrorMessage("Add arbitrator to DHT failed with reason:" + addFuture.failedReason());
-                    }
-                }
-            });
-        } catch (IOException e) {
-            openRequestsDown();
-            e.printStackTrace();
-        }
-    }
-
-    public void removeArbitrator(Arbitrator arbitrator) throws IOException {
-        final Data arbitratorData = new Data(arbitrator);
-        openRequestsUp();
-        FutureRemove removeFuture = removeProtectedDataFromMap(LOCATION_KEY, arbitratorData);
-        removeFuture.addListener(new BaseFutureAdapter<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                openRequestsDown();
-                for (Data arbitratorData : removeFuture.dataMap().values()) {
-                    try {
-                        Object arbitratorDataObject = arbitratorData.object();
-                        if (arbitratorDataObject instanceof Arbitrator) {
-                            Arbitrator arbitrator = (Arbitrator) arbitratorDataObject;
-                            executor.execute(() -> listeners.stream().forEach(listener -> listener.onArbitratorRemoved(arbitrator)));
-                        }
-                    } catch (ClassNotFoundException | IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                // We don't test futureRemove.isSuccess() as this API does not fit well to that operation,
-                // it might change in future to something like foundAndRemoved and notFound
-                // See discussion at: https://github.com/tomp2p/TomP2P/issues/57#issuecomment-62069840
-
-                log.trace("Remove arbitrator from DHT was successful. Stored data: [key: " + LOCATION_KEY + ", " +
-                        "values: " + arbitratorData + "]");
-            }
-        });
-    }
-
-    public void loadAllArbitrators(ArbitratorMapResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        FutureGet futureGet = getMap(LOCATION_KEY);
-        futureGet.addListener(new BaseFutureAdapter<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                if (future.isSuccess()) {
-                    log.trace("Get arbitrators from DHT was successful. Stored data: [key: " + LOCATION_KEY + ", " +
-                            "values: " + futureGet.dataMap() + "]");
-
-                    final Map<String, Arbitrator> arbitratorsMap = new HashMap<>();
-                    for (Data arbitratorData : futureGet.dataMap().values()) {
-                        try {
-                            Object arbitratorDataObject = arbitratorData.object();
-                            if (arbitratorDataObject instanceof Arbitrator) {
-                                Arbitrator arbitrator = (Arbitrator) arbitratorDataObject;
-                                arbitratorsMap.put(arbitrator.getId(), arbitrator);
-                            }
-                        } catch (ClassNotFoundException | IOException e) {
-                            e.printStackTrace();
-                            log.error("Get arbitrators from DHT failed with exception:" + e.getMessage());
-                            errorMessageHandler.handleErrorMessage("Get arbitrators from DHT failed with exception:" + e.getMessage());
-                        }
-                    }
-                    executor.execute(() -> {
-                        resultHandler.handleResult(arbitratorsMap);
-                        listeners.stream().forEach(listener -> listener.onAllArbitratorsLoaded(arbitratorsMap));
-                    });
-                }
-                else {
-                    log.error("Get arbitrators from DHT failed with reason:" + future.failedReason());
-                    errorMessageHandler.handleErrorMessage("Get arbitrators from DHT failed with reason:" + future.failedReason());
-                }
-            }
-        });
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Event Listeners
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void addListener(Listener listener) {
-        listeners.add(listener);
-    }
-
-    public void removeListener(Listener listener) {
-        listeners.remove(listener);
-    }
-
-}
diff --git a/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java b/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
index 1dec4d6049..f3c6481f3a 100644
--- a/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
+++ b/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
@@ -17,75 +17,59 @@
 
 package io.bitsquare.btc;
 
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.NetworkParameters;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.TransactionConfidence;
-import org.bitcoinj.core.TransactionOutput;
-import org.bitcoinj.wallet.CoinSelection;
-import org.bitcoinj.wallet.DefaultCoinSelector;
-
 import com.google.common.annotations.VisibleForTesting;
-
-import java.math.BigInteger;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
+import org.bitcoinj.core.*;
+import org.bitcoinj.wallet.CoinSelection;
+import org.bitcoinj.wallet.CoinSelector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
+import java.util.*;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
- * This class implements a {@link org.bitcoinj.wallet.CoinSelector} which attempts to get the highest priority
- * possible. This means that the transaction is the most likely to get confirmed. Note that this means we may end up
- * "spending" more priority than would be required to get the transaction we are creating confirmed.
+ * We use a specialized version of the CoinSelector based on the DefaultCoinSelector implementation.
+ * We lookup for spendable outputs which matches our address of our addressEntry.
  */
-class AddressBasedCoinSelector extends DefaultCoinSelector {
+class AddressBasedCoinSelector implements CoinSelector {
     private static final Logger log = LoggerFactory.getLogger(AddressBasedCoinSelector.class);
     private final NetworkParameters params;
     private final AddressEntry addressEntry;
-    private final boolean includePending;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public AddressBasedCoinSelector(NetworkParameters params, AddressEntry addressEntry, @SuppressWarnings("SameParameterValue") boolean includePending) {
+    public AddressBasedCoinSelector(NetworkParameters params, AddressEntry addressEntry) {
         this.params = params;
         this.addressEntry = addressEntry;
-        this.includePending = includePending;
     }
 
-    @SuppressWarnings("WeakerAccess")
     @VisibleForTesting
     static void sortOutputs(ArrayList<TransactionOutput> outputs) {
-        Collections.sort(outputs, (a, b) -> {
-            int depth1 = 0;
-            int depth2 = 0;
-            assert a.getParentTransaction() != null;
-            assert b.getParentTransaction() != null;
-            TransactionConfidence conf1 = a.getParentTransaction().getConfidence();
-            TransactionConfidence conf2 = b.getParentTransaction().getConfidence();
-            if (conf1.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING)
-                depth1 = conf1.getDepthInBlocks();
-            if (conf2.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING)
-                depth2 = conf2.getDepthInBlocks();
-            Coin aValue = a.getValue();
-            Coin bValue = b.getValue();
-            BigInteger aCoinDepth = BigInteger.valueOf(aValue.value).multiply(BigInteger.valueOf(depth1));
-            BigInteger bCoinDepth = BigInteger.valueOf(bValue.value).multiply(BigInteger.valueOf(depth2));
-            int c1 = bCoinDepth.compareTo(aCoinDepth);
-            if (c1 != 0) return c1;
-            // The "coin*days" destroyed are equal, sort by value alone to get the lowest transaction size.
-            int c2 = bValue.compareTo(aValue);
-            if (c2 != 0) return c2;
-            // They are entirely equivalent (possibly pending) so sort by hash to ensure a total ordering.
-            BigInteger aHash = a.getParentTransaction().getHash().toBigInteger();
-            BigInteger bHash = b.getParentTransaction().getHash().toBigInteger();
-            return aHash.compareTo(bHash);
+        Collections.sort(outputs, new Comparator<TransactionOutput>() {
+            @Override
+            public int compare(TransactionOutput a, TransactionOutput b) {
+                int depth1 = a.getParentTransactionDepthInBlocks();
+                int depth2 = b.getParentTransactionDepthInBlocks();
+                Coin aValue = a.getValue();
+                Coin bValue = b.getValue();
+                BigInteger aCoinDepth = BigInteger.valueOf(aValue.value).multiply(BigInteger.valueOf(depth1));
+                BigInteger bCoinDepth = BigInteger.valueOf(bValue.value).multiply(BigInteger.valueOf(depth2));
+                int c1 = bCoinDepth.compareTo(aCoinDepth);
+                if (c1 != 0) return c1;
+                // The "coin*days" destroyed are equal, sort by value alone to get the lowest transaction size.
+                int c2 = bValue.compareTo(aValue);
+                if (c2 != 0) return c2;
+                // They are entirely equivalent (possibly pending) so sort by hash to ensure a total ordering.
+                checkNotNull(a.getParentTransactionHash(), "a.getParentTransactionHash() must not be null");
+                checkNotNull(b.getParentTransactionHash(), "b.getParentTransactionHash() must not be null");
+                BigInteger aHash = a.getParentTransactionHash().toBigInteger();
+                BigInteger bHash = b.getParentTransactionHash().toBigInteger();
+                return aHash.compareTo(bHash);
+            }
         });
     }
 
@@ -94,42 +78,16 @@ class AddressBasedCoinSelector extends DefaultCoinSelector {
         TransactionConfidence confidence = tx.getConfidence();
         TransactionConfidence.ConfidenceType type = confidence.getConfidenceType();
 
-        // TODO It might be risky to accept 0 confirmation tx from the network with only > 1 numBroadcastPeers
-        // Need to be tested in testnet and mainnet
-        // We need to handle cases when malleability happens or tx get lost and have not been successful propagated
-      /*  return type.equals(TransactionConfidence.ConfidenceType.BUILDING) ||
-                type.equals(TransactionConfidence.ConfidenceType.PENDING) &&
-                        // we accept network tx without confirmations and numBroadcastPeers > 0
-                        //confidence.getSource().equals(TransactionConfidence.Source.SELF) &&
-                        // In regtest mode we expect to have only one peer, so we won't see transactions propagate.
-                        // TODO: The value 1 below dates from a time when transactions we broadcast *to* were
-                        // counted, set to 0
-                        (confidence.numBroadcastPeers() > 1 || tx.getParams() == RegTestParams.get());*/
-
         log.debug("numBroadcastPeers = " + confidence.numBroadcastPeers());
-        // TODO at testnet we got confidence.numBroadcastPeers()=0 -> probably because we use chained unconfirmed tx
-        // investigate further
         return type.equals(TransactionConfidence.ConfidenceType.BUILDING) ||
                 type.equals(TransactionConfidence.ConfidenceType.PENDING);
     }
 
-    private static boolean isInBlockChain(Transaction tx) {
-        // Only pick chain-included transactions.
-        TransactionConfidence confidence = tx.getConfidence();
-        TransactionConfidence.ConfidenceType type = confidence.getConfidenceType();
-        return type.equals(TransactionConfidence.ConfidenceType.BUILDING);
-    }
-
     /**
      * Sub-classes can override this to just customize whether transactions are usable, but keep age sorting.
      */
     protected boolean shouldSelect(Transaction tx) {
-        if (includePending) {
-            return isInBlockChainOrPending(tx);
-        }
-        else {
-            return isInBlockChain(tx);
-        }
+        return isInBlockChainOrPending(tx);
     }
 
     private boolean matchesRequiredAddress(TransactionOutput transactionOutput) {
@@ -151,9 +109,9 @@ class AddressBasedCoinSelector extends DefaultCoinSelector {
 
     @Override
     public CoinSelection select(Coin target, List<TransactionOutput> candidates) {
-        log.debug("candidates.size: " + candidates.size());
+        log.trace("candidates.size: " + candidates.size());
         long targetAsLong = target.longValue();
-        log.debug("value needed: " + targetAsLong);
+        log.trace("value needed: " + targetAsLong);
         HashSet<TransactionOutput> selected = new HashSet<>();
         // Sort the inputs by age*value so we get the highest "coindays" spent.
         // TODO: Consider changing the wallets internal format to track just outputs and keep them ordered.
diff --git a/core/src/main/java/io/bitsquare/btc/AddressEntry.java b/core/src/main/java/io/bitsquare/btc/AddressEntry.java
index 5607e29605..89debef3f3 100644
--- a/core/src/main/java/io/bitsquare/btc/AddressEntry.java
+++ b/core/src/main/java/io/bitsquare/btc/AddressEntry.java
@@ -18,37 +18,58 @@
 package io.bitsquare.btc;
 
 import io.bitsquare.app.Version;
-
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.crypto.DeterministicKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.Serializable;
 
-import org.jetbrains.annotations.NotNull;
-
 /**
- * Is a minimalistic wallet abstraction used to separate transactions between different activities like:
- * Registration, trade and arbiter deposit.
+ * Every trade use a addressEntry with a dedicated address for all transactions related to the trade.
+ * That way we have a kind of separated trade wallet, isolated from other transactions and avoiding coin merge.
+ * If we would not avoid coin merge the user would lose privacy between trades.
  */
 public class AddressEntry implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
 
-    // that will be restored from the wallet at deserialization
+    private transient static final Logger log = LoggerFactory.getLogger(AddressEntry.class);
+
+    public enum Context {
+        TRADE,
+        ARBITRATOR
+    }
+
+    // keyPair can be null in case the object is created from deserialization as it is transient.
+    // It will be restored when the wallet is ready at setDeterministicKey
+    // So after startup it never must be null
+    @Nullable
     private transient DeterministicKey keyPair;
 
-    private final String offerId;
+    // Only set if its a TRADE Context
+    @Nullable
+    private String offerId;
+
     private final Context context;
     private final byte[] pubKey;
     private final byte[] pubKeyHash;
     private final NetworkParameters params;
 
-    public AddressEntry(DeterministicKey keyPair, NetworkParameters params, @SuppressWarnings("SameParameterValue") Context context) {
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor, initialization
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    // If created without offerId (arbitrator)
+    public AddressEntry(DeterministicKey keyPair, NetworkParameters params, Context context) {
         this(keyPair, params, context, null);
     }
 
-    public AddressEntry(DeterministicKey keyPair, NetworkParameters params, Context context, String offerId) {
+    // If created with offerId
+    public AddressEntry(DeterministicKey keyPair, NetworkParameters params, Context context, @Nullable String offerId) {
         this.keyPair = keyPair;
         this.params = params;
         this.context = context;
@@ -58,29 +79,44 @@ public class AddressEntry implements Serializable {
         pubKeyHash = keyPair.getPubKeyHash();
     }
 
+    // Set after wallet is ready 
+    public void setDeterministicKey(DeterministicKey deterministicKey) {
+        this.keyPair = deterministicKey;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Nullable
     public String getOfferId() {
         return offerId;
     }
 
+    // For display we usually only display the first 8 characters.
+    @Nullable
+    public String getShortOfferId() {
+        return offerId != null ? offerId.substring(0, 8) : null;
+    }
+
     public Context getContext() {
         return context;
     }
 
+    @Nullable
     public String getAddressString() {
-        return getAddress().toString();
+        return getAddress() != null ? getAddress().toString() : null;
     }
 
-    @NotNull
+    @Nullable
     public DeterministicKey getKeyPair() {
-        return keyPair;
+        return keyPair != null ? keyPair : null;
     }
 
+    @Nullable
     public Address getAddress() {
-        return keyPair.toAddress(params);
-    }
-
-    public void setDeterministicKey(DeterministicKey deterministicKey) {
-        this.keyPair = deterministicKey;
+        return keyPair != null ? keyPair.toAddress(params) : null;
     }
 
     public byte[] getPubKeyHash() {
@@ -91,21 +127,12 @@ public class AddressEntry implements Serializable {
         return pubKey;
     }
 
-    public enum Context {
-        REGISTRATION_FEE,
-        TRADE,
-        ARBITRATOR_DEPOSIT
-    }
-
     @Override
     public String toString() {
         return "AddressEntry{" +
                 "offerId='" + offerId + '\'' +
                 ", context=" + context +
                 ", address=" + getAddressString() +
-               /* ", pubKey=" + Arrays.toString(pubKey) +
-                ", pubKeyHash=" + Arrays.toString(pubKeyHash) +
-                ", params=" + params +*/
                 '}';
     }
 }
diff --git a/core/src/main/java/io/bitsquare/btc/AddressEntryList.java b/core/src/main/java/io/bitsquare/btc/AddressEntryList.java
index 0c04c7c6b0..915ef33bf6 100644
--- a/core/src/main/java/io/bitsquare/btc/AddressEntryList.java
+++ b/core/src/main/java/io/bitsquare/btc/AddressEntryList.java
@@ -17,21 +17,20 @@
 
 package io.bitsquare.btc;
 
+import com.google.inject.Inject;
 import io.bitsquare.app.Version;
 import io.bitsquare.storage.Storage;
-
 import org.bitcoinj.core.Wallet;
 import org.bitcoinj.crypto.DeterministicKey;
-
-import com.google.inject.Inject;
-
-import java.io.Serializable;
-
-import java.util.ArrayList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+
+/**
+ * The List supporting our persistence solution.
+ */
 public class AddressEntryList extends ArrayList<AddressEntry> implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
@@ -53,36 +52,33 @@ public class AddressEntryList extends ArrayList<AddressEntry> implements Seriali
         AddressEntryList persisted = storage.initAndGetPersisted(this);
         if (persisted != null) {
             for (AddressEntry addressEntry : persisted) {
-                addressEntry.setDeterministicKey((DeterministicKey) wallet.findKeyFromPubHash(addressEntry.getPubKeyHash()));
-                this.add(addressEntry);
+                DeterministicKey keyFromPubHash = (DeterministicKey) wallet.findKeyFromPubHash(addressEntry.getPubKeyHash());
+                if (keyFromPubHash != null) {
+                    addressEntry.setDeterministicKey(keyFromPubHash);
+                    add(addressEntry);
+                } else {
+                    log.warn("Key from addressEntry not found in that wallet " + addressEntry.toString());
+                }
             }
-        }
-        else {
-            // First time create registrationAddressEntry
-            createRegistrationAddressEntry();
+        } else {
+            add(new AddressEntry(wallet.freshReceiveKey(), wallet.getParams(), AddressEntry.Context.ARBITRATOR));
+            storage.queueUpForSave();
         }
     }
 
     public AddressEntry getNewAddressEntry(AddressEntry.Context context, String offerId) {
         log.trace("getNewAddressEntry called with offerId " + offerId);
-        DeterministicKey key = wallet.freshReceiveKey();
-        AddressEntry addressEntry = new AddressEntry(key, wallet.getParams(), context, offerId);
+        AddressEntry addressEntry = new AddressEntry(wallet.freshReceiveKey(), wallet.getParams(), context, offerId);
         add(addressEntry);
         storage.queueUpForSave();
         return addressEntry;
     }
 
-    private void createRegistrationAddressEntry() {
-        DeterministicKey registrationKey = wallet.currentReceiveKey();
-        AddressEntry registrationAddressEntry = new AddressEntry(registrationKey, wallet.getParams(), AddressEntry.Context.REGISTRATION_FEE);
-        add(registrationAddressEntry);
-        storage.queueUpForSave();
-    }
 
-    public AddressEntry getRegistrationAddressEntry() {
-        if (isEmpty())
-            createRegistrationAddressEntry();
-
-        return get(0);
+    public AddressEntry getArbitratorAddressEntry() {
+        if (size() > 0)
+            return get(0);
+        else
+            return null;
     }
 }
diff --git a/core/src/main/java/io/bitsquare/btc/BitcoinModule.java b/core/src/main/java/io/bitsquare/btc/BitcoinModule.java
index 5d0a484cdb..873e816470 100644
--- a/core/src/main/java/io/bitsquare/btc/BitcoinModule.java
+++ b/core/src/main/java/io/bitsquare/btc/BitcoinModule.java
@@ -17,21 +17,17 @@
 
 package io.bitsquare.btc;
 
-import io.bitsquare.BitsquareModule;
-
-import com.google.inject.Injector;
 import com.google.inject.Singleton;
+import io.bitsquare.app.AppModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.env.Environment;
 
 import java.io.File;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.core.env.Environment;
-
 import static com.google.inject.name.Names.named;
 
-public class BitcoinModule extends BitsquareModule {
+public class BitcoinModule extends AppModule {
     private static final Logger log = LoggerFactory.getLogger(BitcoinModule.class);
 
     public BitcoinModule(Environment env) {
@@ -54,13 +50,6 @@ public class BitcoinModule extends BitsquareModule {
         bind(AddressEntryList.class).in(Singleton.class);
         bind(TradeWalletService.class).in(Singleton.class);
         bind(WalletService.class).in(Singleton.class);
-        bind(BlockChainService.class).in(Singleton.class);
-    }
-
-    @Override
-    protected void doClose(Injector injector) {
-        log.trace("doClose " + getClass().getSimpleName());
-        injector.getInstance(WalletService.class).shutDown();
     }
 }
 
diff --git a/core/src/main/java/io/bitsquare/btc/BlockChainService.java b/core/src/main/java/io/bitsquare/btc/BlockChainService.java
deleted file mode 100644
index aea06c63e2..0000000000
--- a/core/src/main/java/io/bitsquare/btc/BlockChainService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.btc;
-
-import io.bitsquare.fiat.FiatAccount;
-
-import javax.inject.Inject;
-
-/**
- * A service delivers blockchain functionality from the BitcoinJ library.
- */
-@SuppressWarnings({"UnusedDeclaration", "UnusedParameters"})
-public class BlockChainService {
-    @Inject
-    public BlockChainService() {
-
-    }
-
-    //TODO
-    @SuppressWarnings("SameReturnValue")
-    public boolean isAccountBlackListed(String accountId, FiatAccount fiatAccount) {
-        return false;
-    }
-
-    //TODO
-    @SuppressWarnings("SameReturnValue")
-    public boolean verifyAccountRegistration() {
-        return true;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    private boolean findAddressInBlockChain(String address) {
-        // TODO lookup for address in blockchain
-        return true;
-    }
-
-
-    @SuppressWarnings("SameReturnValue")
-    private byte[] getDataForTxWithAddress(String address) {
-        // TODO return data after OP_RETURN
-        return null;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    private boolean isFeePayed(String address) {
-        // TODO check if fee is paid
-        return true;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    private boolean isAccountIDBlacklisted(String accountID) {
-        // TODO check if accountID is on blacklist
-        return false;
-    }
-
-    @SuppressWarnings("SameReturnValue")
-    private boolean isFiatAccountBlacklisted(FiatAccount fiatAccount) {
-        // TODO check if accountID is on blacklist
-        return false;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/btc/FeePolicy.java b/core/src/main/java/io/bitsquare/btc/FeePolicy.java
index 7cf4705e88..42f1da6386 100644
--- a/core/src/main/java/io/bitsquare/btc/FeePolicy.java
+++ b/core/src/main/java/io/bitsquare/btc/FeePolicy.java
@@ -17,68 +17,39 @@
 
 package io.bitsquare.btc;
 
-import io.bitsquare.BitsquareException;
-import io.bitsquare.user.Preferences;
-
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.Transaction;
-
-import javax.inject.Inject;
+import org.bitcoinj.core.Wallet;
 
 public class FeePolicy {
 
-    public static final Coin TX_FEE = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;   // dropped down to 0.00001 BTC
+    // Official min. fee and fee per kiloByte dropped down to 0.00001 BTC / Coin.valueOf(1000) / 1000 satoshis, but as there are reported problems with 
+    // confirmation we use a hgher value.
+    // The should also help to avoid problems when the tx size is larger as the standard (e.g. if the user does not pay
+    // in with one transaction but several tx). We don't do a dynamically fee calculation as we need predictable amounts, so that should help to get a larger 
+    // headroom.
+    // Andreas Schildbach reported problems with confirmation and increased the fee/offered UI side fee setting.
 
+    // http://www.cointape.com/
+    // The fastest and cheapest transaction fee is currently 50 satoshis/byte, shown in green at the top.
+    // For the average transaction size of 597 bytes, this results in a fee of 298 bits (0.298 mBTC). -> 0.0003 BTC or Coin.valueOf(30000);
 
-    // TODO: Change REGISTRATION_FEE to 0.00001 (See https://github.com/bitsquare/bitsquare/issues/228)
-    public static final Coin REGISTRATION_FEE = TX_FEE.add(TX_FEE);
-    public static final Coin CREATE_OFFER_FEE = Coin.valueOf(1000000); // 0.01 BTC
+    // trade fee tx: 226 bytes
+    // deposit tx: 336 bytes
+    // payout tx: 371 bytes
+    // disputed payout tx: 408 bytes -> 20400 satoshis with 50 satoshis/byte
+
+    // Other good source is: https://tradeblock.com/blockchain 15-100 satoshis/byte
+
+    public static final Coin TX_FEE = Coin.valueOf(30000); // 0.0003 BTC about 0.06 EUR @ 200 EUR/BTC: about 90 satoshi /byte
+
+    static {
+        // we use our fee as default fee
+        Wallet.SendRequest.DEFAULT_FEE_PER_KB = FeePolicy.TX_FEE;
+    }
+
+    public static final Coin DUST = Coin.valueOf(546);
+
+    public static final Coin CREATE_OFFER_FEE = Coin.valueOf(100000); // 0.001 BTC  0.1% of 1 BTC about 0.2 EUR @ 200 EUR/BTC
     public static final Coin TAKE_OFFER_FEE = CREATE_OFFER_FEE;
-
-    private final BitcoinNetwork bitcoinNetwork;
-    private final String createOfferFeeAddress;
-    private final String takeOfferFeeAddress;
-
-    @Inject
-    public FeePolicy(Preferences preferences) {
-        this.bitcoinNetwork = preferences.getBitcoinNetwork();
-
-        switch (bitcoinNetwork) {
-            case TESTNET:
-                createOfferFeeAddress = "mopJDiHncoveyy7S7FZTUNVbrCxazxvGrE";
-                takeOfferFeeAddress = "mopJDiHncoveyy7S7FZTUNVbrCxazxvGrE";
-                break;
-            case MAINNET:
-                // bitsquare donation address used for the moment...
-                createOfferFeeAddress = "1BVxNn3T12veSK6DgqwU4Hdn7QHcDDRag7";
-                takeOfferFeeAddress = "1BVxNn3T12veSK6DgqwU4Hdn7QHcDDRag7";
-                break;
-            case REGTEST:
-                createOfferFeeAddress = "mkNW1omJFA7RD3AZ94mfKqubRff2gx21KE";
-                takeOfferFeeAddress = "mkNW1omJFA7RD3AZ94mfKqubRff2gx21KE";
-                break;
-            default:
-                throw new BitsquareException("Unknown bitcoin network: %s", bitcoinNetwork);
-        }
-    }
-
-    //TODO get address form arbitrator list
-    public Address getAddressForCreateOfferFee() {
-        try {
-            return new Address(bitcoinNetwork.getParameters(), createOfferFeeAddress);
-        } catch (AddressFormatException ex) {
-            throw new BitsquareException(ex);
-        }
-    }
-
-    //TODO get address form the intersection of  both traders arbitrator lists
-    public Address getAddressForTakeOfferFee() {
-        try {
-            return new Address(bitcoinNetwork.getParameters(), takeOfferFeeAddress);
-        } catch (AddressFormatException ex) {
-            throw new BitsquareException(ex);
-        }
-    }
+    public static final Coin SECURITY_DEPOSIT = Coin.valueOf(10000000); // 0.1 BTC; about 20 EUR @ 200 EUR/BTC
 }
diff --git a/core/src/main/java/io/bitsquare/btc/Restrictions.java b/core/src/main/java/io/bitsquare/btc/Restrictions.java
index 860bb7a632..161282b495 100644
--- a/core/src/main/java/io/bitsquare/btc/Restrictions.java
+++ b/core/src/main/java/io/bitsquare/btc/Restrictions.java
@@ -20,12 +20,9 @@ package io.bitsquare.btc;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
 
-// Lets see if we get more restriction otherwise move it to other class
 public class Restrictions {
     public static final Coin MIN_TRADE_AMOUNT = Coin.parseCoin("0.0001");
-    public static final Coin MAX_TRADE_AMOUNT = Coin.parseCoin("10");
-    public static final Coin MIN_SECURITY_DEPOSIT = Coin.parseCoin("0.0001");
-
+    public static final Coin MAX_TRADE_AMOUNT = Coin.parseCoin("1");
 
     public static boolean isMinSpendableAmount(Coin amount) {
         return amount != null && amount.compareTo(FeePolicy.TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT)) > 0;
diff --git a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
index 21a94b26b1..ae6f1f6b75 100644
--- a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
@@ -17,129 +17,152 @@
 
 package io.bitsquare.btc;
 
-import io.bitsquare.btc.exceptions.SigningException;
-import io.bitsquare.btc.exceptions.TransactionVerificationException;
-import io.bitsquare.btc.exceptions.WalletException;
-import io.bitsquare.user.Preferences;
-
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.AddressFormatException;
-import org.bitcoinj.core.BlockChainListener;
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.ECKey;
-import org.bitcoinj.core.InsufficientMoneyException;
-import org.bitcoinj.core.NetworkParameters;
-import org.bitcoinj.core.Sha256Hash;
-import org.bitcoinj.core.StoredBlock;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.TransactionInput;
-import org.bitcoinj.core.TransactionOutPoint;
-import org.bitcoinj.core.TransactionOutput;
-import org.bitcoinj.core.Utils;
-import org.bitcoinj.core.VerificationException;
-import org.bitcoinj.core.Wallet;
-import org.bitcoinj.crypto.TransactionSignature;
-import org.bitcoinj.kits.WalletAppKit;
-import org.bitcoinj.script.Script;
-import org.bitcoinj.script.ScriptBuilder;
-
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.bitsquare.btc.data.InputsAndChangeOutput;
+import io.bitsquare.btc.data.PreparedDepositTxAndOffererInputs;
+import io.bitsquare.btc.data.RawInput;
+import io.bitsquare.btc.exceptions.SigningException;
+import io.bitsquare.btc.exceptions.TransactionVerificationException;
+import io.bitsquare.btc.exceptions.WalletException;
+import io.bitsquare.user.Preferences;
+import org.bitcoinj.core.*;
+import org.bitcoinj.crypto.TransactionSignature;
+import org.bitcoinj.kits.WalletAppKit;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.spongycastle.crypto.params.KeyParameter;
 
+import javax.annotation.Nullable;
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.inject.internal.util.$Preconditions.checkArgument;
+import static com.google.inject.internal.util.$Preconditions.checkState;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.google.inject.internal.util.$Preconditions.*;
-
-// TradeService handles all trade relevant transactions as a delegate for WalletService
+// TradeService handles all relevant transactions used in the trade process
 /*
-
+    To maintain a consistent tx structure we use that structure: 
+    Always buyers in/outputs/keys first then sellers in/outputs/keys the arbitrators outputs/keys.
+    
     Deposit tx:
-        To keep the multiple partial deposit tx consistent with the final deposit tx used for publishing 
-        we use always use buyers in/outputs first then sellers in/outputs.
-        
     IN[0] buyer (mandatory) e.g. 0.1 BTC
     IN[...] optional additional buyer inputs (normally never used as we pay from trade fee tx and always have 1 output there)
     IN[...] seller (mandatory) e.g. 1.1001 BTC
     IN[...] optional additional seller inputs (normally never used as we pay from trade fee tx and always have 1 output there)
     OUT[0] Multisig output (include tx fee for payout tx) e.g. 1.2001
-    OUT[1] buyer change (normally never used as we pay from trade fee tx and always have 1 output there)
-    OUT[...] optional additional buyer outputs (supported but no use case yet for that)
-    OUT[...] seller change (normally never used as we pay from trade fee tx and always have 1 output there)
-    OUT[...] optional additional seller outputs (supported but no use case yet for that)
+    OUT[1] OP_RETURN with hash of contract and 0 BTC amount
+    OUT[...] optional buyer change (normally never used as we pay from trade fee tx and always have 1 output there)
+    OUT[...] optional seller change (normally never used as we pay from trade fee tx and always have 1 output there)
     FEE tx fee 0.0001 BTC
     
     Payout tx:
-    IN[0] Multisig output form deposit Tx (signed by buyer and trader)
+    IN[0] Multisig output from deposit Tx (signed by buyer and trader)
     OUT[0] Buyer payout address
     OUT[1] Seller payout address
     
+    We use 0 confirmation transactions to make the trade process practical from usability side. 
+    There is no risk for double spends as the deposit transaction would become invalid if any preceding transaction would have been double spent.
+    If a preceding transaction in the chain will not make it into the same or earlier block as the deposit transaction the deposit transaction 
+    will be invalid as well. 
+    Though the deposit need 1 confirmation before the buyer starts the Fiat payment.
+    
+    We have that chain of transactions:
+    1. Deposit from external wallet to our trading wallet: Tx0 (0 conf)
+    2. Create offer (or take offer) fee payment from Tx0 output: tx1 (0 conf)
+    3. Deposit tx created with inputs from tx1 of both traders: Tx2 (here we wait for 1 conf)
+    
+    Fiat transaction will not start before we get at least 1 confirmation for the deposit tx, then we can proceed.
+    4. Payout tx with input from MS output and output to both traders: Tx3 (0 conf)
+    5. Withdrawal to external wallet from Tx3: Tx4 (0 conf)
+    
+    After the payout transaction we also don't have issues with 0 conf or if not both tx (payout, withdrawal) make it into a block. 
+    Worst case is to rebroadcast the transactions (TODO: is not implemented yet).
+    
  */
 public class TradeWalletService {
     private static final Logger log = LoggerFactory.getLogger(TradeWalletService.class);
 
     private final NetworkParameters params;
+    @Nullable
     private Wallet wallet;
+    @Nullable
     private WalletAppKit walletAppKit;
-    private final FeePolicy feePolicy;
+    @Nullable
+    private KeyParameter aesKey;
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor, initialization
+    ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public TradeWalletService(Preferences preferences, FeePolicy feePolicy) {
+    public TradeWalletService(Preferences preferences) {
         this.params = preferences.getBitcoinNetwork().getParameters();
-        this.feePolicy = feePolicy;
     }
 
+    // After WalletService is initialized we get the walletAppKit set
     public void setWalletAppKit(WalletAppKit walletAppKit) {
         this.walletAppKit = walletAppKit;
         wallet = walletAppKit.wallet();
     }
 
+    public void setAesKey(KeyParameter aesKey) {
+        this.aesKey = aesKey;
+    }
+
+    @Nullable
+    public KeyParameter getAesKey() {
+        return aesKey;
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Trade fee
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public Transaction createOfferFeeTx(AddressEntry buyerAddressEntry) throws InsufficientMoneyException {
-        Transaction createOfferFeeTx = new Transaction(params);
-        Coin fee = FeePolicy.CREATE_OFFER_FEE.subtract(FeePolicy.TX_FEE);
-        createOfferFeeTx.addOutput(fee, feePolicy.getAddressForCreateOfferFee());
-        Wallet.SendRequest sendRequest = Wallet.SendRequest.forTx(createOfferFeeTx);
-        sendRequest.shuffleOutputs = false;
+    /**
+     * @param addressEntry         From where we want to spend the transaction fee. Used also as change address.
+     * @param tradingFee           The amount of the trading fee.
+     * @param feeReceiverAddresses The address of the receiver of the trading fee (arbitrator).
+     * @return The broadcasted transaction
+     * @throws InsufficientMoneyException
+     * @throws AddressFormatException
+     */
+    public Transaction createTradingFeeTx(AddressEntry addressEntry, Coin tradingFee, String feeReceiverAddresses)
+            throws InsufficientMoneyException, AddressFormatException {
+        Transaction tradingFeeTx = new Transaction(params);
+        Coin outPutAmount = tradingFee.subtract(FeePolicy.TX_FEE);
+        tradingFeeTx.addOutput(outPutAmount, new Address(params, feeReceiverAddresses));
+
         // we allow spending of unconfirmed tx (double spend risk is low and usability would suffer if we need to
         // wait for 1 confirmation)
-        sendRequest.coinSelector = new AddressBasedCoinSelector(params, buyerAddressEntry, true);
-        sendRequest.changeAddress = buyerAddressEntry.getAddress();
-        wallet.completeTx(sendRequest);
-        printTxWithInputs("createOfferFeeTx", createOfferFeeTx);
-        return createOfferFeeTx;
-    }
-
-    public Transaction createTakeOfferFeeTx(AddressEntry sellerAddressEntry) throws InsufficientMoneyException {
-        Transaction takeOfferFeeTx = new Transaction(params);
-        Coin fee = FeePolicy.TAKE_OFFER_FEE.subtract(FeePolicy.TX_FEE);
-        takeOfferFeeTx.addOutput(fee, feePolicy.getAddressForTakeOfferFee());
-
-        Wallet.SendRequest sendRequest = Wallet.SendRequest.forTx(takeOfferFeeTx);
+        // In case of double spend we will detect later in the trade process and use a ban score to penalize bad behaviour (not impl. yet)
+        Wallet.SendRequest sendRequest = Wallet.SendRequest.forTx(tradingFeeTx);
         sendRequest.shuffleOutputs = false;
-        // we allow spending of unconfirmed takeOfferFeeTx (double spend risk is low and usability would suffer if we need to
-        // wait for 1 confirmation)
-        sendRequest.coinSelector = new AddressBasedCoinSelector(params, sellerAddressEntry, true);
-        sendRequest.changeAddress = sellerAddressEntry.getAddress();
-        wallet.completeTx(sendRequest);
-        printTxWithInputs("takeOfferFeeTx", takeOfferFeeTx);
-        return takeOfferFeeTx;
-    }
+        sendRequest.aesKey = aesKey;
+        sendRequest.coinSelector = new AddressBasedCoinSelector(params, addressEntry);
 
-    public void broadcastTx(Transaction tx, FutureCallback<Transaction> callback) {
-        ListenableFuture<Transaction> future = walletAppKit.peerGroup().broadcastTransaction(tx).future();
-        Futures.addCallback(future, callback);
+        // We use always the same address for all transactions in a trade to keep things simple.
+        // To be discussed if that introduce any privacy issues.
+        sendRequest.changeAddress = addressEntry.getAddress();
+
+        // Wallet.SendRequest.DEFAULT_FEE_PER_KB is set in FeePolicy to our defined amount
+        // We don't want to risk delayed transactions so we set the fee rather high. 
+        // Delayed tx will lead to a broken chain of the deposit transaction.
+        wallet.completeTx(sendRequest);
+        printTxWithInputs("tradingFeeTx", tradingFeeTx);
+
+        return tradingFeeTx;
     }
 
 
@@ -147,35 +170,46 @@ public class TradeWalletService {
     // Trade
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private Coin getBalance(List<TransactionOutput> transactionOutputs, Address address) {
-        Coin balance = Coin.ZERO;
-        for (TransactionOutput transactionOutput : transactionOutputs) {
-            if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isPayToScriptHash()) {
-                Address addressOutput = transactionOutput.getScriptPubKey().getToAddress(params);
-                if (addressOutput.equals(address))
-                    balance = balance.add(transactionOutput.getValue());
-            }
-        }
-        return balance;
-    }
+    // We construct the deposit transaction in the way that the buyer is always the first entry (inputs, outputs, MS keys) and then the seller.
+    // In the creation of the deposit tx the taker/offerer roles are the determining roles instead of buyer/seller. 
+    // In the payout tx is is the buyer/seller role. We keep the buyer/seller ordering over all transactions to not get confusion with ordering,
+    // which is important to follow correctly specially for the order of the MS keys.
 
 
-    public Result createDepositTxInputs(Coin buyerInputAmount, AddressEntry buyerAddressEntry) throws
+    /**
+     * The taker creates a dummy transaction to get the input(s) and optional change output for the amount and the addressEntry for that trade.
+     * That will be used to send to the offerer for creating the deposit transaction.
+     *
+     * @param inputAmount  Amount of takers input
+     * @param addressEntry Address entry of taker
+     * @return A data container holding the inputs, the output value and address
+     * @throws TransactionVerificationException
+     * @throws WalletException
+     */
+    public InputsAndChangeOutput takerCreatesDepositsTxInputs(Coin inputAmount, AddressEntry addressEntry) throws
             TransactionVerificationException, WalletException {
-        log.trace("createDepositTxInputs called");
-        log.trace("buyerInputAmount " + buyerInputAmount.toFriendlyString());
-        log.trace("buyerAddressEntry " + buyerAddressEntry.toString());
+        log.trace("createTakerDepositTxInputs called");
+        log.trace("inputAmount " + inputAmount.toFriendlyString());
+        log.trace("addressEntry " + addressEntry.toString());
 
-        Coin balance = getBalance(wallet.calculateAllSpendCandidates(true), buyerAddressEntry.getAddress());
-        log.trace("balance " + balance.toFriendlyString());
-
-        // We pay the tx fee 2 times to the deposit tx:
+        // We add the mining fee 2 times to the deposit tx:
         // 1. Will be spent when publishing the deposit tx (paid by buyer)
         // 2. Will be added to the MS amount, so when publishing the payout tx the fee is already there and the outputs are not changed by fee reduction
         // The fee for the payout will be paid by the seller.
 
-        // buyerInputAmount includes the tx fee. So we subtract the fee to get the dummyOutputAmount.
-        Coin dummyOutputAmount = buyerInputAmount.subtract(FeePolicy.TX_FEE);
+        /*
+         The tx we create has that structure:
+         
+         IN[0]  any input > inputAmount (including tx fee) (unsigned)
+         IN[1...n] optional inputs supported, but normally there is just 1 input (unsigned)
+         OUT[0] dummyOutputAmount (inputAmount - tx fee)
+         OUT[1] Optional Change = inputAmount - dummyOutputAmount - tx fee
+         
+         We are only interested in the inputs and the optional change output.
+         */
+
+        // inputAmount includes the tx fee. So we subtract the fee to get the dummyOutputAmount.
+        Coin dummyOutputAmount = inputAmount.subtract(FeePolicy.TX_FEE);
 
         Transaction dummyTX = new Transaction(params);
         // The output is just used to get the right inputs and change outputs, so we use an anonymous ECKey, as it will never be used for anything.
@@ -183,254 +217,322 @@ public class TradeWalletService {
         TransactionOutput dummyOutput = new TransactionOutput(params, dummyTX, dummyOutputAmount, new ECKey().toAddress(params));
         dummyTX.addOutput(dummyOutput);
 
-        // Fin the needed inputs to pay the output, optional add change output.
-        // Normally only 1 input and no change output is used, but we support multiple inputs and outputs. Our spending transaction output is from the create
-        // offer fee payment. In future changes (in case of no offer fee) multiple inputs might become used.
-        addAvailableInputsAndChangeOutputs(dummyTX, buyerAddressEntry);
+        // Find the needed inputs to pay the output, optionally add 1 change output.
+        // Normally only 1 input and no change output is used, but we support multiple inputs and 1 change output. 
+        // Our spending transaction output is from the create offer fee payment. 
+        addAvailableInputsAndChangeOutputs(dummyTX, addressEntry);
 
-        // The completeTx() call signs the input, but we don't want to pass over signed tx inputs
-        // But to be safe and to support future changes (in case of no offer fee) we handle potential multiple inputs
+        // The completeTx() call signs the input, but we don't want to pass over signed tx inputs so we remove the signature
         removeSignatures(dummyTX);
 
         verifyTransaction(dummyTX);
 
-        // The created tx looks like:
-         /*
-        IN[0]  any input > buyerInputAmount (including tx fee) (unsigned)
-        IN[1...n] optional inputs supported, but currently there is just 1 input (unsigned)
-        OUT[0] dummyOutputAmount (buyerInputAmount - tx fee)
-        OUT[1] Optional Change = buyerInputAmount - dummyOutputAmount - tx fee
-        OUT[2...n] optional more outputs are supported, but currently there is just max. 1 optional change output
-         */
-
         printTxWithInputs("dummyTX", dummyTX);
 
-        List<TransactionOutput> connectedOutputsForAllInputs = dummyTX.getInputs().stream().map(TransactionInput::getConnectedOutput)
+        List<RawInput> rawInputList = dummyTX.getInputs().stream()
+                .map(e -> {
+                    checkNotNull(e.getConnectedOutput(), "e.getConnectedOutput() must not be null");
+                    checkNotNull(e.getConnectedOutput().getParentTransaction(), "e.getConnectedOutput().getParentTransaction() must not be null");
+                    checkNotNull(e.getValue(), "e.getValue() must not be null");
+                    return getRawInputFromTransactionInput(e);
+                })
                 .collect(Collectors.toList());
 
-        // Only save buyer outputs, the dummy output (index 1) is ignored
-        List<TransactionOutput> outputs = new ArrayList<>();
-        for (int i = 1; i < dummyTX.getOutputs().size(); i++) {
-            outputs.add(dummyTX.getOutputs().get(i));
+        // We don't support more then 1 change outputs, so there are max. 2 outputs
+        checkArgument(dummyTX.getOutputs().size() < 3);
+        // Only interested in optional change output, the dummy output at index 0 is ignored (that's why we use index 1)
+        TransactionOutput changeOutput = dummyTX.getOutputs().size() == 2 ? dummyTX.getOutputs().get(1) : null;
+        long changeOutputValue = 0L;
+        String changeOutputAddress = null;
+        if (changeOutput != null) {
+            changeOutputValue = changeOutput.getValue().getValue();
+            checkNotNull(changeOutput.getAddressFromP2PKHScript(params), "changeOutput.getAddressFromP2PKHScript(params) must not be null");
+            changeOutputAddress = changeOutput.getAddressFromP2PKHScript(params).toString();
         }
 
-        return new Result(connectedOutputsForAllInputs, outputs);
+        return new InputsAndChangeOutput(rawInputList, changeOutputValue, changeOutputAddress);
     }
 
-    public Result createAndSignDepositTx(Coin sellerInputAmount,
-                                         Coin msOutputAmount,
-                                         List<TransactionOutput> buyerConnectedOutputsForAllInputs,
-                                         List<TransactionOutput> buyerOutputs,
-                                         AddressEntry sellerAddressInfo,
-                                         byte[] buyerPubKey,
-                                         byte[] sellerPubKey,
-                                         byte[] arbitratorPubKey) throws SigningException, TransactionVerificationException, WalletException {
+    /**
+     * The offerer creates the deposit transaction using the takers input(s) and optional output and signs his input(s).
+     *
+     * @param offererIsBuyer           The flag indicating if we are in the offerer as buyer role or the opposite.
+     * @param contractHash             The hash of the contract to be added to the OP_RETURN output.
+     * @param offererInputAmount       The input amount of the offerer.
+     * @param msOutputAmount           The output amount to our MS output.
+     * @param takerRawInputs           Raw data for the connected outputs for all inputs of the taker (normally 1 input)
+     * @param takerChangeOutputValue   Optional taker change output value
+     * @param takerChangeAddressString Optional taker change address
+     * @param offererAddressInfo       The offerers address entry.
+     * @param buyerPubKey              The public key of the buyer.
+     * @param sellerPubKey             The public key of the seller.
+     * @param arbitratorPubKey         The public key of the arbitrator.
+     * @return A data container holding the serialized transaction and the offerer raw inputs
+     * @throws SigningException
+     * @throws TransactionVerificationException
+     * @throws WalletException
+     */
+    public PreparedDepositTxAndOffererInputs offererCreatesAndSignsDepositTx(boolean offererIsBuyer,
+                                                                             byte[] contractHash,
+                                                                             Coin offererInputAmount,
+                                                                             Coin msOutputAmount,
+                                                                             List<RawInput> takerRawInputs,
+                                                                             long takerChangeOutputValue,
+                                                                             @Nullable String takerChangeAddressString,
+                                                                             AddressEntry offererAddressInfo,
+                                                                             byte[] buyerPubKey,
+                                                                             byte[] sellerPubKey,
+                                                                             byte[] arbitratorPubKey)
+            throws SigningException, TransactionVerificationException, WalletException, AddressFormatException {
         log.trace("createAndSignDepositTx called");
-        log.trace("sellerInputAmount " + sellerInputAmount.toFriendlyString());
+        log.trace("offererIsBuyer " + offererIsBuyer);
+        log.trace("offererInputAmount " + offererInputAmount.toFriendlyString());
         log.trace("msOutputAmount " + msOutputAmount.toFriendlyString());
-        log.trace("buyerConnectedOutputsForAllInputs " + buyerConnectedOutputsForAllInputs.toString());
-        log.trace("buyerOutputs " + buyerOutputs.toString());
-        log.trace("sellerAddressInfo " + sellerAddressInfo.toString());
+        log.trace("takerRawInputs " + takerRawInputs.toString());
+        log.trace("takerChangeOutputValue " + takerChangeOutputValue);
+        log.trace("takerChangeAddressString " + takerChangeAddressString != null ? takerChangeAddressString : "");
         log.trace("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
         log.trace("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
         log.trace("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
 
-        checkArgument(buyerConnectedOutputsForAllInputs.size() > 0);
+        checkArgument(!takerRawInputs.isEmpty());
 
         // First we construct a dummy TX to get the inputs and outputs we want to use for the real deposit tx. 
+        // Similar to the way we did in the createTakerDepositTxInputs method.
         Transaction dummyTx = new Transaction(params);
-        Coin dummyOutputAmount = sellerInputAmount.subtract(FeePolicy.TX_FEE);
+        Coin dummyOutputAmount = offererInputAmount.subtract(FeePolicy.TX_FEE);
         TransactionOutput dummyOutput = new TransactionOutput(params, dummyTx, dummyOutputAmount, new ECKey().toAddress(params));
         dummyTx.addOutput(dummyOutput);
-        addAvailableInputsAndChangeOutputs(dummyTx, sellerAddressInfo);
-        List<TransactionInput> sellererInputs = dummyTx.getInputs();
-        List<TransactionOutput> sellerOutputs = new ArrayList<>();
-        // we store optional change outputs (ignoring dummyOutput)
-        for (int i = 1; i < dummyTx.getOutputs().size(); i++) {
-            sellerOutputs.add(dummyTx.getOutput(i));
-        }
+        addAvailableInputsAndChangeOutputs(dummyTx, offererAddressInfo);
+        // Normally we have only 1 input but we support multiple inputs if the user has paid in with several transactions.
+        List<TransactionInput> offererInputs = dummyTx.getInputs();
+        TransactionOutput offererOutput = null;
+
+        // We don't support more then 1 optional change output
+        Preconditions.checkArgument(dummyTx.getOutputs().size() < 3, "dummyTx.getOutputs().size() >= 3");
+
+        // Only save change outputs, the dummy output is ignored (that's why we start with index 1)
+        if (dummyTx.getOutputs().size() > 1)
+            offererOutput = dummyTx.getOutput(1);
 
         // Now we construct the real deposit tx
         Transaction preparedDepositTx = new Transaction(params);
 
-        // Add buyer inputs (normally its just 1 input)
-        for (TransactionOutput connectedOutputForInput : buyerConnectedOutputsForAllInputs) {
-            TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction());
-            TransactionInput transactionInput = new TransactionInput(params, preparedDepositTx, new byte[]{}, outPoint, connectedOutputForInput.getValue());
-            preparedDepositTx.addInput(transactionInput);
+        List<RawInput> offererRawInputs = new ArrayList<>();
+        if (offererIsBuyer) {
+            // Add buyer inputs
+            for (TransactionInput input : offererInputs) {
+                preparedDepositTx.addInput(input);
+                offererRawInputs.add(getRawInputFromTransactionInput(input));
+            }
+
+            // Add seller inputs
+            // the sellers input is not signed so we attach empty script bytes
+            for (RawInput rawInput : takerRawInputs)
+                preparedDepositTx.addInput(getTransactionInput(preparedDepositTx, new byte[]{}, rawInput));
+        } else {
+            // taker is buyer role
+
+            // Add buyer inputs
+            // the sellers input is not signed so we attach empty script bytes
+            for (RawInput rawInput : takerRawInputs)
+                preparedDepositTx.addInput(getTransactionInput(preparedDepositTx, new byte[]{}, rawInput));
+
+            // Add seller inputs
+            for (TransactionInput input : offererInputs) {
+                preparedDepositTx.addInput(input);
+                offererRawInputs.add(getRawInputFromTransactionInput(input));
+            }
         }
 
-        // Add seller inputs
-        List<TransactionOutput> sellerConnectedOutputsForAllInputs = new ArrayList<>();
-        for (TransactionInput input : sellererInputs) {
-            preparedDepositTx.addInput(input);
-            sellerConnectedOutputsForAllInputs.add(input.getConnectedOutput());
-        }
 
         // Add MultiSig output
         Script p2SHMultiSigOutputScript = getP2SHMultiSigOutputScript(buyerPubKey, sellerPubKey, arbitratorPubKey);
+
         // Tx fee for deposit tx will be paid by buyer.
         TransactionOutput p2SHMultiSigOutput = new TransactionOutput(params, preparedDepositTx, msOutputAmount, p2SHMultiSigOutputScript.getProgram());
         preparedDepositTx.addOutput(p2SHMultiSigOutput);
 
-        // Add optional buyer outputs 
-        buyerOutputs.forEach(preparedDepositTx::addOutput);
+        // We add the hash ot OP_RETURN with a 0 amount output
+        TransactionOutput contractHashOutput = new TransactionOutput(params, preparedDepositTx, Coin.ZERO,
+                ScriptBuilder.createOpReturnScript(contractHash).getProgram());
+        preparedDepositTx.addOutput(contractHashOutput);
 
-        Coin sellersSpendingAmount = Coin.ZERO;
+        TransactionOutput takerTransactionOutput = null;
+        if (takerChangeOutputValue > 0 && takerChangeAddressString != null)
+            takerTransactionOutput = new TransactionOutput(params, preparedDepositTx, Coin.valueOf(takerChangeOutputValue),
+                    new Address(params, takerChangeAddressString));
 
-        // Add optional seller outputs 
-        for (TransactionOutput output : sellerOutputs) {
-            preparedDepositTx.addOutput(output);
+        if (offererIsBuyer) {
+            // Add optional buyer outputs 
+            if (offererOutput != null)
+                preparedDepositTx.addOutput(offererOutput);
 
-            // subtract change amount
-            sellersSpendingAmount = sellersSpendingAmount.subtract(output.getValue());
+            // Add optional seller outputs 
+            if (takerTransactionOutput != null)
+                preparedDepositTx.addOutput(takerTransactionOutput);
+        } else {
+            // taker is buyer role
+
+            // Add optional seller outputs 
+            if (takerTransactionOutput != null)
+                preparedDepositTx.addOutput(takerTransactionOutput);
+
+            // Add optional buyer outputs 
+            if (offererOutput != null)
+                preparedDepositTx.addOutput(offererOutput);
         }
 
-        // Sign inputs (start after buyer inputs)
-        for (int i = buyerConnectedOutputsForAllInputs.size(); i < preparedDepositTx.getInputs().size(); i++) {
+        // Sign inputs 
+        int start = offererIsBuyer ? 0 : offererInputs.size();
+        int end = offererIsBuyer ? offererInputs.size() : preparedDepositTx.getInputs().size();
+        for (int i = start; i < end; i++) {
             TransactionInput input = preparedDepositTx.getInput(i);
             signInput(preparedDepositTx, input, i);
             checkScriptSig(preparedDepositTx, input, i);
-
-            // add up spending amount
-            assert input.getConnectedOutput() != null;
-            sellersSpendingAmount = sellersSpendingAmount.add(input.getConnectedOutput().getValue());
         }
 
-        if (sellerInputAmount.compareTo(sellersSpendingAmount) != 0)
-            throw new TransactionVerificationException("Sellers input amount does not match required value.");
-
         verifyTransaction(preparedDepositTx);
 
         printTxWithInputs("preparedDepositTx", preparedDepositTx);
-        return new Result(preparedDepositTx, sellerConnectedOutputsForAllInputs, sellerOutputs);
+
+        return new PreparedDepositTxAndOffererInputs(offererRawInputs, preparedDepositTx.bitcoinSerialize());
     }
 
-    public void signAndPublishDepositTx(Transaction preparedDepositTx,
-                                        List<TransactionOutput> buyerConnectedOutputsForAllInputs,
-                                        List<TransactionOutput> sellerConnectedOutputsForAllInputs,
-                                        List<TransactionOutput> buyerOutputs,
-                                        Coin buyerInputAmount,
-                                        byte[] buyerPubKey,
-                                        byte[] sellerPubKey,
-                                        byte[] arbitratorPubKey,
-                                        FutureCallback<Transaction> callback) throws SigningException, TransactionVerificationException,
+    /**
+     * The taker signs the deposit transaction he received from the offerer and publishes it.
+     *
+     * @param takerIsSeller               The flag indicating if we are in the taker as seller role or the opposite.
+     * @param contractHash                The hash of the contract to be added to the OP_RETURN output.
+     * @param offerersDepositTxSerialized The prepared deposit transaction signed by the offerer.
+     * @param buyerInputs                 The connected outputs for all inputs of the buyer.
+     * @param sellerInputs                The connected outputs for all inputs of the seller.
+     * @param buyerPubKey                 The public key of the buyer.
+     * @param sellerPubKey                The public key of the seller.
+     * @param arbitratorPubKey            The public key of the arbitrator.
+     * @param callback                    Callback when transaction is broadcasted.
+     * @throws SigningException
+     * @throws TransactionVerificationException
+     * @throws WalletException
+     */
+    public void takerSignsAndPublishesDepositTx(boolean takerIsSeller,
+                                                byte[] contractHash,
+                                                byte[] offerersDepositTxSerialized,
+                                                List<RawInput> buyerInputs,
+                                                List<RawInput> sellerInputs,
+                                                byte[] buyerPubKey,
+                                                byte[] sellerPubKey,
+                                                byte[] arbitratorPubKey,
+                                                FutureCallback<Transaction> callback) throws SigningException, TransactionVerificationException,
             WalletException {
+        Transaction offerersDepositTx = new Transaction(params, offerersDepositTxSerialized);
+
         log.trace("signAndPublishDepositTx called");
-        log.trace("preparedDepositTx " + preparedDepositTx.toString());
-        log.trace("buyerConnectedOutputsForAllInputs " + buyerConnectedOutputsForAllInputs.toString());
-        log.trace("sellerConnectedOutputsForAllInputs " + sellerConnectedOutputsForAllInputs.toString());
-        log.trace("buyerOutputs " + buyerOutputs.toString());
-        log.trace("buyerInputAmount " + buyerInputAmount.toFriendlyString());
+        log.trace("takerIsSeller " + takerIsSeller);
+        log.trace("offerersDepositTx " + offerersDepositTx.toString());
+        log.trace("buyerConnectedOutputsForAllInputs " + buyerInputs.toString());
+        log.trace("sellerConnectedOutputsForAllInputs " + sellerInputs.toString());
         log.trace("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
         log.trace("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
         log.trace("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
 
-        checkArgument(buyerConnectedOutputsForAllInputs.size() > 0);
-        checkArgument(sellerConnectedOutputsForAllInputs.size() > 0);
+        checkArgument(!buyerInputs.isEmpty());
+        checkArgument(!sellerInputs.isEmpty());
 
-        // Check if sellers Multisig script is identical to mine
+        // Check if offerers Multisig script is identical to the takers
         Script p2SHMultiSigOutputScript = getP2SHMultiSigOutputScript(buyerPubKey, sellerPubKey, arbitratorPubKey);
-        if (!preparedDepositTx.getOutput(0).getScriptPubKey().equals(p2SHMultiSigOutputScript))
-            throw new TransactionVerificationException("Sellers p2SHMultiSigOutputScript does not match to my p2SHMultiSigOutputScript");
+        if (!offerersDepositTx.getOutput(0).getScriptPubKey().equals(p2SHMultiSigOutputScript))
+            throw new TransactionVerificationException("Offerers p2SHMultiSigOutputScript does not match to takers p2SHMultiSigOutputScript");
 
-        // The outpoints are not available from the serialized preparedDepositTx, so we cannot use that tx directly, but we use it to construct a new 
+        // The outpoints are not available from the serialized offerersDepositTx, so we cannot use that tx directly, but we use it to construct a new 
         // depositTx
         Transaction depositTx = new Transaction(params);
 
-        // Add buyer inputs
-        Coin buyerSpendingAmount = Coin.ZERO;
-        for (TransactionOutput connectedOutputForInput : buyerConnectedOutputsForAllInputs) {
-            TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction());
-            TransactionInput input = new TransactionInput(params, depositTx, new byte[]{}, outPoint, connectedOutputForInput.getValue());
-            depositTx.addInput(input);
+        if (takerIsSeller) {
+            // Add buyer inputs and apply signature
+            // We grab the signature from the offerersDepositTx and apply it to the new tx input
+            for (int i = 0; i < buyerInputs.size(); i++)
+                depositTx.addInput(getTransactionInput(depositTx, getScriptProgram(offerersDepositTx, i), buyerInputs.get(i)));
 
-            // add up spending amount
-            assert input.getConnectedOutput() != null;
-            buyerSpendingAmount = buyerSpendingAmount.add(input.getConnectedOutput().getValue());
+            // Add seller inputs 
+            for (RawInput rawInput : sellerInputs)
+                depositTx.addInput(getTransactionInput(depositTx, new byte[]{}, rawInput));
+        } else {
+            // taker is buyer
+            // Add buyer inputs and apply signature
+            for (RawInput rawInput : buyerInputs)
+                depositTx.addInput(getTransactionInput(depositTx, new byte[]{}, rawInput));
+
+            // Add seller inputs 
+            // We grab the signature from the offerersDepositTx and apply it to the new tx input
+            for (int i = buyerInputs.size(), k = 0; i < offerersDepositTx.getInputs().size(); i++, k++)
+                depositTx.addInput(getTransactionInput(depositTx, getScriptProgram(offerersDepositTx, i), sellerInputs.get(k)));
         }
 
-        // Add seller inputs and apply signature
-        for (TransactionOutput connectedOutputForInput : sellerConnectedOutputsForAllInputs) {
-            TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction());
+        // Check if OP_RETURN output with contract hash matches the one from the offerer
+        TransactionOutput contractHashOutput = new TransactionOutput(params, offerersDepositTx, Coin.ZERO,
+                ScriptBuilder.createOpReturnScript(contractHash).getProgram());
 
-            // We grab the signature from the preparedDepositTx and apply it to the new tx input
-            TransactionInput sellerInput = preparedDepositTx.getInputs().get(buyerConnectedOutputsForAllInputs.size());
-            byte[] scriptProgram = sellerInput.getScriptSig().getProgram();
-            if (scriptProgram.length == 0)
-                throw new TransactionVerificationException("Inputs from seller not singed.");
+        TransactionOutput offerersContractHashOutput = offerersDepositTx.getOutputs().get(1);
+        if (!offerersContractHashOutput.equals(contractHashOutput))
+            throw new TransactionVerificationException("Offerers transaction output for the contract hash is not matching takers version.");
 
-            TransactionInput transactionInput = new TransactionInput(params, depositTx, scriptProgram, outPoint, connectedOutputForInput.getValue());
-            depositTx.addInput(transactionInput);
-        }
+        // Add all outputs from offerersDepositTx to depositTx
+        offerersDepositTx.getOutputs().forEach(depositTx::addOutput);
 
-        // Add all outputs from preparedDepositTx to depositTx
-        preparedDepositTx.getOutputs().forEach(depositTx::addOutput);
+        printTxWithInputs("offerersDepositTx", offerersDepositTx);
 
-        // Sign inputs
-        for (int i = 0; i < buyerConnectedOutputsForAllInputs.size(); i++) {
+        // Sign inputs 
+        int start = takerIsSeller ? buyerInputs.size() : 0;
+        int end = takerIsSeller ? depositTx.getInputs().size() : buyerInputs.size();
+        for (int i = start; i < end; i++) {
             TransactionInput input = depositTx.getInput(i);
             signInput(depositTx, input, i);
             checkScriptSig(depositTx, input, i);
         }
 
-        // subtract change amount
-        for (int i = 1; i < buyerOutputs.size() + 1; i++) {
-            buyerSpendingAmount = buyerSpendingAmount.subtract(depositTx.getOutput(i).getValue());
-        }
-
-        if (buyerInputAmount.compareTo(buyerSpendingAmount) != 0)
-            throw new TransactionVerificationException("Buyers input amount does not match required value.");
-
         verifyTransaction(depositTx);
         checkWalletConsistency();
 
-        // Broadcast depositTx
         printTxWithInputs("depositTx", depositTx);
+
+        // Broadcast depositTx
         ListenableFuture<Transaction> broadcastComplete = walletAppKit.peerGroup().broadcastTransaction(depositTx).future();
         Futures.addCallback(broadcastComplete, callback);
     }
 
-    // Commits the tx to the wallet and returns that
-    public Transaction commitTx(Transaction tx) throws VerificationException {
-        log.trace("commitTx called");
-        log.trace("tx " + tx.toString());
 
-        // We need to recreate the tx we get a null pointer otherwise
-        Transaction transaction = new Transaction(params, tx.bitcoinSerialize());
-        log.trace("transaction " + transaction.toString());
-
-        wallet.receivePending(transaction, null, true);
-        return transaction;
-    }
-
-    // Returns local existing wallet transaction 
-    public Transaction getWalletTx(Transaction tx) throws VerificationException {
-        log.trace("getWalleTx called");
-        log.trace("tx " + tx.toString());
-
-        return wallet.getTransaction(tx.getHash());
-    }
-
-    public int getLastBlockSeenHeight() {
-        return wallet.getLastBlockSeenHeight();
-    }
-
-    public byte[] signPayoutTx(Transaction depositTx,
-                               Coin buyerPayoutAmount,
-                               Coin sellerPayoutAmount,
-                               String buyerPayoutAddressString,
-                               AddressEntry sellerAddressEntry,
-                               long lockTime,
-                               byte[] buyerPubKey,
-                               byte[] sellerPubKey,
-                               byte[] arbitratorPubKey)
-            throws AddressFormatException, TransactionVerificationException, SigningException {
-        log.trace("createAndSignPayoutTx called");
+    /**
+     * Seller signs payout transaction, buyer has not signed yet.
+     *
+     * @param depositTx          Deposit transaction
+     * @param buyerPayoutAmount  Payout amount for buyer
+     * @param sellerPayoutAmount Payout amount for seller
+     * @param buyerAddressString Address for buyer
+     * @param sellerAddressEntry AddressEntry for seller
+     * @param lockTime           Lock time
+     * @param buyerPubKey        The public key of the buyer.
+     * @param sellerPubKey       The public key of the seller.
+     * @param arbitratorPubKey   The public key of the arbitrator.
+     * @return DER encoded canonical signature
+     * @throws AddressFormatException
+     * @throws TransactionVerificationException
+     */
+    public byte[] sellerSignsPayoutTx(Transaction depositTx,
+                                      Coin buyerPayoutAmount,
+                                      Coin sellerPayoutAmount,
+                                      String buyerAddressString,
+                                      AddressEntry sellerAddressEntry,
+                                      long lockTime,
+                                      byte[] buyerPubKey,
+                                      byte[] sellerPubKey,
+                                      byte[] arbitratorPubKey)
+            throws AddressFormatException, TransactionVerificationException {
+        log.trace("signPayoutTx called");
         log.trace("depositTx " + depositTx.toString());
         log.trace("buyerPayoutAmount " + buyerPayoutAmount.toFriendlyString());
         log.trace("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
-        log.trace("buyerPayoutAddressString " + buyerPayoutAddressString);
+        log.trace("buyerAddressString " + buyerAddressString);
         log.trace("sellerAddressEntry " + sellerAddressEntry.toString());
         log.trace("lockTime " + lockTime);
         log.trace("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
@@ -440,38 +542,53 @@ public class TradeWalletService {
         Transaction preparedPayoutTx = createPayoutTx(depositTx,
                 buyerPayoutAmount,
                 sellerPayoutAmount,
-                buyerPayoutAddressString,
+                buyerAddressString,
                 sellerAddressEntry.getAddressString(),
                 lockTime
         );
         // MS redeemScript
         Script redeemScript = getMultiSigRedeemScript(buyerPubKey, sellerPubKey, arbitratorPubKey);
+        // MS output from prev. tx is index 0
         Sha256Hash sigHash = preparedPayoutTx.hashForSignature(0, redeemScript, Transaction.SigHash.ALL, false);
-        ECKey.ECDSASignature sellerSignature = sellerAddressEntry.getKeyPair().sign(sigHash).toCanonicalised();
+        ECKey.ECDSASignature sellerSignature = sellerAddressEntry.getKeyPair().sign(sigHash, aesKey).toCanonicalised();
 
         verifyTransaction(preparedPayoutTx);
 
         printTxWithInputs("preparedPayoutTx", preparedPayoutTx);
-        log.trace("sellerSignature r " + sellerSignature.toCanonicalised().r.toString());
-        log.trace("sellerSignature s " + sellerSignature.toCanonicalised().s.toString());
-        Sha256Hash hashForSignature = preparedPayoutTx.hashForSignature(0, redeemScript.getProgram(), (byte) 1);
-        log.trace("hashForSignature " + Utils.HEX.encode(hashForSignature.getBytes()));
 
         return sellerSignature.encodeToDER();
     }
 
-    public Transaction signAndFinalizePayoutTx(Transaction depositTx,
-                                               byte[] sellerSignature,
-                                               Coin buyerPayoutAmount,
-                                               Coin sellerPayoutAmount,
-                                               AddressEntry buyerAddressEntry,
-                                               String sellerAddressString,
-                                               long lockTime,
-                                               byte[] buyerPubKey,
-                                               byte[] sellerPubKey,
-                                               byte[] arbitratorPubKey)
-            throws AddressFormatException, TransactionVerificationException, WalletException, SigningException {
-        log.trace("signAndPublishPayoutTx called");
+    /**
+     * Buyer creates and signs payout transaction and adds signature of seller to complete the transaction
+     *
+     * @param depositTx           Deposit transaction
+     * @param sellerSignature     DER encoded canonical signature of seller
+     * @param buyerPayoutAmount   Payout amount for buyer
+     * @param sellerPayoutAmount  Payout amount for seller
+     * @param buyerAddressEntry   AddressEntry for buyer
+     * @param sellerAddressString Address for seller
+     * @param lockTime            Lock time
+     * @param buyerPubKey         The public key of the buyer.
+     * @param sellerPubKey        The public key of the seller.
+     * @param arbitratorPubKey    The public key of the arbitrator.
+     * @return The payout transaction
+     * @throws AddressFormatException
+     * @throws TransactionVerificationException
+     * @throws WalletException
+     */
+    public Transaction buyerSignsAndFinalizesPayoutTx(Transaction depositTx,
+                                                      byte[] sellerSignature,
+                                                      Coin buyerPayoutAmount,
+                                                      Coin sellerPayoutAmount,
+                                                      AddressEntry buyerAddressEntry,
+                                                      String sellerAddressString,
+                                                      long lockTime,
+                                                      byte[] buyerPubKey,
+                                                      byte[] sellerPubKey,
+                                                      byte[] arbitratorPubKey)
+            throws AddressFormatException, TransactionVerificationException, WalletException {
+        log.trace("signAndFinalizePayoutTx called");
         log.trace("depositTx " + depositTx.toString());
         log.trace("sellerSignature r " + ECKey.ECDSASignature.decodeFromDER(sellerSignature).r.toString());
         log.trace("sellerSignature s " + ECKey.ECDSASignature.decodeFromDER(sellerSignature).s.toString());
@@ -490,27 +607,26 @@ public class TradeWalletService {
                 buyerAddressEntry.getAddressString(),
                 sellerAddressString,
                 lockTime);
+        // MS redeemScript
         Script redeemScript = getMultiSigRedeemScript(buyerPubKey, sellerPubKey, arbitratorPubKey);
+        // MS output from prev. tx is index 0
         Sha256Hash sigHash = payoutTx.hashForSignature(0, redeemScript, Transaction.SigHash.ALL, false);
-        ECKey.ECDSASignature buyerSignature = buyerAddressEntry.getKeyPair().sign(sigHash).toCanonicalised();
-
-        log.trace("buyerSignature r " + buyerSignature.r.toString());
-        log.trace("buyerSignature s " + buyerSignature.s.toString());
-
-        Sha256Hash hashForSignature = payoutTx.hashForSignature(0, redeemScript.getProgram(), (byte) 1);
-        log.trace("hashForSignature " + Utils.HEX.encode(hashForSignature.getBytes()));
+        checkNotNull(buyerAddressEntry.getKeyPair(), "buyerAddressEntry.getKeyPair() must not be null");
+        ECKey.ECDSASignature buyerSignature = buyerAddressEntry.getKeyPair().sign(sigHash, aesKey).toCanonicalised();
 
         TransactionSignature sellerTxSig = new TransactionSignature(ECKey.ECDSASignature.decodeFromDER(sellerSignature), Transaction.SigHash.ALL, false);
         TransactionSignature buyerTxSig = new TransactionSignature(buyerSignature, Transaction.SigHash.ALL, false);
-        // Take care of order of signatures. See comment below at getMultiSigRedeemScript
+        // Take care of order of signatures. Need to be reversed here. See comment below at getMultiSigRedeemScript (arbitrator, seller, buyer)
         Script inputScript = ScriptBuilder.createP2SHMultiSigInputScript(ImmutableList.of(sellerTxSig, buyerTxSig), redeemScript);
+
         TransactionInput input = payoutTx.getInput(0);
         input.setScriptSig(inputScript);
+
         printTxWithInputs("payoutTx", payoutTx);
         verifyTransaction(payoutTx);
         checkWalletConsistency();
         checkScriptSig(payoutTx, input, 0);
-        assert input.getConnectedOutput() != null;
+        checkNotNull(input.getConnectedOutput(), "input.getConnectedOutput() must not be null");
         input.verify(input.getConnectedOutput());
 
         printTxWithInputs("payoutTx", payoutTx);
@@ -520,6 +636,230 @@ public class TradeWalletService {
         return payoutTx;
     }
 
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Dispute
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * That arbitrator signs the payout transaction
+     *
+     * @param depositTxSerialized    Serialized deposit tx
+     * @param buyerPayoutAmount      The payout amount of the buyer.
+     * @param sellerPayoutAmount     The payout amount of the seller.
+     * @param arbitratorPayoutAmount The payout amount of the arbitrator.
+     * @param buyerAddressString     The address of the buyer.
+     * @param sellerAddressString    The address of the seller.
+     * @param arbitratorAddressEntry The addressEntry of the arbitrator.
+     * @param buyerPubKey            The public key of the buyer.
+     * @param sellerPubKey           The public key of the seller.
+     * @param arbitratorPubKey       The public key of the arbitrator.
+     * @return DER encoded canonical signature of arbitrator
+     * @throws AddressFormatException
+     * @throws TransactionVerificationException
+     */
+    public byte[] signDisputedPayoutTx(byte[] depositTxSerialized,
+                                       Coin buyerPayoutAmount,
+                                       Coin sellerPayoutAmount,
+                                       Coin arbitratorPayoutAmount,
+                                       String buyerAddressString,
+                                       String sellerAddressString,
+                                       AddressEntry arbitratorAddressEntry,
+                                       byte[] buyerPubKey,
+                                       byte[] sellerPubKey,
+                                       byte[] arbitratorPubKey)
+            throws AddressFormatException, TransactionVerificationException {
+        Transaction depositTx = new Transaction(params, depositTxSerialized);
+        log.trace("signDisputedPayoutTx called");
+        log.trace("depositTx " + depositTx.toString());
+        log.trace("buyerPayoutAmount " + buyerPayoutAmount.toFriendlyString());
+        log.trace("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
+        log.trace("arbitratorPayoutAmount " + arbitratorPayoutAmount.toFriendlyString());
+        log.trace("buyerAddressString " + buyerAddressString);
+        log.trace("sellerAddressString " + sellerAddressString);
+        log.trace("arbitratorAddressEntry " + arbitratorAddressEntry.toString());
+        log.trace("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
+        log.trace("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
+        log.trace("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
+
+        // Our MS is index 0
+        TransactionOutput p2SHMultiSigOutput = depositTx.getOutput(0);
+        Transaction preparedPayoutTx = new Transaction(params);
+        preparedPayoutTx.addInput(p2SHMultiSigOutput);
+        if (buyerPayoutAmount.isGreaterThan(Coin.ZERO))
+            preparedPayoutTx.addOutput(buyerPayoutAmount, new Address(params, buyerAddressString));
+        if (sellerPayoutAmount.isGreaterThan(Coin.ZERO))
+            preparedPayoutTx.addOutput(sellerPayoutAmount, new Address(params, sellerAddressString));
+        if (arbitratorPayoutAmount.isGreaterThan(Coin.ZERO))
+            preparedPayoutTx.addOutput(arbitratorPayoutAmount, new Address(params, arbitratorAddressEntry.getAddressString()));
+
+        // take care of sorting!
+        Script redeemScript = getMultiSigRedeemScript(buyerPubKey, sellerPubKey, arbitratorPubKey);
+        Sha256Hash sigHash = preparedPayoutTx.hashForSignature(0, redeemScript, Transaction.SigHash.ALL, false);
+        ECKey.ECDSASignature arbitratorSignature = arbitratorAddressEntry.getKeyPair().sign(sigHash, aesKey).toCanonicalised();
+
+        verifyTransaction(preparedPayoutTx);
+
+        printTxWithInputs("preparedPayoutTx", preparedPayoutTx);
+
+        return arbitratorSignature.encodeToDER();
+    }
+
+    /**
+     * A trader who got the signed tx from the arbitrator finalize the payout tx
+     *
+     * @param depositTxSerialized     Serialized deposit tx
+     * @param arbitratorSignature     DER encoded canonical signature of arbitrator
+     * @param buyerPayoutAmount       Payout amount of the buyer
+     * @param sellerPayoutAmount      Payout amount of the seller
+     * @param arbitratorPayoutAmount  Payout amount for arbitrator
+     * @param buyerAddressString      The address of the buyer.
+     * @param sellerAddressString     The address of the seller.
+     * @param arbitratorAddressString The address of the arbitrator.
+     * @param tradersAddressEntry     The addressEntry of the trader who calls that method
+     * @param buyerPubKey             The public key of the buyer.
+     * @param sellerPubKey            The public key of the seller.
+     * @param arbitratorPubKey        The public key of the arbitrator.
+     * @return The completed payout tx
+     * @throws AddressFormatException
+     * @throws TransactionVerificationException
+     * @throws WalletException
+     */
+    public Transaction signAndFinalizeDisputedPayoutTx(byte[] depositTxSerialized,
+                                                       byte[] arbitratorSignature,
+                                                       Coin buyerPayoutAmount,
+                                                       Coin sellerPayoutAmount,
+                                                       Coin arbitratorPayoutAmount,
+                                                       String buyerAddressString,
+                                                       String sellerAddressString,
+                                                       String arbitratorAddressString,
+                                                       AddressEntry tradersAddressEntry,
+                                                       byte[] buyerPubKey,
+                                                       byte[] sellerPubKey,
+                                                       byte[] arbitratorPubKey)
+            throws AddressFormatException, TransactionVerificationException, WalletException {
+        Transaction depositTx = new Transaction(params, depositTxSerialized);
+
+        log.trace("signAndFinalizeDisputedPayoutTx called");
+        log.trace("depositTx " + depositTx);
+        log.trace("arbitratorSignature r " + ECKey.ECDSASignature.decodeFromDER(arbitratorSignature).r.toString());
+        log.trace("arbitratorSignature s " + ECKey.ECDSASignature.decodeFromDER(arbitratorSignature).s.toString());
+        log.trace("tradersOwnPayoutAmount " + buyerPayoutAmount.toFriendlyString());
+        log.trace("sellerPayoutAmount " + sellerPayoutAmount.toFriendlyString());
+        log.trace("arbitratorPayoutAmount " + arbitratorPayoutAmount.toFriendlyString());
+        log.trace("buyerAddressString " + buyerAddressString);
+        log.trace("sellerAddressString " + sellerAddressString);
+        log.trace("arbitratorAddressString " + arbitratorAddressString);
+        log.trace("tradersAddressEntry " + tradersAddressEntry);
+        log.trace("buyerPubKey " + ECKey.fromPublicOnly(buyerPubKey).toString());
+        log.trace("sellerPubKey " + ECKey.fromPublicOnly(sellerPubKey).toString());
+        log.trace("arbitratorPubKey " + ECKey.fromPublicOnly(arbitratorPubKey).toString());
+
+
+        TransactionOutput p2SHMultiSigOutput = depositTx.getOutput(0);
+        Transaction payoutTx = new Transaction(params);
+        payoutTx.addInput(p2SHMultiSigOutput);
+        if (buyerPayoutAmount.isGreaterThan(Coin.ZERO))
+            payoutTx.addOutput(buyerPayoutAmount, new Address(params, buyerAddressString));
+        if (sellerPayoutAmount.isGreaterThan(Coin.ZERO))
+            payoutTx.addOutput(sellerPayoutAmount, new Address(params, sellerAddressString));
+        if (arbitratorPayoutAmount.isGreaterThan(Coin.ZERO))
+            payoutTx.addOutput(arbitratorPayoutAmount, new Address(params, arbitratorAddressString));
+
+        // take care of sorting!
+        Script redeemScript = getMultiSigRedeemScript(buyerPubKey, sellerPubKey, arbitratorPubKey);
+        Sha256Hash sigHash = payoutTx.hashForSignature(0, redeemScript, Transaction.SigHash.ALL, false);
+        ECKey.ECDSASignature tradersSignature = tradersAddressEntry.getKeyPair().sign(sigHash, aesKey).toCanonicalised();
+
+        TransactionSignature tradersTxSig = new TransactionSignature(tradersSignature, Transaction.SigHash.ALL, false);
+        TransactionSignature arbitratorTxSig = new TransactionSignature(ECKey.ECDSASignature.decodeFromDER(arbitratorSignature),
+                Transaction.SigHash.ALL, false);
+        // Take care of order of signatures. See comment below at getMultiSigRedeemScript (sort order needed here: arbitrator, seller, buyer)
+        Script inputScript = ScriptBuilder.createP2SHMultiSigInputScript(ImmutableList.of(arbitratorTxSig, tradersTxSig), redeemScript);
+        TransactionInput input = payoutTx.getInput(0);
+        input.setScriptSig(inputScript);
+
+        printTxWithInputs("disputed payoutTx", payoutTx);
+        verifyTransaction(payoutTx);
+        checkWalletConsistency();
+        checkScriptSig(payoutTx, input, 0);
+        checkNotNull(input.getConnectedOutput(), "input.getConnectedOutput() must not be null");
+        input.verify(input.getConnectedOutput());
+
+        printTxWithInputs("disputed payoutTx", payoutTx);
+
+        // As we use lockTime the tx will not be relayed as it is not considered standard.
+        // We need to broadcast on our own when we reached the block height. Both peers will do the broadcast.
+        return payoutTx;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Misc
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * @param tx
+     * @param callback
+     */
+    public void broadcastTx(Transaction tx, FutureCallback<Transaction> callback) {
+        ListenableFuture<Transaction> future = walletAppKit.peerGroup().broadcastTransaction(tx).future();
+        Futures.addCallback(future, callback);
+    }
+
+    /**
+     * @param transaction The transaction to be added to the wallet
+     * @return The transaction we added to the wallet, which is different as the one we passed as argument!
+     * @throws VerificationException
+     */
+    public Transaction addTransactionToWallet(Transaction transaction) throws VerificationException {
+        log.trace("addTxToWallet called");
+        log.trace("transaction " + transaction.toString());
+
+        // We need to recreate the transaction otherwise we get a null pointer... 
+        Transaction result = new Transaction(params, transaction.bitcoinSerialize());
+        log.trace("transaction " + result.toString());
+
+        if (wallet != null)
+            wallet.receivePending(result, null, true);
+        return result;
+    }
+
+    /**
+     * @param serializedTransaction The serialized transaction to be added to the wallet
+     * @return The transaction we added to the wallet, which is different as the one we passed as argument!
+     * @throws VerificationException
+     */
+    public Transaction addTransactionToWallet(byte[] serializedTransaction) throws VerificationException {
+        log.trace("addTxToWallet called");
+
+        // We need to recreate the tx otherwise we get a null pointer... 
+        Transaction transaction = new Transaction(params, serializedTransaction);
+        log.trace("transaction " + transaction.toString());
+
+        if (wallet != null)
+            wallet.receivePending(transaction, null, true);
+        return transaction;
+    }
+
+    /**
+     * @param tx The transaction we want to lookup
+     * @return Returns local existing wallet transaction
+     * @throws VerificationException
+     */
+    public Transaction getWalletTx(Transaction tx) throws VerificationException {
+        // log.trace("getWalleTx tx " + tx.toString());
+        return wallet.getTransaction(tx.getHash());
+    }
+
+    /**
+     * Returns the height of the last seen best-chain block. Can be 0 if a wallet is brand new or -1 if the wallet
+     * is old and doesn't have that data.
+     */
+    public int getLastBlockSeenHeight() {
+        return wallet.getLastBlockSeenHeight();
+    }
+
     public ListenableFuture<StoredBlock> getBlockHeightFuture(Transaction transaction) {
         return walletAppKit.chain().getHeightFuture((int) transaction.getLockTime());
     }
@@ -536,10 +876,38 @@ public class TradeWalletService {
         walletAppKit.chain().removeListener(blockChainListener);
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Private methods
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    @NotNull
+    private RawInput getRawInputFromTransactionInput(@NotNull TransactionInput input) {
+        checkNotNull(input.getConnectedOutput(), "input.getConnectedOutput() must not be null");
+        checkNotNull(input.getConnectedOutput().getParentTransaction(), "input.getConnectedOutput().getParentTransaction() must not be null");
+        checkNotNull(input.getValue(), "input.getValue() must not be null");
+
+        return new RawInput(input.getOutpoint().getIndex(), input.getConnectedOutput().getParentTransaction().bitcoinSerialize(), input.getValue().value);
+    }
+
+    private byte[] getScriptProgram(Transaction offerersDepositTx, int i) throws TransactionVerificationException {
+        byte[] scriptProgram = offerersDepositTx.getInputs().get(i).getScriptSig().getProgram();
+        if (scriptProgram.length == 0)
+            throw new TransactionVerificationException("Inputs from offerer not signed.");
+
+        return scriptProgram;
+    }
+
+    @NotNull
+    private TransactionInput getTransactionInput(Transaction depositTx, byte[] scriptProgram, RawInput rawInput) {
+        return new TransactionInput(params,
+                depositTx,
+                scriptProgram,
+                new TransactionOutPoint(params, rawInput.index, new Transaction(params, rawInput.parentTransaction)),
+                Coin.valueOf(rawInput.value));
+    }
+
+
     // Don't use ScriptBuilder.createRedeemScript and ScriptBuilder.createP2SHOutputScript as they use a sorting 
     // (Collections.sort(pubKeys, ECKey.PUBKEY_COMPARATOR);) which can lead to a non-matching list of signatures with pubKeys and the executeMultiSig does 
     // not iterate all possible combinations of sig/pubKeys leading to a verification fault. That nasty bug happens just randomly as the list after sorting 
@@ -553,7 +921,7 @@ public class TradeWalletService {
         ECKey buyerKey = ECKey.fromPublicOnly(buyerPubKey);
         ECKey sellerKey = ECKey.fromPublicOnly(sellerPubKey);
         ECKey arbitratorKey = ECKey.fromPublicOnly(arbitratorPubKey);
-        // Take care of sorting!
+        // Take care of sorting! Need to reverse to the order we use normally (buyer, seller, arbitrator)
         List<ECKey> keys = ImmutableList.of(arbitratorKey, sellerKey, buyerKey);
         return ScriptBuilder.createMultiSigOutputScript(2, keys);
     }
@@ -574,6 +942,7 @@ public class TradeWalletService {
         transaction.addOutput(buyerPayoutAmount, new Address(params, buyerAddressString));
         transaction.addOutput(sellerPayoutAmount, new Address(params, sellerAddressString));
         transaction.setLockTime(lockTime);
+        // When using lockTime we need to set sequenceNumber to 0 
         transaction.getInputs().stream().forEach(i -> i.setSequenceNumber(0));
         return transaction;
     }
@@ -588,6 +957,23 @@ public class TradeWalletService {
         }
     }
 
+    private void signInput(Transaction transaction, TransactionInput input, int inputIndex) throws SigningException {
+        checkNotNull(input.getConnectedOutput(), "input.getConnectedOutput() must not be null");
+        Script scriptPubKey = input.getConnectedOutput().getScriptPubKey();
+        ECKey sigKey = input.getOutpoint().getConnectedKey(wallet);
+        checkNotNull(sigKey, "sigKey must not be null");
+        Sha256Hash hash = transaction.hashForSignature(inputIndex, scriptPubKey, Transaction.SigHash.ALL, false);
+        ECKey.ECDSASignature signature = sigKey.sign(hash, aesKey);
+        TransactionSignature txSig = new TransactionSignature(signature, Transaction.SigHash.ALL, false);
+        if (scriptPubKey.isSentToRawPubKey()) {
+            input.setScriptSig(ScriptBuilder.createInputScript(txSig));
+        } else if (scriptPubKey.isSentToAddress()) {
+            input.setScriptSig(ScriptBuilder.createInputScript(txSig, sigKey));
+        } else {
+            throw new SigningException("Don't know how to sign for this kind of scriptPubKey: " + scriptPubKey);
+        }
+    }
+
     private void checkWalletConsistency() throws WalletException {
         try {
             log.trace("Check if wallet is consistent before commit.");
@@ -610,29 +996,10 @@ public class TradeWalletService {
         }
     }
 
-    private void signInput(Transaction transaction, TransactionInput input, int inputIndex) throws SigningException {
-        assert input.getConnectedOutput() != null;
-        Script scriptPubKey = input.getConnectedOutput().getScriptPubKey();
-        ECKey sigKey = input.getOutpoint().getConnectedKey(wallet);
-        assert sigKey != null;
-        Sha256Hash hash = transaction.hashForSignature(inputIndex, scriptPubKey, Transaction.SigHash.ALL, false);
-        ECKey.ECDSASignature signature = sigKey.sign(hash);
-        TransactionSignature txSig = new TransactionSignature(signature, Transaction.SigHash.ALL, false);
-        if (scriptPubKey.isSentToRawPubKey()) {
-            input.setScriptSig(ScriptBuilder.createInputScript(txSig));
-        }
-        else if (scriptPubKey.isSentToAddress()) {
-            input.setScriptSig(ScriptBuilder.createInputScript(txSig, sigKey));
-        }
-        else {
-            throw new SigningException("Don't know how to sign for this kind of scriptPubKey: " + scriptPubKey);
-        }
-    }
-
     private void checkScriptSig(Transaction transaction, TransactionInput input, int inputIndex) throws TransactionVerificationException {
         try {
             log.trace("Verifies that this script (interpreted as a scriptSig) correctly spends the given scriptPubKey. Check input at index: " + inputIndex);
-            assert input.getConnectedOutput() != null;
+            checkNotNull(input.getConnectedOutput(), "input.getConnectedOutput() must not be null");
             input.getScriptSig().correctlySpends(transaction, inputIndex, input.getConnectedOutput().getScriptPubKey());
         } catch (Throwable t) {
             t.printStackTrace();
@@ -652,56 +1019,31 @@ public class TradeWalletService {
             // Lets let the framework do the work to find the right inputs
             Wallet.SendRequest sendRequest = Wallet.SendRequest.forTx(transaction);
             sendRequest.shuffleOutputs = false;
+            sendRequest.aesKey = aesKey;
             // we allow spending of unconfirmed tx (double spend risk is low and usability would suffer if we need to wait for 1 confirmation)
-            sendRequest.coinSelector = new AddressBasedCoinSelector(params, addressEntry, true);
+            sendRequest.coinSelector = new AddressBasedCoinSelector(params, addressEntry);
+            // We use always the same address in a trade for all transactions
             sendRequest.changeAddress = addressEntry.getAddress();
             // With the usage of completeTx() we get all the work done with fee calculation, validation and coin selection.
             // We don't commit that tx to the wallet as it will be changed later and it's not signed yet.
             // So it will not change the wallet balance.
+            checkNotNull(wallet, "wallet must not be null");
             wallet.completeTx(sendRequest);
         } catch (Throwable t) {
             throw new WalletException(t);
         }
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Inner classes
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public class Result {
-        private final List<TransactionOutput> connectedOutputsForAllInputs;
-        private final List<TransactionOutput> outputs;
-        private Transaction depositTx;
-
-
-        private byte[] buyerSignature;
-
-        public Result(List<TransactionOutput> connectedOutputsForAllInputs, List<TransactionOutput> outputs) {
-            this.connectedOutputsForAllInputs = connectedOutputsForAllInputs;
-            this.outputs = outputs;
+    // not used
+  /*  private Coin getBalance(List<TransactionOutput> transactionOutputs, Address address) {
+        Coin balance = Coin.ZERO;
+        for (TransactionOutput transactionOutput : transactionOutputs) {
+            if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isPayToScriptHash()) {
+                Address addressOutput = transactionOutput.getScriptPubKey().getToAddress(params);
+                if (addressOutput.equals(address))
+                    balance = balance.add(transactionOutput.getValue());
+            }
         }
-
-        public Result(Transaction depositTx, List<TransactionOutput> connectedOutputsForAllInputs, List<TransactionOutput> outputs) {
-            this.depositTx = depositTx;
-            this.connectedOutputsForAllInputs = connectedOutputsForAllInputs;
-            this.outputs = outputs;
-        }
-
-        public List<TransactionOutput> getOutputs() {
-            return outputs;
-        }
-
-        public List<TransactionOutput> getConnectedOutputsForAllInputs() {
-            return connectedOutputsForAllInputs;
-        }
-
-        public Transaction getDepositTx() {
-            return depositTx;
-        }
-
-        public byte[] getBuyerSignature() {
-            return buyerSignature;
-        }
-    }
+        return balance;
+    }*/
 }
diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java
index f81cd335b1..3b549e1244 100644
--- a/core/src/main/java/io/bitsquare/btc/WalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/WalletService.java
@@ -17,89 +17,56 @@
 
 package io.bitsquare.btc;
 
-import io.bitsquare.btc.listeners.AddressConfidenceListener;
-import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.btc.listeners.TxConfidenceListener;
-import io.bitsquare.crypto.CryptoService;
-import io.bitsquare.user.Preferences;
-
-import org.bitcoinj.core.AbstractWalletEventListener;
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.AddressFormatException;
-import org.bitcoinj.core.Block;
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.DownloadProgressTracker;
-import org.bitcoinj.core.FilteredBlock;
-import org.bitcoinj.core.GetDataMessage;
-import org.bitcoinj.core.InsufficientMoneyException;
-import org.bitcoinj.core.Message;
-import org.bitcoinj.core.NetworkParameters;
-import org.bitcoinj.core.Peer;
-import org.bitcoinj.core.PeerAddress;
-import org.bitcoinj.core.PeerEventListener;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.TransactionConfidence;
-import org.bitcoinj.core.TransactionInput;
-import org.bitcoinj.core.TransactionOutput;
-import org.bitcoinj.core.Wallet;
-import org.bitcoinj.core.WalletEventListener;
-import org.bitcoinj.kits.WalletAppKit;
-import org.bitcoinj.params.MainNetParams;
-import org.bitcoinj.params.RegTestParams;
-import org.bitcoinj.params.TestNet3Params;
-import org.bitcoinj.script.ScriptBuilder;
-import org.bitcoinj.utils.Threading;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Service;
+import io.bitsquare.btc.listeners.AddressConfidenceListener;
+import io.bitsquare.btc.listeners.BalanceListener;
+import io.bitsquare.btc.listeners.TxConfidenceListener;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.handlers.ExceptionHandler;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.user.Preferences;
+import javafx.beans.property.*;
+import org.bitcoinj.core.*;
+import org.bitcoinj.kits.WalletAppKit;
+import org.bitcoinj.params.MainNetParams;
+import org.bitcoinj.params.RegTestParams;
+import org.bitcoinj.params.TestNet3Params;
+import org.bitcoinj.utils.Threading;
+import org.bitcoinj.wallet.DeterministicSeed;
+import org.jetbrains.annotations.NotNull;
+import org.reactfx.util.FxTimer;
+import org.reactfx.util.Timer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.spongycastle.crypto.params.KeyParameter;
 
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Named;
 import java.io.File;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.time.Duration;
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.beans.property.ReadOnlyIntegerProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import rx.Observable;
-import rx.subjects.BehaviorSubject;
-import rx.subjects.Subject;
-
-import static org.bitcoinj.script.ScriptOpCodes.OP_RETURN;
-
+/**
+ * WalletService handles all non trade specific wallet and bitcoin related services.
+ * It startup the wallet app kit and initialized the wallet.
+ */
 public class WalletService {
     private static final Logger log = LoggerFactory.getLogger(WalletService.class);
 
     public static final String DIR_KEY = "wallet.dir";
     public static final String PREFIX_KEY = "wallet.prefix";
-    private static final long STARTUP_TIMEOUT = 60;
+    private static final long STARTUP_TIMEOUT = 60 * 1000;
 
     private final List<AddressConfidenceListener> addressConfidenceListeners = new CopyOnWriteArrayList<>();
     private final List<TxConfidenceListener> txConfidenceListeners = new CopyOnWriteArrayList<>();
@@ -112,16 +79,15 @@ public class WalletService {
     private final TradeWalletService tradeWalletService;
     private final AddressEntryList addressEntryList;
     private final NetworkParameters params;
-    private final CryptoService cryptoService;
     private final File walletDir;
     private final String walletPrefix;
     private final UserAgent userAgent;
 
     private WalletAppKit walletAppKit;
     private Wallet wallet;
-    private AddressEntry registrationAddressEntry;
-    private AddressEntry arbitratorDepositAddressEntry;
+    private AddressEntry arbitratorAddressEntry;
     private final IntegerProperty numPeers = new SimpleIntegerProperty(0);
+    public final BooleanProperty shutDownDone = new SimpleBooleanProperty();
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -129,14 +95,12 @@ public class WalletService {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public WalletService(RegTestHost regTestHost, CryptoService cryptoService,
-                         TradeWalletService tradeWalletService, AddressEntryList addressEntryList, UserAgent userAgent,
+    public WalletService(RegTestHost regTestHost, TradeWalletService tradeWalletService, AddressEntryList addressEntryList, UserAgent userAgent,
                          @Named(DIR_KEY) File walletDir, @Named(PREFIX_KEY) String walletPrefix, Preferences preferences) {
         this.regTestHost = regTestHost;
         this.tradeWalletService = tradeWalletService;
         this.addressEntryList = addressEntryList;
         this.params = preferences.getBitcoinNetwork().getParameters();
-        this.cryptoService = cryptoService;
         this.walletDir = new File(walletDir, "bitcoin");
         this.walletPrefix = walletPrefix;
         this.userAgent = userAgent;
@@ -147,14 +111,18 @@ public class WalletService {
     // Public Methods
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public Observable<Object> initialize(Executor executor) {
-        Subject<Object, Object> status = BehaviorSubject.create();
-
+    public void initialize(@Nullable DeterministicSeed seed, ResultHandler resultHandler, ExceptionHandler exceptionHandler) {
         // Tell bitcoinj to execute event handlers on the JavaFX UI thread. This keeps things simple and means
         // we cannot forget to switch threads when adding event handlers. Unfortunately, the DownloadListener
         // we give to the app kit is currently an exception and runs on a library thread. It'll get fixed in
         // a future version.
-        Threading.USER_THREAD = executor;
+
+        Threading.USER_THREAD = UserThread.getExecutor();
+
+        Timer timeoutTimer = FxTimer.runLater(
+                Duration.ofMillis(STARTUP_TIMEOUT),
+                () -> exceptionHandler.handleException(new TimeoutException("Wallet did not initialize in " + STARTUP_TIMEOUT / 1000 + " seconds."))
+        );
 
         // If seed is non-null it means we are restoring from backup.
         walletAppKit = new WalletAppKit(params, walletDir, walletPrefix) {
@@ -166,30 +134,70 @@ public class WalletService {
                 if (params != RegTestParams.get())
                     walletAppKit.peerGroup().setMaxConnections(11);
                 walletAppKit.peerGroup().setBloomFilterFalsePositiveRate(0.00001);
-                initWallet();
+                wallet = walletAppKit.wallet();
+                wallet.addEventListener(walletEventListener);
+
+                addressEntryList.onWalletReady(wallet);
+                arbitratorAddressEntry = addressEntryList.getArbitratorAddressEntry();
+
+                walletAppKit.peerGroup().addEventListener(new PeerEventListener() {
+                    @Override
+                    public void onPeersDiscovered(Set<PeerAddress> peerAddresses) {
+                    }
+
+                    @Override
+                    public void onBlocksDownloaded(Peer peer, Block block, FilteredBlock filteredBlock, int blocksLeft) {
+                    }
+
+                    @Override
+                    public void onChainDownloadStarted(Peer peer, int blocksLeft) {
+                    }
+
+                    @Override
+                    public void onPeerConnected(Peer peer, int peerCount) {
+                        numPeers.set(peerCount);
+                    }
+
+                    @Override
+                    public void onPeerDisconnected(Peer peer, int peerCount) {
+                        numPeers.set(peerCount);
+                    }
+
+                    @Override
+                    public Message onPreMessageReceived(Peer peer, Message m) {
+                        return null;
+                    }
+
+                    @Override
+                    public void onTransaction(Peer peer, Transaction t) {
+                    }
+
+                    @Nullable
+                    @Override
+                    public List<Message> getData(Peer peer, GetDataMessage m) {
+                        return null;
+                    }
+                });
 
                 // set after wallet is ready
                 tradeWalletService.setWalletAppKit(walletAppKit);
-
-                status.onCompleted();
+                timeoutTimer.stop();
+                UserThread.execute(resultHandler::handleResult);
             }
         };
         // Now configure and start the appkit. This will take a second or two - we could show a temporary splash screen
         // or progress widget to keep the user engaged whilst we initialise, but we don't.
         if (params == RegTestParams.get()) {
-            log.debug("regTestHost " + regTestHost);
             if (regTestHost == RegTestHost.REG_TEST_SERVER) {
                 try {
                     walletAppKit.setPeerNodes(new PeerAddress(InetAddress.getByName(RegTestHost.SERVER_IP), params.getPort()));
                 } catch (UnknownHostException e) {
                     throw new RuntimeException(e);
                 }
-            }
-            else if (regTestHost == RegTestHost.LOCALHOST) {
+            } else if (regTestHost == RegTestHost.LOCALHOST) {
                 walletAppKit.connectToLocalHost();   // You should run a regtest mode bitcoind locally.}
             }
-        }
-        else if (params == MainNetParams.get()) {
+        } else if (params == MainNetParams.get()) {
             // Checkpoints are block headers that ship inside our app: for a new user, we pick the last header
             // in the checkpoints file and then download the rest from the network. It makes things much faster.
             // Checkpoint files are made using the BuildCheckpoints tool and usually we have to download the
@@ -200,102 +208,46 @@ public class WalletService {
                 e.printStackTrace();
                 log.error(e.toString());
             }
-        }
-        else if (params == TestNet3Params.get()) {
+        } else if (params == TestNet3Params.get()) {
             walletAppKit.setCheckpoints(getClass().getResourceAsStream("/wallet/checkpoints.testnet"));
         }
 
         walletAppKit.setDownloadListener(downloadListener)
                 .setBlockingStartup(false)
-                .setUserAgent(userAgent.getName(), userAgent.getVersion());
-
-        /*
-        // TODO restore from DeterministicSeed
-        if (seed != null)
-            walletAppKit.restoreWalletFromSeed(seed);
-            */
+                .setUserAgent(userAgent.getName(), userAgent.getVersion())
+                .restoreWalletFromSeed(seed);
 
         walletAppKit.addListener(new Service.Listener() {
             @Override
             public void failed(@NotNull Service.State from, @NotNull Throwable failure) {
                 walletAppKit = null;
                 log.error("walletAppKit failed");
-                status.onError(failure);
+                timeoutTimer.stop();
+                UserThread.execute(() -> exceptionHandler.handleException(failure));
             }
         }, Threading.USER_THREAD);
         walletAppKit.startAsync();
-        return status.timeout(STARTUP_TIMEOUT, TimeUnit.SECONDS);
-    }
-
-    private void initWallet() {
-        wallet = walletAppKit.wallet();
-        wallet.addEventListener(walletEventListener);
-
-        addressEntryList.onWalletReady(wallet);
-        registrationAddressEntry = addressEntryList.getRegistrationAddressEntry();
-
-        walletAppKit.peerGroup().addEventListener(new PeerEventListener() {
-            @Override
-            public void onPeersDiscovered(Set<PeerAddress> peerAddresses) {
-            }
-
-            @Override
-            public void onBlocksDownloaded(Peer peer, Block block, FilteredBlock filteredBlock, int blocksLeft) {
-            }
-
-            @Override
-            public void onChainDownloadStarted(Peer peer, int blocksLeft) {
-            }
-
-            @Override
-            public void onPeerConnected(Peer peer, int peerCount) {
-                log.trace("onPeerConnected " + peerCount);
-                Threading.USER_THREAD.execute(() -> numPeers.set(peerCount));
-            }
-
-            @Override
-            public void onPeerDisconnected(Peer peer, int peerCount) {
-                log.trace("onPeerDisconnected " + peerCount);
-                Threading.USER_THREAD.execute(() -> numPeers.set(peerCount));
-            }
-
-            @Override
-            public Message onPreMessageReceived(Peer peer, Message m) {
-                return null;
-            }
-
-            @Override
-            public void onTransaction(Peer peer, Transaction t) {
-            }
-
-            @Nullable
-            @Override
-            public List<Message> getData(Peer peer, GetDataMessage m) {
-                return null;
-            }
-        });
     }
 
     public void shutDown() {
         if (wallet != null)
             wallet.removeEventListener(walletEventListener);
+
         if (walletAppKit != null) {
-            walletAppKit.stopAsync();
             try {
+                walletAppKit.stopAsync();
                 walletAppKit.awaitTerminated(5, TimeUnit.SECONDS);
-            } catch (TimeoutException e) {
-                e.printStackTrace();
-                log.error("walletAppKit.awaitTerminated not terminated after 5 sec. Error message: " + e.getMessage());
+            } catch (Throwable e) {
+                // ignore
             }
+            shutDownDone.set(true);
         }
     }
 
-    public ReadOnlyDoubleProperty downloadPercentageProperty() {
-        return downloadListener.percentageProperty();
-    }
-
-    public Wallet getWallet() {
-        return wallet;
+    public void restoreSeedWords(DeterministicSeed seed, ResultHandler resultHandler, ExceptionHandler exceptionHandler) {
+        walletAppKit.stopAsync();
+        walletAppKit.awaitTerminated();
+        initialize(seed, resultHandler, exceptionHandler);
     }
 
 
@@ -332,40 +284,26 @@ public class WalletService {
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Get AddressInfo objects
+    // AddressInfo 
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public List<AddressEntry> getAddressEntryList() {
         return ImmutableList.copyOf(addressEntryList);
     }
 
-    public AddressEntry getRegistrationAddressEntry() {
-        return registrationAddressEntry;
+    public AddressEntry getArbitratorAddressEntry() {
+        return arbitratorAddressEntry;
     }
 
-    public AddressEntry getArbitratorDepositAddressEntry() {
-        if (arbitratorDepositAddressEntry == null)
-            arbitratorDepositAddressEntry = addressEntryList.getNewAddressEntry(AddressEntry.Context.ARBITRATOR_DEPOSIT, null);
-
-        return arbitratorDepositAddressEntry;
-    }
-
-    public AddressEntry getAddressEntry(String offerId) {
-        log.trace("getAddressEntry called with offerId " + offerId);
+    public AddressEntry getAddressEntryByOfferId(String offerId) {
         Optional<AddressEntry> addressEntry = getAddressEntryList().stream().filter(e -> offerId.equals(e.getOfferId())).findFirst();
-
         if (addressEntry.isPresent())
             return addressEntry.get();
         else
             return addressEntryList.getNewAddressEntry(AddressEntry.Context.TRADE, offerId);
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Create new AddressInfo objects
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private Optional<AddressEntry> getAddressEntryByAddressString(String address) {
+    private Optional<AddressEntry> getAddressEntryByAddress(String address) {
         return getAddressEntryList().stream().filter(e -> address.equals(e.getAddressString())).findFirst();
     }
 
@@ -445,26 +383,22 @@ public class WalletService {
                     transactionConfidence = confidence;
                 }
             }
-
         }
         return transactionConfidence;
     }
 
 
-    @SuppressWarnings("UnusedDeclaration")
-    public boolean isRegistrationFeeConfirmed() {
-        assert getRegistrationAddressEntry() != null;
-        TransactionConfidence transactionConfidence = getConfidenceForAddress(getRegistrationAddressEntry().getAddress());
-        return TransactionConfidence.ConfidenceType.BUILDING.equals(transactionConfidence.getConfidenceType());
-    }
-
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Balance
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    // BalanceType.AVAILABLE
+    public Coin getAvailableBalance() {
+        return wallet != null ? wallet.getBalance(Wallet.BalanceType.AVAILABLE) : Coin.ZERO;
+    }
+
     public Coin getBalanceForAddress(Address address) {
-        return wallet != null ? getBalance(wallet.calculateAllSpendCandidates(true), address) : Coin.ZERO;
+        return wallet != null ? getBalance(wallet.calculateAllSpendCandidates(), address) : Coin.ZERO;
     }
 
     private Coin getBalance(List<TransactionOutput> transactionOutputs, Address address) {
@@ -479,97 +413,27 @@ public class WalletService {
         return balance;
     }
 
-    Coin getWalletBalance() {
-        return wallet.getBalance(Wallet.BalanceType.ESTIMATED);
-    }
-
-    Coin getRegistrationBalance() {
-        return getBalanceForAddress(getRegistrationAddressEntry().getAddress());
-    }
-
-    public Coin getArbitratorDepositBalance() {
-        return getBalanceForAddress(getArbitratorDepositAddressEntry().getAddress());
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public boolean isRegistrationFeeBalanceNonZero() {
-        return getRegistrationBalance().compareTo(Coin.ZERO) > 0;
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public boolean isRegistrationFeeBalanceSufficient() {
-        return getRegistrationBalance().compareTo(FeePolicy.REGISTRATION_FEE) >= 0;
-    }
-
-    //TODO
-    @SuppressWarnings("SameReturnValue")
-    public int getNumOfPeersSeenTx(String txId) {
-        // TODO check from blockchain
-        // will be async
-        return 3;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Transactions
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void payRegistrationFee(String stringifiedFiatAccounts, FutureCallback<Transaction> callback) throws
-            InsufficientMoneyException {
-        log.debug("payRegistrationFee");
-        log.trace("stringifiedFiatAccounts " + stringifiedFiatAccounts);
-
-        Transaction tx = new Transaction(params);
-
-        byte[] data = cryptoService.digestMessageWithSignature(getRegistrationAddressEntry().getKeyPair(), stringifiedFiatAccounts);
-        tx.addOutput(Transaction.MIN_NONDUST_OUTPUT, new ScriptBuilder().op(OP_RETURN).data(data).build());
-
-        // We don't take a fee at the moment
-        // 0.0000454 BTC will get extra to miners as it is lower then durst
-       /* Coin fee = FeePolicy.REGISTRATION_FEE
-                .subtract(Transaction.MIN_NONDUST_OUTPUT)
-                .subtract(FeePolicy.TX_FEE);
-        log.trace("fee: " + fee.toFriendlyString());
-        tx.addOutput(fee, feePolicy.getAddressForRegistrationFee());*/
-
-        Wallet.SendRequest sendRequest = Wallet.SendRequest.forTx(tx);
-        sendRequest.shuffleOutputs = false;
-
-        // We accept at the moment registration fee payment with 0 confirmations.
-        // The verification will be done at the end of the trade process again, and then a double spend would be
-        // detected and lead to arbitration.
-        // The last param (boolean includePending) is used for indicating that we accept 0 conf tx.
-        sendRequest.coinSelector = new AddressBasedCoinSelector(params, getRegistrationAddressEntry(), true);
-        sendRequest.changeAddress = getRegistrationAddressEntry().getAddress();
-        Wallet.SendResult sendResult = wallet.sendCoins(sendRequest);
-        Futures.addCallback(sendResult.broadcastComplete, callback);
-
-        log.debug("Registration transaction: " + tx);
-        printTxWithInputs("payRegistrationFee", tx);
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Withdrawal
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public String sendFunds(String withdrawFromAddress,
-                            String withdrawToAddress,
+    public String sendFunds(String fromAddress,
+                            String toAddress,
                             Coin amount,
-                            FutureCallback<Transaction> callback) throws AddressFormatException, InsufficientMoneyException, IllegalArgumentException {
+                            KeyParameter aesKey,
+                            FutureCallback<Transaction> callback) throws AddressFormatException, IllegalArgumentException, InsufficientMoneyException {
         Transaction tx = new Transaction(params);
-        tx.addOutput(amount.subtract(FeePolicy.TX_FEE), new Address(params, withdrawToAddress));
+        tx.addOutput(amount.subtract(FeePolicy.TX_FEE), new Address(params, toAddress));
 
         Wallet.SendRequest sendRequest = Wallet.SendRequest.forTx(tx);
+        sendRequest.aesKey = aesKey;
         sendRequest.shuffleOutputs = false;
-        // we allow spending of unconfirmed tx (double spend risk is low and usability would suffer if we need to
-        // wait for 1 confirmation)
-
-        Optional<AddressEntry> addressEntry = getAddressEntryByAddressString(withdrawFromAddress);
+        Optional<AddressEntry> addressEntry = getAddressEntryByAddress(fromAddress);
         if (!addressEntry.isPresent())
             throw new IllegalArgumentException("WithdrawFromAddress is not found in our wallets.");
 
-        sendRequest.coinSelector = new AddressBasedCoinSelector(params, addressEntry.get(), true);
+        sendRequest.coinSelector = new AddressBasedCoinSelector(params, addressEntry.get());
         sendRequest.changeAddress = addressEntry.get().getAddress();
         Wallet.SendResult sendResult = wallet.sendCoins(sendRequest);
         Futures.addCallback(sendResult.broadcastComplete, callback);
@@ -580,6 +444,45 @@ public class WalletService {
         return tx.getHashAsString();
     }
 
+    public void emptyWallet(String toAddress, KeyParameter aesKey, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler)
+            throws InsufficientMoneyException, AddressFormatException {
+        Wallet.SendRequest sendRequest = Wallet.SendRequest.emptyWallet(new Address(params, toAddress));
+        sendRequest.aesKey = aesKey;
+        Wallet.SendResult sendResult = wallet.sendCoins(sendRequest);
+        Futures.addCallback(sendResult.broadcastComplete, new FutureCallback<Transaction>() {
+            @Override
+            public void onSuccess(Transaction result) {
+                resultHandler.handleResult();
+            }
+
+            @Override
+            public void onFailure(@NotNull Throwable t) {
+                errorMessageHandler.handleErrorMessage(t.getMessage());
+            }
+        });
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public ReadOnlyDoubleProperty downloadPercentageProperty() {
+        return downloadListener.percentageProperty();
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public Transaction getTransactionFromSerializedTx(byte[] tx) {
+        return new Transaction(params, tx);
+    }
+
+    public ReadOnlyIntegerProperty numPeersProperty() {
+        return numPeers;
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Private methods
@@ -595,13 +498,6 @@ public class WalletService {
         }
     }
 
-    public int getNumPeers() {
-        return numPeers.get();
-    }
-
-    public ReadOnlyIntegerProperty numPeersProperty() {
-        return numPeers;
-    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Inner classes
@@ -613,13 +509,13 @@ public class WalletService {
         @Override
         protected void progress(double percentage, int blocksLeft, Date date) {
             super.progress(percentage, blocksLeft, date);
-            Threading.USER_THREAD.execute(() -> this.percentage.set(percentage / 100d));
+            UserThread.execute(() -> this.percentage.set(percentage / 100d));
         }
 
         @Override
         protected void doneDownload() {
             super.doneDownload();
-            Threading.USER_THREAD.execute(() -> this.percentage.set(1d));
+            UserThread.execute(() -> this.percentage.set(1d));
         }
 
         public ReadOnlyDoubleProperty percentageProperty() {
@@ -661,10 +557,69 @@ public class WalletService {
                 if (balanceListener.getAddress() != null)
                     balance = getBalanceForAddress(balanceListener.getAddress());
                 else
-                    balance = getWalletBalance();
+                    balance = getAvailableBalance();
 
                 balanceListener.onBalanceChanged(balance);
             }
         }
     }
+    
+     /* // TODO
+    private class BloomFilterForForeignTx extends AbstractPeerEventListener implements PeerFilterProvider {
+        private final String txId;
+
+        public BloomFilterForForeignTx(String txId) {
+            this.txId = txId;
+        }
+
+        @Override
+        public long getEarliestKeyCreationTime() {
+            return Utils.currentTimeSeconds();
+        }
+
+        @Override
+        public void beginBloomFilterCalculation() {
+        }
+
+        @Override
+        public int getBloomFilterElementCount() {
+            return 1;
+        }
+
+        @Override
+        public BloomFilter getBloomFilter(int size, double falsePositiveRate, long nTweak) {
+            BloomFilter filter = new BloomFilter(size, falsePositiveRate, nTweak);
+           *//* for (TransactionOutPoint pledge : allPledges.keySet()) {
+                filter.insert(pledge.bitcoinSerialize());
+            }*//*
+            // how to add txid ???
+            return filter;
+        }
+
+        @Override
+        public boolean isRequiringUpdateAllBloomFilter() {
+            return false;
+        }
+
+        @Override
+        public void endBloomFilterCalculation() {
+        }
+
+        @Override
+        public void onTransaction(Peer peer, Transaction t) {
+            // executor.checkOnThread();
+            // TODO: Gate this logic on t being announced by multiple peers.
+            //  checkForRevocation(t);
+            // TODO: Watch out for the confirmation. If no confirmation of the revocation occurs within N hours, alert the user.
+        }
+    }
+
+    // TODO
+    public void findTxInBlockChain(String txId) {
+        // https://groups.google.com/forum/?hl=de#!topic/bitcoinj/kinFP7lLsRE
+        // https://groups.google.com/forum/?hl=de#!topic/bitcoinj/f7m87kCWdb8
+        // https://groups.google.com/forum/?hl=de#!topic/bitcoinj/jNE5ohLExVM
+        walletAppKit.peerGroup().addPeerFilterProvider(new BloomFilterForForeignTx(txId));
+    }*/
+
 }
diff --git a/core/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java b/core/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java
deleted file mode 100644
index b9972f2913..0000000000
--- a/core/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.common.handlers;
-
-/**
- * For reporting error message only (UI)
- */
-public interface ErrorMessageHandler {
-    void handleErrorMessage(String errorMessage);
-}
diff --git a/core/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java b/core/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java
deleted file mode 100644
index c1122c1236..0000000000
--- a/core/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.common.handlers;
-
-/**
- * For reporting throwable objects only
- */
-public interface ExceptionHandler {
-    void handleException(Throwable throwable);
-}
diff --git a/core/src/main/java/io/bitsquare/common/handlers/FaultHandler.java b/core/src/main/java/io/bitsquare/common/handlers/FaultHandler.java
deleted file mode 100644
index 3d2913dfa5..0000000000
--- a/core/src/main/java/io/bitsquare/common/handlers/FaultHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.common.handlers;
-
-/**
- * For reporting a description message and throwable
- */
-public interface FaultHandler {
-    void handleFault(String errorMessage, Throwable throwable);
-}
diff --git a/core/src/main/java/io/bitsquare/common/handlers/ResultHandler.java b/core/src/main/java/io/bitsquare/common/handlers/ResultHandler.java
deleted file mode 100644
index eff8b8e605..0000000000
--- a/core/src/main/java/io/bitsquare/common/handlers/ResultHandler.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.common.handlers;
-
-public interface ResultHandler {
-    void handleResult();
-}
diff --git a/core/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java b/core/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java
deleted file mode 100644
index f3f19af231..0000000000
--- a/core/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.common.taskrunner;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class InterceptTaskException extends RuntimeException {
-    private static final Logger log = LoggerFactory.getLogger(InterceptTaskException.class);
-    private static final long serialVersionUID = 5216202440370333534L;
-
-    public InterceptTaskException(String message) {
-        super(message);
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/common/taskrunner/Model.java b/core/src/main/java/io/bitsquare/common/taskrunner/Model.java
deleted file mode 100644
index 5c10f6a735..0000000000
--- a/core/src/main/java/io/bitsquare/common/taskrunner/Model.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.common.taskrunner;
-
-public interface Model {
-    void persist();
-
-    void onComplete();
-}
diff --git a/core/src/main/java/io/bitsquare/common/taskrunner/Task.java b/core/src/main/java/io/bitsquare/common/taskrunner/Task.java
deleted file mode 100644
index f3750039c8..0000000000
--- a/core/src/main/java/io/bitsquare/common/taskrunner/Task.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.common.taskrunner;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class Task<T extends Model> {
-    private static final Logger log = LoggerFactory.getLogger(Task.class);
-
-    public static Class<? extends Task> taskToIntercept;
-
-    private final TaskRunner taskHandler;
-    protected final T model;
-    protected String errorMessage = "An error occurred at: " + getClass().getSimpleName();
-
-    public Task(TaskRunner taskHandler, T model) {
-        this.taskHandler = taskHandler;
-        this.model = model;
-    }
-
-    abstract protected void run();
-
-    protected void runInterceptHook() {
-        if (getClass() == taskToIntercept)
-            throw new InterceptTaskException("Task intercepted for testing purpose. Task = " + getClass().getSimpleName());
-    }
-
-    protected void appendToErrorMessage(String message) {
-        errorMessage += "\n" + message;
-    }
-
-    protected void appendExceptionToErrorMessage(Throwable t) {
-        if (t.getMessage() != null)
-            errorMessage += "\nException message: " + t.getMessage();
-        else
-            errorMessage += "\nException: " + t.toString();
-    }
-
-    protected void complete() {
-        taskHandler.handleComplete();
-    }
-
-    protected void failed(String message) {
-        appendToErrorMessage(message);
-        failed();
-    }
-
-    protected void failed(Throwable t) {
-        t.printStackTrace();
-        appendExceptionToErrorMessage(t);
-        failed();
-    }
-
-    protected void failed() {
-        taskHandler.handleErrorMessage(errorMessage);
-    }
-
-}
diff --git a/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java b/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
deleted file mode 100644
index 15ddf71826..0000000000
--- a/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.common.taskrunner;
-
-import io.bitsquare.common.handlers.ErrorMessageHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-
-import java.util.Arrays;
-import java.util.Queue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TaskRunner<T extends Model> {
-    private static final Logger log = LoggerFactory.getLogger(TaskRunner.class);
-
-    private final Queue<Class<? extends Task>> tasks = new LinkedBlockingQueue<>();
-    protected final T sharedModel;
-    private final Class<T> sharedModelClass;
-    private final ResultHandler resultHandler;
-    private final ErrorMessageHandler errorMessageHandler;
-    private boolean failed = false;
-    private boolean isCanceled;
-
-    private Class<? extends Task> currentTask;
-
-
-    public TaskRunner(T sharedModel, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        this(sharedModel, (Class<T>) sharedModel.getClass(), resultHandler, errorMessageHandler);
-    }
-
-    public TaskRunner(T sharedModel, Class<T> sharedModelClass, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        this.sharedModel = sharedModel;
-        this.resultHandler = resultHandler;
-        this.errorMessageHandler = errorMessageHandler;
-        this.sharedModelClass = sharedModelClass;
-    }
-
-    public final void addTasks(Class<? extends Task<T>>... items) {
-        tasks.addAll(Arrays.asList(items));
-    }
-
-    public void run() {
-        next();
-    }
-
-    protected void next() {
-        if (!failed && !isCanceled) {
-            if (tasks.size() > 0) {
-                try {
-                    currentTask = tasks.poll();
-                    log.trace("Run task: " + currentTask.getSimpleName());
-                    currentTask.getDeclaredConstructor(TaskRunner.class, sharedModelClass).newInstance(this, sharedModel).run();
-                } catch (Throwable throwable) {
-                    throwable.printStackTrace();
-                    handleErrorMessage("Error at taskRunner: " + throwable.getMessage());
-                }
-            }
-            else {
-                resultHandler.handleResult();
-            }
-        }
-    }
-
-    public void cancel() {
-        isCanceled = true;
-    }
-
-    void handleComplete() {
-        log.trace("Task completed: " + currentTask.getSimpleName());
-        sharedModel.persist();
-        next();
-    }
-
-    void handleErrorMessage(String errorMessage) {
-        log.error("Task failed: " + currentTask.getSimpleName());
-        log.error("errorMessage: " + errorMessage);
-        failed = true;
-        errorMessageHandler.handleErrorMessage(errorMessage);
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/crypto/CryptoService.java b/core/src/main/java/io/bitsquare/crypto/CryptoService.java
deleted file mode 100644
index 953b090d08..0000000000
--- a/core/src/main/java/io/bitsquare/crypto/CryptoService.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * 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.crypto;
-
-import io.bitsquare.p2p.Message;
-
-import org.bitcoinj.core.ECKey;
-import org.bitcoinj.core.Sha256Hash;
-import org.bitcoinj.core.Utils;
-
-import com.google.common.base.Charsets;
-
-import java.io.IOException;
-
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.SignedObject;
-
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.spongycastle.util.encoders.Base64;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.KeyGenerator;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SealedObject;
-import javax.crypto.SecretKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public class CryptoService<T> {
-    private static final Logger log = LoggerFactory.getLogger(CryptoService.class);
-    public static final String DHT_SIGN_KEY_ALGO = "DSA";
-    public static final String MSG_SIGN_KEY_ALGO = "DSA";
-    public static final String MSG_ENCR_KEY_ALGO = "RSA";
-
-    private static final String SYM_ENCR_KEY_ALGO = "AES";
-    private static final String SYM_CIPHER = "AES";
-    private static final String ASYM_CIPHER = "RSA"; //RSA/ECB/PKCS1Padding
-    private static final String MSG_SIGN_ALGO = "SHA1withDSA";
-
-    public static KeyPair generateDhtSignatureKeyPair() throws NoSuchAlgorithmException {
-        long ts = System.currentTimeMillis();
-        final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(DHT_SIGN_KEY_ALGO);
-        keyPairGenerator.initialize(1024);
-        KeyPair keyPair = keyPairGenerator.genKeyPair();
-        log.debug("Generate dhtSignatureKeyPair needed {} ms", System.currentTimeMillis() - ts);
-        return keyPair;
-    }
-
-    public static KeyPair generateMsgSignatureKeyPair() throws NoSuchAlgorithmException {
-        long ts = System.currentTimeMillis();
-        final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(MSG_SIGN_KEY_ALGO);
-        keyPairGenerator.initialize(1024);
-        KeyPair keyPair = keyPairGenerator.genKeyPair();
-        log.debug("Generate dhtSignatureKeyPair needed {} ms", System.currentTimeMillis() - ts);
-        return keyPair;
-    }
-
-    public static KeyPair generateMsgEncryptionKeyPair() throws NoSuchAlgorithmException {
-        long ts = System.currentTimeMillis();
-        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(MSG_ENCR_KEY_ALGO);
-        keyPairGenerator.initialize(2048);
-        KeyPair keyPair = keyPairGenerator.genKeyPair();
-        log.debug("Generate msgEncryptionKeyPair needed {} ms", System.currentTimeMillis() - ts);
-        return keyPair;
-    }
-
-    static {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    private KeyRing keyRing;
-
-    @Inject
-    public CryptoService(KeyRing keyRing) {
-        this.keyRing = keyRing;
-    }
-
-    public SealedAndSignedMessage encryptAndSignMessage(PubKeyRing pubKeyRing, Message message) throws CryptoException {
-        long ts = System.currentTimeMillis();
-
-        try {
-            // Create symmetric key 
-            KeyGenerator keyGenerator = KeyGenerator.getInstance(SYM_ENCR_KEY_ALGO);
-            keyGenerator.init(128);
-            SecretKey secretKey = keyGenerator.generateKey();
-
-            // Encrypt secretKey with peers pubKey using SealedObject
-            Cipher cipherAsym = Cipher.getInstance(ASYM_CIPHER);
-            cipherAsym.init(Cipher.ENCRYPT_MODE, pubKeyRing.getMsgEncryptionPubKey());
-            SealedObject sealedSecretKey = new SealedObject(secretKey, cipherAsym);
-
-            // Sign (hash of) message and pack it into SignedObject
-            SignedObject signedMessage = new SignedObject(message, keyRing.getMsgSignatureKeyPair().getPrivate(), Signature.getInstance(MSG_SIGN_ALGO));
-
-            // // Encrypt signedMessage with secretKey using SealedObject
-            Cipher cipherSym = Cipher.getInstance(SYM_CIPHER);
-            cipherSym.init(Cipher.ENCRYPT_MODE, secretKey);
-            SealedObject sealedMessage = new SealedObject(signedMessage, cipherSym);
-
-            SealedAndSignedMessage sealedAndSignedMessage = new SealedAndSignedMessage(sealedSecretKey,
-                    sealedMessage,
-                    keyRing.getMsgSignatureKeyPair().getPublic()
-            );
-            log.debug("Encryption needed {} ms", System.currentTimeMillis() - ts);
-            return sealedAndSignedMessage;
-        } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException
-                | IllegalBlockSizeException | IOException | SignatureException e) {
-            throw new CryptoException(e);
-
-        }
-    }
-
-    public MessageWithPubKey decryptAndVerifyMessage(SealedAndSignedMessage sealedAndSignedMessage) throws CryptoException {
-        long ts = System.currentTimeMillis();
-        try {
-            SealedObject sealedSecretKey = sealedAndSignedMessage.getSealedSecretKey();
-            SealedObject sealedMessage = sealedAndSignedMessage.getSealedMessage();
-            PublicKey signaturePubKey = sealedAndSignedMessage.getSignaturePubKey();
-
-            // Decrypt secretKey with my privKey
-            Cipher cipherAsym = Cipher.getInstance(ASYM_CIPHER);
-            cipherAsym.init(Cipher.DECRYPT_MODE, keyRing.getMsgEncryptionKeyPair().getPrivate());
-            Object secretKeyObject = sealedSecretKey.getObject(cipherAsym);
-            if (secretKeyObject instanceof SecretKey) {
-                SecretKey secretKey = (SecretKey) secretKeyObject;
-
-                // Decrypt signedMessage with secretKey
-                Cipher cipherSym = Cipher.getInstance(SYM_CIPHER);
-                cipherSym.init(Cipher.DECRYPT_MODE, secretKey);
-                Object signedMessageObject = sealedMessage.getObject(cipherSym);
-                if (signedMessageObject instanceof SignedObject) {
-                    SignedObject signedMessage = (SignedObject) signedMessageObject;
-
-                    // Verify message with peers pubKey
-                    if (signedMessage.verify(signaturePubKey, Signature.getInstance(MSG_SIGN_ALGO))) {
-                        // Get message
-                        Object messageObject = signedMessage.getObject();
-                        if (messageObject instanceof Message) {
-                            log.debug("Decryption needed {} ms", System.currentTimeMillis() - ts);
-                            return new MessageWithPubKey((Message) messageObject, signaturePubKey);
-                        }
-                        else {
-                            throw new CryptoException("messageObject is not instance of Message");
-                        }
-                    }
-                    else {
-                        throw new CryptoException("Signature is not valid");
-                    }
-                }
-                else {
-                    throw new CryptoException("signedMessageObject is not instance of SignedObject");
-                }
-            }
-            else {
-                throw new CryptoException("secretKeyObject is not instance of SecretKey");
-            }
-        } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | BadPaddingException |
-                ClassNotFoundException | IllegalBlockSizeException | IOException | SignatureException e) {
-            throw new CryptoException(e);
-        }
-    }
-
-    public String signMessage(ECKey key, Sha256Hash hash) {
-        ECKey.ECDSASignature sig = key.sign(hash, null);
-        // Now we have to work backwards to figure out the recId needed to recover the signature.
-        int recId = -1;
-        for (int i = 0; i < 4; i++) {
-            ECKey k = ECKey.recoverFromSignature(i, sig, hash, key.isCompressed());
-            if (k != null && k.getPubKeyPoint().equals(key.getPubKeyPoint())) {
-                recId = i;
-                break;
-            }
-        }
-        if (recId == -1)
-            throw new RuntimeException("Could not construct a recoverable key. This should never happen.");
-        int headerByte = recId + 27 + (key.isCompressed() ? 4 : 0);
-        byte[] sigData = new byte[65];  // 1 header + 32 bytes for R + 32 bytes for S
-        sigData[0] = (byte) headerByte;
-        System.arraycopy(Utils.bigIntegerToBytes(sig.r, 32), 0, sigData, 1, 32);
-        System.arraycopy(Utils.bigIntegerToBytes(sig.s, 32), 0, sigData, 33, 32);
-        return new String(Base64.encode(sigData), Charsets.UTF_8);
-    }
-
-
-    public byte[] digestMessageWithSignature(ECKey key, String message) {
-        String signedMessage = signMessage(key, message);
-        return Utils.sha256hash160(message.concat(signedMessage).getBytes(Charsets.UTF_8));
-    }
-
-    public String signMessage(ECKey key, String message) {
-        byte[] data = Utils.formatMessageForSigning(message);
-        Sha256Hash hash = Sha256Hash.hashTwice(data);
-        return signMessage(key, hash);
-    }
-
-    public Sha256Hash hash(String message) {
-        byte[] data = Utils.formatMessageForSigning(message);
-        return Sha256Hash.hashTwice(data);
-    }
-}
-
diff --git a/core/src/main/java/io/bitsquare/crypto/MessageWithPubKey.java b/core/src/main/java/io/bitsquare/crypto/MessageWithPubKey.java
deleted file mode 100644
index 5d18b1b0e4..0000000000
--- a/core/src/main/java/io/bitsquare/crypto/MessageWithPubKey.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.crypto;
-
-import io.bitsquare.p2p.Message;
-
-import java.security.PublicKey;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MessageWithPubKey implements Message {
-    private static final Logger log = LoggerFactory.getLogger(MessageWithPubKey.class);
-
-    public Message getMessage() {
-        return message;
-    }
-
-    public PublicKey getSignaturePubKey() {
-        return signaturePubKey;
-    }
-
-    private final Message message;
-    private final PublicKey signaturePubKey;
-
-
-    public MessageWithPubKey(Message message, PublicKey signaturePubKey) {
-        this.message = message;
-        this.signaturePubKey = signaturePubKey;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/crypto/ScryptUtil.java b/core/src/main/java/io/bitsquare/crypto/ScryptUtil.java
new file mode 100644
index 0000000000..8d45506739
--- /dev/null
+++ b/core/src/main/java/io/bitsquare/crypto/ScryptUtil.java
@@ -0,0 +1,40 @@
+package io.bitsquare.crypto;
+
+import com.google.protobuf.ByteString;
+import io.bitsquare.common.UserThread;
+import org.bitcoinj.crypto.KeyCrypterScrypt;
+import org.bitcoinj.wallet.Protos;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.spongycastle.crypto.params.KeyParameter;
+
+//TODO
+public class ScryptUtil {
+    private static final Logger log = LoggerFactory.getLogger(ScryptUtil.class);
+
+    public ScryptUtil() {
+    }
+
+    public static final Protos.ScryptParameters SCRYPT_PARAMETERS = Protos.ScryptParameters.newBuilder()
+            .setP(6)
+            .setR(8)
+            .setN(32768)
+            .setSalt(ByteString.copyFrom(KeyCrypterScrypt.randomSalt()))
+            .build();
+
+    public interface ScryptKeyDerivationResultHandler {
+        void handleResult(KeyParameter aesKey);
+    }
+
+    public static void deriveKeyWithScrypt(KeyCrypterScrypt keyCrypterScrypt, String password, ScryptKeyDerivationResultHandler resultHandler) {
+        new Thread(() -> {
+            log.info("Doing key derivation");
+
+            long start = System.currentTimeMillis();
+            KeyParameter aesKey = keyCrypterScrypt.deriveKey(password);
+            long duration = System.currentTimeMillis() - start;
+            log.info("Key derivation took {} msec", duration);
+            UserThread.execute(() -> resultHandler.handleResult(aesKey));
+        }).start();
+    }
+}
diff --git a/core/src/main/java/io/bitsquare/crypto/SealedAndSignedMessage.java b/core/src/main/java/io/bitsquare/crypto/SealedAndSignedMessage.java
deleted file mode 100644
index 37e69faf11..0000000000
--- a/core/src/main/java/io/bitsquare/crypto/SealedAndSignedMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.crypto;
-
-import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Message;
-
-import java.io.Serializable;
-
-import java.security.PublicKey;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.crypto.SealedObject;
-
-/**
- * Packs the encrypted symmetric secretKey and the encrypted signed message into one object.
- * SecretKey is encrypted with asymmetric pubKey of peer. Signed message is encrypted with secretKey.
- * Using that hybrid encryption model we are not restricted by data size and performance as symmetric encryption is very fast.
- */
-public class SealedAndSignedMessage implements Serializable, Message {
-    // That object is saved to disc. We need to take care of changes to not break deserialization.
-    private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
-
-    private static final Logger log = LoggerFactory.getLogger(SealedAndSignedMessage.class);
-
-    private final SealedObject sealedSecretKey;
-    private final SealedObject sealedMessage;
-    private final PublicKey signaturePubKey;
-
-    public SealedAndSignedMessage(SealedObject sealedSecretKey, SealedObject sealedMessage, PublicKey signaturePubKey) {
-        this.sealedSecretKey = sealedSecretKey;
-        this.sealedMessage = sealedMessage;
-        this.signaturePubKey = signaturePubKey;
-    }
-
-    public SealedObject getSealedSecretKey() {
-        return sealedSecretKey;
-    }
-
-    public SealedObject getSealedMessage() {
-        return sealedMessage;
-    }
-
-    public PublicKey getSignaturePubKey() {
-        return signaturePubKey;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/crypto/Util.java b/core/src/main/java/io/bitsquare/crypto/Util.java
deleted file mode 100644
index 5a4714e737..0000000000
--- a/core/src/main/java/io/bitsquare/crypto/Util.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.crypto;
-
-import org.bitcoinj.core.Utils;
-
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
-
-import java.util.Base64;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Util {
-    private static final Logger log = LoggerFactory.getLogger(Util.class);
-
-    public static String pubKeyToString(PublicKey publicKey) {
-        final X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(publicKey.getEncoded());
-        return Base64.getEncoder().encodeToString(x509EncodedKeySpec.getEncoded());
-    }
-
-    // TODO just temp for arbitrator
-    public static PublicKey decodeDSAPubKeyHex(String pubKeyHex) throws NoSuchAlgorithmException, InvalidKeySpecException {
-        X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(Utils.HEX.decode(pubKeyHex));
-        KeyFactory keyFactory = KeyFactory.getInstance("DSA");
-        return keyFactory.generatePublic(pubKeySpec);
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/fiat/FiatAccount.java b/core/src/main/java/io/bitsquare/fiat/FiatAccount.java
deleted file mode 100644
index b6a29ad676..0000000000
--- a/core/src/main/java/io/bitsquare/fiat/FiatAccount.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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.fiat;
-
-import io.bitsquare.app.Version;
-import io.bitsquare.locale.Country;
-
-import java.io.Serializable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Objects;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-public class FiatAccount implements Serializable {
-    // That object is sent over the wire, so we need to take care of version compatibility.
-    private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
-
-    public static final long HOUR_IN_BLOCKS = 6;
-    public static final long DAY_IN_BLOCKS = HOUR_IN_BLOCKS * 24;
-    public static final long WEEK_IN_BLOCKS = DAY_IN_BLOCKS * 7;
-
-    public enum Type {
-        IRC("", "", 0),
-        SEPA("IBAN", "BIC", WEEK_IN_BLOCKS),
-        WIRE("primary ID", "secondary ID", WEEK_IN_BLOCKS),
-        INTERNATIONAL("primary ID", "secondary ID", 2 * WEEK_IN_BLOCKS),
-        OK_PAY("primary ID", "secondary ID", HOUR_IN_BLOCKS),
-        NET_TELLER("primary ID", "secondary ID", HOUR_IN_BLOCKS),
-        PERFECT_MONEY("primary ID", "secondary ID", HOUR_IN_BLOCKS);
-
-        public final String primaryId;
-        public final String secondaryId;
-        public final long lockTimeDelta;
-
-        Type(String primaryId, String secondaryId, long lockTimeDelta) {
-            this.primaryId = primaryId;
-            this.secondaryId = secondaryId;
-            this.lockTimeDelta = lockTimeDelta;
-        }
-
-        public static ArrayList<Type> getAllBankAccountTypes() {
-            return new ArrayList<>(Arrays.asList(Type.values()));
-        }
-    }
-
-    public final String id;
-    public final String nameOfBank;
-    public final Type type;
-    public final Country country;     // where bank is registered
-    public final String accountPrimaryID;  // like IBAN
-    public final String accountSecondaryID; // like BIC
-    public final String accountHolderName;
-
-
-    // The main currency if account support multiple currencies.
-    // The user can create multiple bank accounts with same bank account but other currency if his bank account
-    // support that.
-    public final String currencyCode;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public FiatAccount(Type type, String currencyCode, Country country, String nameOfBank,
-                       String accountHolderName, String accountPrimaryID, String accountSecondaryID) {
-        this.type = type;
-        this.currencyCode = currencyCode;
-        this.country = country;
-        this.nameOfBank = nameOfBank;
-        this.accountHolderName = accountHolderName;
-        this.accountPrimaryID = accountPrimaryID;
-        this.accountSecondaryID = accountSecondaryID;
-
-        id = nameOfBank;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(id);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof FiatAccount)) return false;
-        if (obj == this) return true;
-
-        final FiatAccount other = (FiatAccount) obj;
-        return id.equals(other.id);
-    }
-
-    @Override
-    public String toString() {
-        return "FiatAccount{" +
-                "id='" + id + '\'' +
-                ", nameOfBank='" + nameOfBank + '\'' +
-                ", type=" + type +
-                ", country=" + country +
-                ", accountPrimaryID='" + accountPrimaryID + '\'' +
-                ", accountSecondaryID='" + accountSecondaryID + '\'' +
-                ", accountHolderName='" + accountHolderName + '\'' +
-                ", currencyCode='" + currencyCode + '\'' +
-                '}';
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/locale/BSResources.java b/core/src/main/java/io/bitsquare/locale/BSResources.java
index 69fa741d50..1ecfa29a3e 100644
--- a/core/src/main/java/io/bitsquare/locale/BSResources.java
+++ b/core/src/main/java/io/bitsquare/locale/BSResources.java
@@ -17,23 +17,21 @@
 
 package io.bitsquare.locale;
 
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-
 import java.net.URL;
 import java.net.URLConnection;
-
 import java.text.MessageFormat;
-
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class BSResources {
     private static final Logger log = LoggerFactory.getLogger(BSResources.class);
 
@@ -61,7 +59,7 @@ public class BSResources {
 // Adds UTF8 support for property files
 class UTF8Control extends ResourceBundle.Control {
 
-    public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload)
+    public ResourceBundle newBundle(String baseName, @NotNull Locale locale, @NotNull String format, ClassLoader loader, boolean reload)
             throws IllegalAccessException, InstantiationException, IOException {
         // The below is a copy of the default implementation.
         final String bundleName = toBundleName(baseName, locale);
@@ -77,8 +75,7 @@ class UTF8Control extends ResourceBundle.Control {
                     stream = connection.getInputStream();
                 }
             }
-        }
-        else {
+        } else {
             stream = loader.getResourceAsStream(resourceName);
         }
         if (stream != null) {
diff --git a/core/src/main/java/io/bitsquare/locale/Country.java b/core/src/main/java/io/bitsquare/locale/Country.java
index 4ebe87b373..50da1527af 100644
--- a/core/src/main/java/io/bitsquare/locale/Country.java
+++ b/core/src/main/java/io/bitsquare/locale/Country.java
@@ -19,14 +19,13 @@ package io.bitsquare.locale;
 
 import io.bitsquare.app.Version;
 
-import java.io.Serializable;
-
 import javax.annotation.concurrent.Immutable;
+import java.io.Serializable;
 
 @Immutable
 public class Country implements Serializable {
-    // That object is sent over the wire, so we need to take care of version compatibility.
-    private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
+    // That object is saved to disc. We need to take care of changes to not break deserialization.
+    private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
 
     public final String code;
     public final String name;
diff --git a/core/src/main/java/io/bitsquare/locale/CountryUtil.java b/core/src/main/java/io/bitsquare/locale/CountryUtil.java
index 1c48802cca..34ae47ab2a 100644
--- a/core/src/main/java/io/bitsquare/locale/CountryUtil.java
+++ b/core/src/main/java/io/bitsquare/locale/CountryUtil.java
@@ -19,16 +19,12 @@ package io.bitsquare.locale;
 
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
+import io.bitsquare.user.Preferences;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class CountryUtil {
-
     public static List<Region> getAllRegions() {
         final List<Region> allRegions = new ArrayList<>();
 
@@ -59,19 +55,62 @@ public class CountryUtil {
         return allRegions;
     }
 
-    public static List<Country> getAllEuroCountries() {
-        List<Country> allEuroCountries = new ArrayList<>();
-        String[] code = {"BE", "DE", "EE", "FI", "FR", "GR", "IE", "IT", "LV", "LU", "MT", "NL", "PT", "SK", "SI",
-                "ES", "AT", "CY"};
-        for (String aCode : code) {
-            Locale locale = new Locale("", aCode, "");
+    public static List<Country> getAllSepaEuroCountries() {
+        List<Country> list = new ArrayList<>();
+        String[] codes = {"AT", "BE", "CY", "DE", "EE", "FI", "FR", "GR", "IE",
+                "IT", "LV", "LT", "LU", "MC", "MT", "NL", "PT", "SK", "SI", "ES"};
+        for (String code : codes) {
+            Locale locale = new Locale(LanguageUtil.getDefaultLanguage(), code, "");
             String regionCode = getRegionCode(locale.getCountry());
             final Region region = new Region(regionCode, getRegionName(regionCode));
             final Country country = new Country(locale.getCountry(), locale.getDisplayCountry(), region);
-            allEuroCountries.add(country);
+            list.add(country);
         }
+        list.sort((a, b) -> a.code.compareTo(b.code));
 
-        return allEuroCountries;
+        return list;
+    }
+
+    public static boolean containsAllSepaEuroCountries(List<String> countryCodesToCompare) {
+        countryCodesToCompare.sort((a, b) -> a.compareTo(b));
+        List<String> countryCodesBase = getAllSepaEuroCountries().stream().map(c -> c.code).collect(Collectors.toList());
+        return countryCodesToCompare.toString().equals(countryCodesBase.toString());
+        /*
+        List<Country> countriesBase = getAllSepaEuroCountries();
+        List<Country> remainingBase = new ArrayList<>(countriesBase);
+        List<String> remainingToCompare = new ArrayList<>(countryCodesToCompare);
+        for (int i = 0; i < countriesBase.size(); i++) {
+            String countryCodeBase = countriesBase.get(i).code;
+            for (int n = 0; n < countryCodesToCompare.size(); n++) {
+                if (countryCodeBase.equals(countryCodesToCompare.get(n))) {
+                    if (remainingBase.size() > 0) remainingBase.remove(i);
+                    if (remainingToCompare.size() > 0) remainingToCompare.remove(n);
+                }
+            }
+        }
+        return remainingBase.size() == 0 && remainingBase.size() == remainingToCompare.size();*/
+    }
+
+    public static List<Country> getAllSepaNonEuroCountries() {
+        List<Country> list = new ArrayList<>();
+        String[] codes = {"BG", "HR", "CZ", "DK", "GB", "HU", "PL", "RO",
+                "SE", "IS", "NO", "LI", "CH"};
+        for (String code : codes) {
+            Locale locale = new Locale(LanguageUtil.getDefaultLanguage(), code, "");
+            String regionCode = getRegionCode(locale.getCountry());
+            final Region region = new Region(regionCode, getRegionName(regionCode));
+            final Country country = new Country(locale.getCountry(), locale.getDisplayCountry(), region);
+            list.add(country);
+        }
+        list.sort((a, b) -> a.code.compareTo(b.code));
+        return list;
+    }
+
+    public static List<Country> getAllSepaCountries() {
+        List<Country> list = new ArrayList<>();
+        list.addAll(getAllSepaEuroCountries());
+        list.addAll(getAllSepaNonEuroCountries());
+        return list;
     }
 
     public static List<Country> getAllCountriesFor(Region selectedRegion) {
@@ -80,7 +119,7 @@ public class CountryUtil {
     }
 
     public static Country getDefaultCountry() {
-        final Locale locale = new Locale("", Locale.getDefault().getCountry());
+        final Locale locale = new Locale(LanguageUtil.getDefaultLanguage(), getDefaultCountryCode());
         String regionCode = getRegionCode(locale.getCountry());
         final Region region = new Region(regionCode, getRegionName(regionCode));
         return new Country(locale.getCountry(), locale.getDisplayCountry(), region);
@@ -98,6 +137,22 @@ public class CountryUtil {
         return allCountries;
     }
 
+    public static String getNameByCode(String countryCode) {
+        return new Locale(LanguageUtil.getDefaultLanguage(), countryCode).getDisplayCountry();
+    }
+
+    public static List<String> getNamesByCodes(List<String> countryCodes) {
+        return countryCodes.stream().map(c -> getNameByCode(c)).collect(Collectors.toList());
+    }
+
+    public static String getCodesString(List<String> countryCodes) {
+        return countryCodes.stream().collect(Collectors.joining(", "));
+    }
+
+    public static String getNamesByCodesString(List<String> countryCodes) {
+        return getNamesByCodes(countryCodes).stream().collect(Collectors.joining(", "));
+    }
+
     private static final String[] countryCodes = new String[]{"AE", "AL", "AR", "AT", "AU", "BA", "BE", "BG", "BH",
             "BO", "BR", "BY", "CA", "CH", "CL", "CN", "CO", "CR", "CS", "CU", "CY", "CZ", "DE", "DK", "DO", "DZ",
             "EC", "EE", "EG", "ES", "FI", "FR", "GB", "GR", "GT", "HK", "HN", "HR", "HU", "ID", "IE", "IL", "IN",
@@ -133,7 +188,7 @@ public class CountryUtil {
     private static List<Locale> getAllCountryLocales() {
         List<Locale> allLocales = Arrays.asList(Locale.getAvailableLocales());
         Set<Locale> allLocalesAsSet = allLocales.stream().filter(locale -> !"".equals(locale.getCountry()))
-                .map(locale -> new Locale("", locale.getCountry(), ""))
+                .map(locale -> new Locale(LanguageUtil.getDefaultLanguage(), locale.getCountry(), ""))
                 .collect(Collectors.toSet());
 
         allLocales = new ArrayList<>();
@@ -145,10 +200,14 @@ public class CountryUtil {
     private static String getRegionCode(String countryCode) {
         if (!countryCode.isEmpty() && countryCodeList.contains(countryCode)) {
             return regionCodeList.get(countryCodeList.indexOf(countryCode));
-        }
-        else {
+        } else {
             return "Undefined";
         }
     }
 
+
+    public static String getDefaultCountryCode() {
+        // might be set later in pref or config, so not use Preferences.getDefaultLocale() anywhere in the code
+        return Preferences.getDefaultLocale().getCountry();
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
index 537cfc1787..ca45cdd8a1 100644
--- a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
+++ b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
@@ -17,59 +17,196 @@
 
 package io.bitsquare.locale;
 
-import java.util.ArrayList;
-import java.util.Currency;
-import java.util.List;
-import java.util.Set;
+import io.bitsquare.user.Preferences;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class CurrencyUtil {
+    transient private static final Logger log = LoggerFactory.getLogger(CurrencyUtil.class);
 
-    public static List<String> getAllCurrencyCodes() {
-        return getAllCurrencies().stream().map(Currency::getCurrencyCode).collect(Collectors.toList());
+    private static List<TradeCurrency> allSortedCurrencies = createAllSortedCurrenciesList();
+
+    public static List<TradeCurrency> getAllSortedCurrencies() {
+        return allSortedCurrencies;
     }
 
-    public static String getDefaultCurrencyAsCode() {
-        return getDefaultCurrency().getCurrencyCode();
+    // We add all currencies supported by payment methods
+    private static List<TradeCurrency> createAllSortedCurrenciesList() {
+        Set<TradeCurrency> set = new HashSet<>();
+
+        // Sepa: EUR at first place
+        set.addAll(getSortedSepaCurrencyCodes());
+
+        // PerfectMoney: 
+        set.add(new TradeCurrency("USD"));
+
+        // Alipay: 
+        set.add(new TradeCurrency("CNY"));
+
+        // OKPay: We want to maintain the order so we don't use a Set but add items if nto already in list
+        getAllOKPayCurrencies().stream().forEach(e -> set.add(e));
+
+        // Swish: it is already added by Sepa
+
+        // for printing out all codes
+         /* String res;
+        result.stream().forEach(e -> {
+            res += "list.add(new FiatCurrency(\""+e.code+"\"));\n";
+        });
+        log.debug(res);*/
+
+
+        List<TradeCurrency> list = getAllManuallySortedFiatCurrencies();
+
+        // check if the list derived form the payment methods is containing exactly the same as our manually sorted one
+
+        List<String> list1 = set.stream().map(e -> e.code).collect(Collectors.toList());
+        list1.sort((a, b) -> a.compareTo(b));
+        List<String> list2 = list.stream().map(e -> e.code).collect(Collectors.toList());
+        list2.sort((a, b) -> a.compareTo(b));
+
+        if (list1.size() != list2.size()) {
+            log.error("manually defined currencies are not matching currencies derived form our payment methods");
+            log.error("list1 " + list1.toString());
+            log.error("list2 " + list2.toString());
+        }
+
+        if (!list1.toString().equals(list2.toString())) {
+            log.error("List derived form the payment methods is not matching exactly the same as our manually sorted one");
+            log.error("list1 " + list1.toString());
+            log.error("list2 " + list2.toString());
+        }
+
+        // Blockchain
+        getSortedCryptoCurrencies().stream().forEach(e -> list.add(e));
+
+        return list;
     }
 
-    public static String getDisplayName(String currencyCode) {
-        return Currency.getInstance(currencyCode).getDisplayName();
+    private static List<TradeCurrency> getAllManuallySortedFiatCurrencies() {
+        List<TradeCurrency> list = new ArrayList<>();
+        list.add(new FiatCurrency("EUR"));
+        list.add(new FiatCurrency("USD"));
+        list.add(new FiatCurrency("GBP"));
+        list.add(new FiatCurrency("CNY"));
+        list.add(new FiatCurrency("HKD"));
+        list.add(new FiatCurrency("CHF"));
+        list.add(new FiatCurrency("JPY"));
+        list.add(new FiatCurrency("CAD"));
+        list.add(new FiatCurrency("AUD"));
+        list.add(new FiatCurrency("NZD"));
+        list.add(new FiatCurrency("ZAR"));
+        list.add(new FiatCurrency("RUB"));
+
+        list.add(new FiatCurrency("SEK"));
+        list.add(new FiatCurrency("NOK"));
+        list.add(new FiatCurrency("DKK"));
+        list.add(new FiatCurrency("ISK"));
+
+        list.add(new FiatCurrency("PLN"));
+        list.add(new FiatCurrency("CZK"));
+        list.add(new FiatCurrency("TRY"));
+
+        list.add(new FiatCurrency("BGN"));
+        list.add(new FiatCurrency("HRK"));
+        list.add(new FiatCurrency("HUF"));
+        list.add(new FiatCurrency("RON"));
+
+        return list;
     }
 
-    private static List<Currency> getAllCurrencies() {
-        final ArrayList<Currency> mainCurrencies = new ArrayList<>();
-        mainCurrencies.add(Currency.getInstance("EUR"));
-        mainCurrencies.add(Currency.getInstance("USD"));
-        mainCurrencies.add(Currency.getInstance("CNY"));
-        mainCurrencies.add(Currency.getInstance("RUB"));
-        mainCurrencies.add(Currency.getInstance("JPY"));
-        mainCurrencies.add(Currency.getInstance("GBP"));
-        mainCurrencies.add(Currency.getInstance("CAD"));
-        mainCurrencies.add(Currency.getInstance("AUD"));
-        mainCurrencies.add(Currency.getInstance("CHF"));
-        mainCurrencies.add(Currency.getInstance("CNY"));
-
-        Set<Currency> allCurrenciesSet = Currency.getAvailableCurrencies();
-
-        allCurrenciesSet.removeAll(mainCurrencies);
-        final List<Currency> allCurrenciesList = new ArrayList<>(allCurrenciesSet);
-        allCurrenciesList.sort((a, b) -> a.getCurrencyCode().compareTo(b.getCurrencyCode()));
-
-        final List<Currency> resultList = new ArrayList<>(mainCurrencies);
-        resultList.addAll(allCurrenciesList);
-
-        resultList.remove(getDefaultCurrency());
-        resultList.add(0, getDefaultCurrency());
-
-        return resultList;
+    /**
+     * @return Sorted list of sepa currencies with EUR as first item
+     */
+    public static Set<TradeCurrency> getSortedSepaCurrencyCodes() {
+        return CountryUtil.getAllSepaCountries().stream()
+                .map(country -> getCurrencyByCountryCode(country.code))
+                .collect(Collectors.toSet());
     }
 
-    private static Currency getDefaultCurrency() {
-        // TODO Only display EUR for the moment
-        return Currency.getInstance("EUR");
-        // return Currency.getInstance(Locale.getDefault());
+    // At OKPay you can exchange internally those currencies
+    public static List<TradeCurrency> getAllOKPayCurrencies() {
+        return new ArrayList<>(Arrays.asList(
+                new FiatCurrency("EUR"),
+                new FiatCurrency("USD"),
+                new FiatCurrency("GBP"),
+                new FiatCurrency("CHF"),
+                new FiatCurrency("RUB"),
+                new FiatCurrency("PLN"),
+                new FiatCurrency("JPY"),
+                new FiatCurrency("CAD"),
+                new FiatCurrency("AUD"),
+                new FiatCurrency("CZK"),
+                new FiatCurrency("NOK"),
+                new FiatCurrency("SEK"),
+                new FiatCurrency("DKK"),
+                new FiatCurrency("HRK"),
+                new FiatCurrency("HUF"),
+                new FiatCurrency("NZD"),
+                new FiatCurrency("RON"),
+                new FiatCurrency("TRY"),
+                new FiatCurrency("ZAR"),
+                new FiatCurrency("HKD"),
+                new FiatCurrency("CNY")
+        ));
     }
 
+    public static List<TradeCurrency> getSortedCryptoCurrencies() {
+        final List<TradeCurrency> result = new ArrayList<>();
+        result.add(new CryptoCurrency("ETH", "Ethereum"));
+        result.add(new CryptoCurrency("LTC", "Litecoin"));
+        result.add(new CryptoCurrency("NMC", "Namecoin"));
+        // Unfortunately we cannot support CryptoNote coins yet as there is no way to proof the transaction. Payment ID helps only locate the tx but the 
+        // arbitrator cannot see if the receiving key matches the receivers address. They might add support for exposing the tx key, but that is not 
+        // implemented yet. To use the view key (also not available in GUI wallets) would reveal the complete wallet history for incoming payments, which is
+        // not acceptable from pricavy point of view.
+        // result.add(new CryptoCurrency("XMR", "Monero")); 
+        // result.add(new CryptoCurrency("BCN", "Bytecoin"));
+        result.add(new CryptoCurrency("DASH", "Dash"));
+        result.add(new CryptoCurrency("ANC", "Anoncoin"));
+        result.add(new CryptoCurrency("NBT", "NuBits"));
+        result.add(new CryptoCurrency("NSR", "NuShares"));
+        result.add(new CryptoCurrency("FAIR", "FairCoin"));
+        result.add(new CryptoCurrency("PPC", "Peercoin"));
+        result.add(new CryptoCurrency("XPM", "Primecoin"));
+        result.add(new CryptoCurrency("DOGE", "Dogecoin"));
+        result.add(new CryptoCurrency("NXT", "Nxt"));
+        result.add(new CryptoCurrency("BTS", "BitShares"));
+        result.add(new CryptoCurrency("XCP", "Counterparty"));
+        result.add(new CryptoCurrency("XRP", "Ripple"));
+        result.add(new CryptoCurrency("STR", "Stellar"));
+
+        return result;
+    }
+
+    public static boolean isCryptoNoteCoin(String currencyCode) {
+        return currencyCode.equals("XMR") || currencyCode.equals("BCN");
+    }
+
+    public static FiatCurrency getCurrencyByCountryCode(String countryCode) {
+        // java 1.8.8_0_20 reports wrong currency (Lita instead of EUR)
+        if (!countryCode.equals("LT"))
+            return new FiatCurrency(Currency.getInstance(new Locale(LanguageUtil.getDefaultLanguage(), countryCode)).getCurrencyCode());
+        else {
+            return new FiatCurrency("EUR");
+        }
+    }
+
+
+    public static String getNameByCode(String currencyCode) {
+        try {
+            return Currency.getInstance(currencyCode).getDisplayName(Preferences.getDefaultLocale());
+        } catch (Throwable t) {
+            // Seems that it is a crypto currency
+            return getSortedCryptoCurrencies().stream().filter(e -> e.getCode().equals(currencyCode)).findFirst().get().getCodeAndName();
+        }
+    }
+
+    public static FiatCurrency getDefaultFiatCurrency() {
+        return new FiatCurrency(getCurrencyByCountryCode(CountryUtil.getDefaultCountryCode()).getCurrency());
+    }
 
 }
diff --git a/core/src/main/java/io/bitsquare/locale/LanguageUtil.java b/core/src/main/java/io/bitsquare/locale/LanguageUtil.java
index 925f46b726..8f74d42717 100644
--- a/core/src/main/java/io/bitsquare/locale/LanguageUtil.java
+++ b/core/src/main/java/io/bitsquare/locale/LanguageUtil.java
@@ -17,38 +17,42 @@
 
 package io.bitsquare.locale;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
+import io.bitsquare.user.Preferences;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class LanguageUtil {
+    private static final Logger log = LoggerFactory.getLogger(LanguageUtil.class);
 
-    public static List<String> getAllLanguageLocaleCodes() {
+    public static List<String> getAllLanguageCodes() {
         List<Locale> allLocales = Arrays.asList(Locale.getAvailableLocales());
-        final Set<String> allLocaleCodesAsSet =
-                allLocales.stream().filter(locale -> !"".equals(locale.getLanguage())).map(locale ->
-                        new Locale(locale.getLanguage(), "").getISO3Language()).collect(Collectors.toSet());
+        final Set<String> allLocaleCodesAsSet = allLocales.stream()
+                .filter(locale -> !"".equals(locale.getLanguage()) && !"".equals(locale.getDisplayLanguage()))
+                .map(locale -> new Locale(locale.getLanguage(), "").getLanguage())
+                .collect(Collectors.toSet());
         List<String> allLocaleCodes = new ArrayList<>();
         allLocaleCodes.addAll(allLocaleCodesAsSet);
-        allLocaleCodes.sort(String::compareTo);
+        allLocaleCodes.sort((o1, o2) -> getDisplayName(o1).compareTo(getDisplayName(o2)));
         return allLocaleCodes;
     }
 
+    public static String getDefaultLanguage() {
+        // might be set later in pref or config, so not use Preferences.getDefaultLocale() anywhere in the code
+        return Preferences.getDefaultLocale().getLanguage();
+    }
+
     public static String getDefaultLanguageLocaleAsCode() {
-        if (Locale.getDefault() != null)
-            return new Locale(Locale.getDefault().getLanguage(), "").getISO3Language();
-        else
-            return getEnglishLanguageLocaleCode();
+        return new Locale(LanguageUtil.getDefaultLanguage(), "").getLanguage();
     }
 
     public static String getEnglishLanguageLocaleCode() {
-        return new Locale(Locale.ENGLISH.getLanguage(), "").getISO3Language();
+        return new Locale(Locale.ENGLISH.getLanguage(), "").getLanguage();
     }
 
     public static String getDisplayName(String code) {
-        return new Locale(code).getDisplayName();
+        return new Locale(code.toUpperCase()).getDisplayName(Preferences.getDefaultLocale());
     }
 }
diff --git a/core/src/main/java/io/bitsquare/locale/Region.java b/core/src/main/java/io/bitsquare/locale/Region.java
index da14557448..cfcad71028 100644
--- a/core/src/main/java/io/bitsquare/locale/Region.java
+++ b/core/src/main/java/io/bitsquare/locale/Region.java
@@ -19,17 +19,16 @@ package io.bitsquare.locale;
 
 import io.bitsquare.app.Version;
 
-import java.io.Serializable;
-
 import javax.annotation.concurrent.Immutable;
+import java.io.Serializable;
 
 @Immutable
 public class Region implements Serializable {
-    // That object is sent over the wire, so we need to take care of version compatibility.
-    private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
+    // That object is saved to disc. We need to take care of changes to not break deserialization.
+    private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
 
-    public final String code;
-    public final String name;
+    private final String code;
+    private final String name;
 
     public Region(String code, String name) {
         this.code = code;
diff --git a/core/src/main/java/io/bitsquare/p2p/AddressService.java b/core/src/main/java/io/bitsquare/p2p/AddressService.java
deleted file mode 100644
index 4ad6ebe6bf..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/AddressService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.p2p;
-
-
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.p2p.listener.GetPeerAddressListener;
-
-public interface AddressService extends DHTService {
-    void findPeerAddress(PubKeyRing pubKeyRing, GetPeerAddressListener getPeerAddressListener);
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/BaseP2PService.java b/core/src/main/java/io/bitsquare/p2p/BaseP2PService.java
deleted file mode 100644
index fbfb224e33..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/BaseP2PService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.p2p;
-
-import java.util.concurrent.Executor;
-
-import net.tomp2p.dht.PeerDHT;
-
-public class BaseP2PService implements P2PService {
-
-    private static Executor userThread;
-
-    public static void setUserThread(Executor userThread) {
-        BaseP2PService.userThread = userThread;
-    }
-
-    public static Executor getUserThread() {
-        return userThread;
-    }
-
-    protected Executor executor;
-    protected PeerDHT peerDHT;
-    private int openRequests = 0;
-
-    @Override
-    public void bootstrapCompleted() {
-        this.executor = BaseP2PService.userThread;
-    }
-
-    @Override
-    public void setExecutor(Executor executor) {
-        this.executor = executor;
-    }
-
-
-    protected void openRequestsUp() {
-        executor.execute(() -> openRequests++);
-    }
-
-    protected void openRequestsDown() {
-        executor.execute(() -> openRequests--);
-    }
-
-    @Override
-    public void shutDown() {
-        long ts = System.currentTimeMillis();
-        // wait max. 10 sec. for open calls to complete
-        while (openRequests > 0 && (System.currentTimeMillis() - ts) < 10000) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java
deleted file mode 100644
index 7d2104fe55..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.p2p;
-
-import io.bitsquare.BitsquareException;
-
-import com.google.inject.name.Named;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.PeerAddress;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class BootstrapNodes {
-    private static final Logger log = LoggerFactory.getLogger(BootstrapNodes.class);
-    public static final String BOOTSTRAP_NODE_KEY = "bootstrapNode";
-
-    private final List<Node> rawBootstrapNodes = Arrays.asList(
-            Node.rawNodeAt("digitalocean1.bitsquare.io", "188.226.179.109"),
-            Node.rawNodeAt("aws1.bitsquare.io", "52.24.144.42"),
-            Node.rawNodeAt("aws2.bitsquare.io", "52.11.125.194")
-    );
-    private Node rawLocalhostNode = Node.rawNodeAt("localhost", "127.0.0.1");
-
-
-    private Node preferredBootstrapNode;
-    private List<Node> bootstrapNodes;
-    private Node localhostNode;
-    private int p2pId;
-    private boolean inited;
-
-    @Inject
-    public BootstrapNodes(@Named(BOOTSTRAP_NODE_KEY) Node preferredBootstrapNode) {
-        // preferredBootstrapNode need to be fully defined to get accepted (name, IP, p2pId, port)
-        if (preferredBootstrapNode.getName() != null
-                && preferredBootstrapNode.getIp() != null
-                && preferredBootstrapNode.getP2pId() != -1
-                && preferredBootstrapNode.getPort() != -1) {
-            this.preferredBootstrapNode = preferredBootstrapNode;
-        }
-        else if (preferredBootstrapNode.getName() != null
-                || preferredBootstrapNode.getIp() != null
-                || preferredBootstrapNode.getP2pId() != -1
-                || preferredBootstrapNode.getPort() != -1) {
-            log.debug("preferredBootstrapNode not fully defined (name, IP, p2pId, port). preferredBootstrapNode=" + preferredBootstrapNode);
-        }
-    }
-
-    public BootstrapNodes() {
-    }
-
-    public void initWithNetworkId(int p2pId) {
-        if (!inited) {
-            inited = true;
-            this.p2pId = p2pId;
-            if (preferredBootstrapNode != null) {
-                bootstrapNodes = Arrays.asList(preferredBootstrapNode);
-            }
-            else {
-                switch (p2pId) {
-                    case Node.MAIN_NET_P2P_ID:
-                        bootstrapNodes = rawBootstrapNodes.stream()
-                                .map(e -> e.withP2pIdAndPort(Node.MAIN_NET_P2P_ID, Node.MAIN_NET_PORT)).collect(Collectors.toList());
-                        localhostNode = rawLocalhostNode.withP2pIdAndPort(Node.MAIN_NET_P2P_ID, Node.MAIN_NET_PORT);
-                        break;
-                    case Node.TEST_NET_P2P_ID:
-                        bootstrapNodes = rawBootstrapNodes.stream()
-                                .map(e -> e.withP2pIdAndPort(Node.TEST_NET_P2P_ID, Node.TEST_NET_PORT)).collect(Collectors.toList());
-                        localhostNode = rawLocalhostNode.withP2pIdAndPort(Node.TEST_NET_P2P_ID, Node.TEST_NET_PORT);
-                        break;
-                    case Node.REG_TEST_P2P_ID:
-                        bootstrapNodes = rawBootstrapNodes.stream()
-                                .map(e -> e.withP2pIdAndPort(Node.REG_TEST_P2P_ID, Node.REG_TEST_PORT)).collect(Collectors.toList());
-                        localhostNode = rawLocalhostNode.withP2pIdAndPort(Node.REG_TEST_P2P_ID, Node.REG_TEST_PORT);
-                        break;
-                    default:
-                        throw new BitsquareException("Unsupported P2pId. p2pId=" + p2pId);
-                }
-            }
-        }
-        else {
-            throw new BitsquareException("initWithNetworkId called twice");
-        }
-    }
-
-    public Node getRandomDiscoverNode() {
-        return bootstrapNodes.get(new Random().nextInt(bootstrapNodes.size()));
-    }
-
-    public List<Node> getBootstrapNodes() {
-        return bootstrapNodes;
-    }
-
-    public List<PeerAddress> getBootstrapPeerAddresses() {
-        return bootstrapNodes.stream().map(e -> {
-            try {
-                return new PeerAddress(Number160.createHash(e.getName()), InetAddress.getByName(e.getIp()), e.getPort(), e.getPort());
-            } catch (UnknownHostException e1) {
-                e1.printStackTrace();
-                log.error(e1.getMessage());
-                return null;
-            }
-        }).collect(Collectors.toList());
-    }
-
-    public Node getLocalhostNode() {
-        return localhostNode;
-    }
-
-    public int getP2pId() {
-        return p2pId;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/ClientNode.java b/core/src/main/java/io/bitsquare/p2p/ClientNode.java
deleted file mode 100644
index f4314b576d..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/ClientNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.p2p;
-
-import io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder;
-
-import java.security.KeyPair;
-
-import java.util.concurrent.Executor;
-
-import javafx.beans.property.ReadOnlyIntegerProperty;
-
-import rx.Observable;
-
-public interface ClientNode {
-    BootstrappedPeerBuilder.ConnectionType getConnectionType();
-
-    String getClientNodeInfo();
-
-    Observable<BootstrappedPeerBuilder.State> bootstrap(KeyPair keyPair);
-
-    ReadOnlyIntegerProperty numPeersProperty();
-
-    void setExecutor(Executor executor);
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/DHTService.java b/core/src/main/java/io/bitsquare/p2p/DHTService.java
deleted file mode 100644
index a95407abed..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/DHTService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.p2p;
-
-import java.security.PublicKey;
-
-import net.tomp2p.dht.FutureGet;
-import net.tomp2p.dht.FuturePut;
-import net.tomp2p.dht.FutureRemove;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.storage.Data;
-
-public interface DHTService extends P2PService {
-
-    FuturePut putData(Number160 locationKey, Data data);
-
-    FutureGet getData(Number160 locationKey);
-
-    FuturePut putDataToMyProtectedDomain(Number160 locationKey, Data data);
-
-    FutureRemove removeDataFromMyProtectedDomain(Number160 locationKey);
-
-    FutureGet getDataOfProtectedDomain(Number160 locationKey, PublicKey publicKey);
-
-    FuturePut addProtectedDataToMap(Number160 locationKey, Data data);
-
-    FutureRemove removeProtectedDataFromMap(Number160 locationKey, Data data);
-
-    FutureGet getMap(Number160 locationKey);
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/DecryptedMessageHandler.java b/core/src/main/java/io/bitsquare/p2p/DecryptedMessageHandler.java
deleted file mode 100644
index 43c83de302..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/DecryptedMessageHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.p2p;
-
-import io.bitsquare.crypto.MessageWithPubKey;
-
-public interface DecryptedMessageHandler {
-    void handleMessage(MessageWithPubKey message, Peer sender);
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/MailboxMessage.java b/core/src/main/java/io/bitsquare/p2p/MailboxMessage.java
deleted file mode 100644
index 0037ec7175..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/MailboxMessage.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.p2p;
-
-import java.io.Serializable;
-
-public interface MailboxMessage extends Message, Serializable {
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/MailboxMessagesResultHandler.java b/core/src/main/java/io/bitsquare/p2p/MailboxMessagesResultHandler.java
deleted file mode 100644
index ab0bd8ffbf..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/MailboxMessagesResultHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.p2p;
-
-import io.bitsquare.crypto.SealedAndSignedMessage;
-
-import java.util.List;
-
-public interface MailboxMessagesResultHandler {
-    void handleResult(List<SealedAndSignedMessage> encryptedMessages);
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/MailboxService.java b/core/src/main/java/io/bitsquare/p2p/MailboxService.java
deleted file mode 100644
index ba98f056a1..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/MailboxService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.p2p;
-
-import io.bitsquare.common.handlers.FaultHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.crypto.SealedAndSignedMessage;
-
-public interface MailboxService {
-    void addMessage(PubKeyRing pubKeyRing, SealedAndSignedMessage message, ResultHandler resultHandler, FaultHandler faultHandler);
-
-    void getAllMessages(MailboxMessagesResultHandler resultHandler);
-
-    void removeAllMessages(ResultHandler resultHandler, FaultHandler faultHandler);
-
-    void shutDown();
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/Message.java b/core/src/main/java/io/bitsquare/p2p/Message.java
deleted file mode 100644
index 50e20d7cc8..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/Message.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.p2p;
-
-import java.io.Serializable;
-
-public interface Message extends Serializable {
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/MessageHandler.java b/core/src/main/java/io/bitsquare/p2p/MessageHandler.java
deleted file mode 100644
index 834d439ac3..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/MessageHandler.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.p2p;
-
-public interface MessageHandler {
-    void handleMessage(Message message, Peer sender);
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/MessageService.java b/core/src/main/java/io/bitsquare/p2p/MessageService.java
deleted file mode 100644
index 0ebaeb65aa..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/MessageService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.p2p;
-
-
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.p2p.listener.SendMessageListener;
-
-public interface MessageService extends P2PService {
-
-    void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, boolean useMailboxIfUnreachable, SendMessageListener listener);
-
-    void addMessageHandler(MessageHandler listener);
-
-    void removeMessageHandler(MessageHandler listener);
-
-    void addDecryptedMessageHandler(DecryptedMessageHandler listener);
-
-    void removeDecryptedMessageHandler(DecryptedMessageHandler listener);
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/p2p/NetworkException.java b/core/src/main/java/io/bitsquare/p2p/NetworkException.java
deleted file mode 100644
index 7060e8a31b..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/NetworkException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.p2p;
-
-import java.io.IOException;
-
-@SuppressWarnings("serializable")
-public class NetworkException extends IOException {
-
-    private static final long serialVersionUID = 3635593267998809977L;
-
-    public NetworkException(Throwable cause) {
-        super(cause);
-    }
-
-    public NetworkException(String message) {
-        super(message);
-    }
-
-    public NetworkException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
-
diff --git a/core/src/main/java/io/bitsquare/p2p/Node.java b/core/src/main/java/io/bitsquare/p2p/Node.java
deleted file mode 100644
index 19d76c5ae5..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/Node.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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.p2p;
-
-import com.google.common.base.Objects;
-
-import java.io.IOException;
-
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.UnknownHostException;
-
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.PeerAddress;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class Node {
-    private static final Logger log = LoggerFactory.getLogger(Node.class);
-
-    public static final String NAME_KEY = "node.name";
-    public static final String PORT_KEY = "node.port";
-    public static final String P2P_ID_KEY = "node.p2pId";
-
-    //public static int DEFAULT_PORT = findFreeSystemPort();
-
-    // P2P network ids
-    public static final int MAIN_NET_P2P_ID = 10;
-    public static final int TEST_NET_P2P_ID = 11;
-    public static final int REG_TEST_P2P_ID = 12;
-
-    // ports
-    public static final int MAIN_NET_PORT = 7370;
-    public static final int TEST_NET_PORT = 7371;
-    public static final int REG_TEST_PORT = 7372;
-
-
-    private final String name;
-    private final String ip;
-    private final int port;
-    private final int p2pId;
-
-    private Node(String name, String ip, int p2pId, int port) {
-        this.name = name;
-        this.ip = ip;
-        this.p2pId = p2pId;
-        this.port = port;
-    }
-
-    // Not fully defined node
-    public static Node rawNodeAt(String name, String ip) {
-        return Node.at(name, ip, -1, -1);
-    }
-
-    public static Node at(String name, String ip, int p2pId, int port) {
-        return new Node(name, ip, p2pId, port);
-    }
-
-    public Node withP2pIdAndPort(int p2pId, int port) {
-        return Node.at(this.name, this.ip, p2pId, port);
-    }
-
-    public static final int CLIENT_PORT = findFreeSystemPort();
-
-    public static int findFreeSystemPort() {
-        int port = 7369;
-        try {
-            ServerSocket server = new ServerSocket(0);
-            port = server.getLocalPort();
-            log.debug("Random system port used for client: {}", port);
-            server.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return port;
-    }
-
-    public PeerAddress toPeerAddressWithPort(int port) {
-        try {
-            return new PeerAddress(Number160.createHash(name),
-                    InetAddress.getByName(ip),
-                    port,
-                    port);
-        } catch (UnknownHostException e) {
-            log.error(e.getMessage());
-            throw new RuntimeException(e);
-        }
-    }
-
-    public PeerAddress toPeerAddress() {
-        try {
-            return new PeerAddress(Number160.createHash(name),
-                    InetAddress.getByName(ip),
-                    port,
-                    port);
-        } catch (UnknownHostException e) {
-            log.error(e.getMessage());
-            throw new RuntimeException(e);
-        }
-    }
-
-
-    public String getName() {
-        return name;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public int getP2pId() {
-        return p2pId;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object)
-            return true;
-
-        if (object == null || getClass() != object.getClass())
-            return false;
-
-        Node that = (Node) object;
-        return Objects.equal(this.name, that.name) &&
-                Objects.equal(this.ip, that.ip) &&
-                Objects.equal(this.port, that.port);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(name, ip, port);
-    }
-
-    @Override
-    public String toString() {
-        return "Name='" + name + '\'' +
-                "; IP='" + ip + '\'' +
-                "; port=" + port +
-                "; P2P network ID=" + p2pId;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/P2PModule.java b/core/src/main/java/io/bitsquare/p2p/P2PModule.java
deleted file mode 100644
index c1d6fa3c92..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/P2PModule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.p2p;
-
-import io.bitsquare.BitsquareModule;
-
-import org.springframework.core.env.Environment;
-
-public abstract class P2PModule extends BitsquareModule {
-
-    protected P2PModule(Environment env) {
-        super(env);
-    }
-
-    @Override
-    protected final void configure() {
-        doConfigure();
-    }
-
-    protected void doConfigure() {
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/P2PService.java b/core/src/main/java/io/bitsquare/p2p/P2PService.java
deleted file mode 100644
index c65d4af046..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/P2PService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.p2p;
-
-import java.util.concurrent.Executor;
-
-public interface P2PService {
-    void bootstrapCompleted();
-
-    void setExecutor(Executor executor);
-
-    void shutDown();
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/Peer.java b/core/src/main/java/io/bitsquare/p2p/Peer.java
deleted file mode 100644
index 3c0c41d614..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/Peer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.p2p;
-
-/**
- * A peer on the Bitsquare network.
- *
- * @author Chris Beams
- */
-public interface Peer {
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/listener/GetPeerAddressListener.java b/core/src/main/java/io/bitsquare/p2p/listener/GetPeerAddressListener.java
deleted file mode 100644
index d3313acf7c..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/listener/GetPeerAddressListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.p2p.listener;
-
-import io.bitsquare.p2p.Peer;
-
-public interface GetPeerAddressListener {
-    void onResult(Peer peer);
-
-    void onFailed();
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/listener/SendMessageListener.java b/core/src/main/java/io/bitsquare/p2p/listener/SendMessageListener.java
deleted file mode 100644
index 751e0de473..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/listener/SendMessageListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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.p2p.listener;
-
-public interface SendMessageListener {
-    void handleFault();
-
-    void handleResult();
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
deleted file mode 100644
index 3d607f6df6..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.p2p.BootstrapNodes;
-import io.bitsquare.p2p.Node;
-import io.bitsquare.user.Preferences;
-
-import com.google.common.util.concurrent.SettableFuture;
-
-import com.google.inject.name.Named;
-
-import java.io.IOException;
-
-import java.security.KeyPair;
-
-import java.util.concurrent.Executor;
-
-import javax.inject.Inject;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-import net.tomp2p.connection.Bindings;
-import net.tomp2p.connection.ChannelClientConfiguration;
-import net.tomp2p.connection.ChannelServerConfiguration;
-import net.tomp2p.dht.PeerBuilderDHT;
-import net.tomp2p.dht.PeerDHT;
-import net.tomp2p.futures.BaseFuture;
-import net.tomp2p.futures.BaseFutureListener;
-import net.tomp2p.futures.FutureBootstrap;
-import net.tomp2p.futures.FutureDiscover;
-import net.tomp2p.nat.FutureNAT;
-import net.tomp2p.nat.FutureRelayNAT;
-import net.tomp2p.nat.PeerBuilderNAT;
-import net.tomp2p.nat.PeerNAT;
-import net.tomp2p.p2p.Peer;
-import net.tomp2p.p2p.PeerBuilder;
-import net.tomp2p.peers.PeerAddress;
-import net.tomp2p.peers.PeerMapChangeListener;
-import net.tomp2p.peers.PeerStatistic;
-import net.tomp2p.relay.tcp.TCPRelayClientConfig;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.netty.util.concurrent.DefaultEventExecutorGroup;
-
-
-/**
- * Creates a DHT peer and bootstraps to the network via a bootstrap node
- */
-public class BootstrappedPeerBuilder {
-    private static final Logger log = LoggerFactory.getLogger(BootstrappedPeerBuilder.class);
-
-    static final String NETWORK_INTERFACE_KEY = "interface";
-    static final String NETWORK_INTERFACE_UNSPECIFIED = "<unspecified>";
-    static final String USE_MANUAL_PORT_FORWARDING_KEY = "node.useManualPortForwarding";
-
-    public enum ConnectionType {
-        UNDEFINED, DIRECT, MANUAL_PORT_FORWARDING, AUTO_PORT_FORWARDING, RELAY
-    }
-
-    public enum State {
-        UNDEFINED,
-        PEER_CREATION_FAILED,
-        DISCOVERY_STARTED,
-        DISCOVERY_DIRECT_SUCCEEDED,
-        DISCOVERY_MANUAL_PORT_FORWARDING_SUCCEEDED,
-        DISCOVERY_FAILED,
-        DISCOVERY_AUTO_PORT_FORWARDING_STARTED,
-        DISCOVERY_AUTO_PORT_FORWARDING_SUCCEEDED,
-        DISCOVERY_AUTO_PORT_FORWARDING_FAILED,
-        RELAY_STARTED,
-        RELAY_SUCCEEDED,
-        RELAY_FAILED,
-        BOOT_STRAP_SUCCEEDED,
-        BOOT_STRAP_FAILED;
-
-        private String message;
-
-        State() {
-        }
-
-        public String getMessage() {
-            return message;
-        }
-
-        public void setMessage(String message) {
-            this.message = message;
-        }
-    }
-
-    private final int port;
-    private final boolean useManualPortForwarding;
-    private final String networkInterface;
-    private BootstrapNodes bootstrapNodes;
-    private final Preferences preferences;
-
-    private final SettableFuture<PeerDHT> settableFuture = SettableFuture.create();
-    private final ObjectProperty<State> state = new SimpleObjectProperty<>(State.UNDEFINED);
-    private final ObjectProperty<ConnectionType> connectionType = new SimpleObjectProperty<>(ConnectionType.UNDEFINED);
-
-    private KeyPair keyPair;
-    private Peer peer;
-    private PeerDHT peerDHT;
-    private Executor executor;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public BootstrappedPeerBuilder(@Named(Node.PORT_KEY) int port,
-                                   @Named(USE_MANUAL_PORT_FORWARDING_KEY) boolean useManualPortForwarding,
-                                   @Named(NETWORK_INTERFACE_KEY) String networkInterface,
-                                   BootstrapNodes bootstrapNodes,
-                                   Preferences preferences) {
-        this.port = port;
-        this.useManualPortForwarding = useManualPortForwarding;
-        this.networkInterface = networkInterface;
-        this.bootstrapNodes = bootstrapNodes;
-        this.preferences = preferences;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setKeyPair(@NotNull KeyPair keyPair) {
-        this.keyPair = keyPair;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Public methods
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setExecutor(Executor executor) {
-        this.executor = executor;
-    }
-
-    public SettableFuture<PeerDHT> start() {
-        try {
-            DefaultEventExecutorGroup eventExecutorGroup = new DefaultEventExecutorGroup(20);
-            ChannelClientConfiguration clientConf = PeerBuilder.createDefaultChannelClientConfiguration();
-            clientConf.pipelineFilter(new PeerBuilder.EventExecutorGroupFilter(eventExecutorGroup));
-
-            ChannelServerConfiguration serverConf = PeerBuilder.createDefaultChannelServerConfiguration();
-            serverConf.pipelineFilter(new PeerBuilder.EventExecutorGroupFilter(eventExecutorGroup));
-            serverConf.connectionTimeoutTCPMillis(5000);
-
-            Bindings bindings = new Bindings();
-            if (!NETWORK_INTERFACE_UNSPECIFIED.equals(networkInterface))
-                bindings.addInterface(networkInterface);
-
-            if (useManualPortForwarding) {
-                peer = new PeerBuilder(keyPair)
-                        .p2pId(bootstrapNodes.getP2pId())
-                        .channelClientConfiguration(clientConf)
-                        .channelServerConfiguration(serverConf)
-                        .ports(port)
-                        .bindings(bindings)
-                        .tcpPortForwarding(port)
-                        .udpPortForwarding(port)
-                        .start();
-            }
-            else {
-                peer = new PeerBuilder(keyPair)
-                        .p2pId(bootstrapNodes.getP2pId())
-                        .channelClientConfiguration(clientConf)
-                        .channelServerConfiguration(serverConf)
-                        .ports(port)
-                        .bindings(bindings)
-                        .start();
-            }
-
-            peerDHT = new PeerBuilderDHT(peer).start();
-
-            peer.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() {
-                @Override
-                public void peerInserted(PeerAddress peerAddress, boolean verified) {
-                    if (verified)
-                        log.debug("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
-                    else
-                        log.trace("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
-                }
-
-                @Override
-                public void peerRemoved(PeerAddress peerAddress, PeerStatistic peerStatistics) {
-                    log.debug("Peer removed: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
-                }
-
-                @Override
-                public void peerUpdated(PeerAddress peerAddress, PeerStatistic peerStatistics) {
-                    // log.debug("Peer updated: peerAddress=" + peerAddress + ", peerStatistics=" + peerStatistics);
-                }
-            });
-            if (preferences.getUseUPnP())
-                discoverExternalAddressUsingUPnP();
-            else
-                discoverExternalAddress();
-        } catch (IOException e) {
-            handleError(State.PEER_CREATION_FAILED, "Cannot create a peer with port: " +
-                    port + ". Exception: " + e);
-        }
-
-        return settableFuture;
-    }
-
-    public void shutDown() {
-        if (peerDHT != null)
-            peerDHT.shutdown();
-    }
-
-    // We need to discover our external address and test if we are reachable for other nodes
-    // We know our internal address from a discovery of our local network interfaces
-    // We start a discover process with our bootstrap node.
-    // There are 4 cases:
-    // 1. If we are not behind a NAT we get reported back the same address as our internal.
-    // 2. If we are behind a NAT and manual port forwarding is setup we get reported our external address from the
-    // bootstrap node and the bootstrap node could ping us so we know we are reachable.
-    // 3. If we are behind a NAT and the ping probes fails we need to setup port forwarding with UPnP or NAT-PMP.
-    // If that is successfully setup we need to try again a discover so we find out our external address and have
-    // tested successfully our reachability (the additional discover is done internally from startSetupPortforwarding)
-    // 4. If the port forwarding failed we can try as last resort to open a permanent TCP connection to the
-    // bootstrap node and use that peer as relay
-
-    private void discoverExternalAddressUsingUPnP() {
-        Node randomNode = bootstrapNodes.getRandomDiscoverNode();
-        log.info("Random Node for discovering own address visible form outside: " + randomNode);
-        FutureDiscover futureDiscover = peer.discover().peerAddress(randomNode.toPeerAddress()).start();
-        setState(State.DISCOVERY_STARTED);
-        PeerNAT peerNAT = new PeerBuilderNAT(peer).start();
-        FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover);
-        FutureRelayNAT futureRelayNAT = peerNAT.startRelay(new TCPRelayClientConfig(), futureDiscover, futureNAT);
-        futureRelayNAT.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture futureRelayNAT) throws Exception {
-                if (futureDiscover.isSuccess()) {
-                    if (useManualPortForwarding) {
-                        setState(State.DISCOVERY_MANUAL_PORT_FORWARDING_SUCCEEDED,
-                                "NAT traversal successful with manual port forwarding.");
-                        setConnectionType(ConnectionType.MANUAL_PORT_FORWARDING);
-                        bootstrap();
-                    }
-                    else {
-                        setState(State.DISCOVERY_DIRECT_SUCCEEDED, "Visible to the network. No NAT traversal needed.");
-                        setConnectionType(ConnectionType.DIRECT);
-                        bootstrap();
-                    }
-                }
-                else {
-                    setState(State.DISCOVERY_AUTO_PORT_FORWARDING_STARTED);
-                    if (futureNAT.isSuccess()) {
-                        setState(State.DISCOVERY_AUTO_PORT_FORWARDING_SUCCEEDED,
-                                "NAT traversal successful with automatic port forwarding.");
-                        setConnectionType(ConnectionType.AUTO_PORT_FORWARDING);
-                        bootstrap();
-                    }
-                    else {
-                        if (futureRelayNAT.isSuccess()) {
-                            // relay mode succeeded
-                            setState(State.RELAY_SUCCEEDED, "NAT traversal not successful. Using relay mode.");
-                            setConnectionType(ConnectionType.RELAY);
-                            bootstrap();
-                        }
-                        else {
-                            // All attempts failed. Give up...
-                            handleError(State.RELAY_FAILED, "NAT traversal using relay mode failed " + futureRelayNAT.failedReason());
-                        }
-                    }
-                }
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-                handleError(State.RELAY_FAILED, "Exception at bootstrap: " + t.getMessage());
-            }
-        });
-    }
-
-    private void discoverExternalAddress() {
-        Node randomNode = bootstrapNodes.getRandomDiscoverNode();
-        log.info("Random Node for discovering own address visible form outside: " + randomNode);
-        FutureDiscover futureDiscover = peer.discover().peerAddress(randomNode.toPeerAddress()).start();
-        setState(State.DISCOVERY_STARTED);
-        PeerNAT peerNAT = new PeerBuilderNAT(peer).start();
-        FutureRelayNAT futureRelayNAT = peerNAT.startRelay(new TCPRelayClientConfig(), futureDiscover);
-        futureRelayNAT.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture futureRelayNAT) throws Exception {
-                if (futureDiscover.isSuccess()) {
-                    if (useManualPortForwarding) {
-                        setState(State.DISCOVERY_MANUAL_PORT_FORWARDING_SUCCEEDED,
-                                "NAT traversal successful with manual port forwarding.");
-                        setConnectionType(ConnectionType.MANUAL_PORT_FORWARDING);
-                        bootstrap();
-                    }
-                    else {
-                        setState(State.DISCOVERY_DIRECT_SUCCEEDED, "Visible to the network. No NAT traversal needed.");
-                        setConnectionType(ConnectionType.DIRECT);
-                        bootstrap();
-                    }
-                }
-                else {
-                    if (futureRelayNAT.isSuccess()) {
-                        // relay mode succeeded
-                        setState(State.RELAY_SUCCEEDED, "Using relay mode.");
-                        setConnectionType(ConnectionType.RELAY);
-                        bootstrap();
-                    }
-                    else {
-                        // All attempts failed. Give up...
-                        handleError(State.RELAY_FAILED, "NAT traversal using relay mode failed " + futureRelayNAT.failedReason());
-                    }
-                }
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-                handleError(State.RELAY_FAILED, "Exception at bootstrap: " + t.getMessage());
-            }
-        });
-    }
-
-    private void bootstrap() {
-        log.trace("start bootstrap");
-
-        // We don't wait until bootstrap is done for speeding up startup process
-        FutureBootstrap futureBootstrap = peer.bootstrap().bootstrapTo(bootstrapNodes.getBootstrapPeerAddresses()).start();
-        futureBootstrap.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                if (futureBootstrap.isSuccess()) {
-                    log.trace("bootstrap complete");
-                    setState(State.BOOT_STRAP_SUCCEEDED, "Bootstrap was successful.");
-                    settableFuture.set(peerDHT);
-                }
-                else {
-                    handleError(State.BOOT_STRAP_FAILED, "Bootstrap failed. " +
-                            futureBootstrap.failedReason());
-                }
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-                handleError(State.BOOT_STRAP_FAILED, "Exception at bootstrap: " + t.getMessage());
-            }
-        });
-    }
-
-    public ConnectionType getConnectionType() {
-        return connectionType.get();
-    }
-
-    public ReadOnlyObjectProperty<ConnectionType> connectionTypeProperty() {
-        return connectionType;
-    }
-
-    private void setConnectionType(ConnectionType discoveryState) {
-        this.connectionType.set(discoveryState);
-    }
-
-    public ObjectProperty<State> getState() {
-        return state;
-    }
-
-    private void setState(State state) {
-        setState(state, "", true);
-    }
-
-    private void setState(State state, String message) {
-        setState(state, message, true);
-    }
-
-    private void setState(State state, String message, boolean isSuccess) {
-        if (isSuccess)
-            log.info(message);
-        else
-            log.error(message);
-
-        state.setMessage(message);
-        this.state.set(state);
-    }
-
-    private void handleError(State state, String errorMessage) {
-        setState(state, errorMessage, false);
-        peerDHT.shutdown();
-        settableFuture.setException(new Exception(errorMessage));
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java
deleted file mode 100644
index 51cad07c08..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.p2p.AddressService;
-import io.bitsquare.p2p.NetworkException;
-import io.bitsquare.p2p.Peer;
-import io.bitsquare.p2p.listener.GetPeerAddressListener;
-
-import java.io.IOException;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import javax.inject.Inject;
-
-import net.tomp2p.dht.FutureGet;
-import net.tomp2p.dht.FuturePut;
-import net.tomp2p.futures.BaseFuture;
-import net.tomp2p.futures.BaseFutureAdapter;
-import net.tomp2p.futures.BaseFutureListener;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.PeerAddress;
-import net.tomp2p.storage.Data;
-import net.tomp2p.utils.Utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TomP2PAddressService extends TomP2PDHTService implements AddressService {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PAddressService.class);
-
-    private static final int IP_CHECK_PERIOD = 2 * 60 * 1000;           // Cheap call if nothing changes, so set it short to 2 min.
-    private static final int STORE_ADDRESS_PERIOD = 5 * 60 * 1000;      // Save every 5 min.
-    private static final int ADDRESS_TTL = STORE_ADDRESS_PERIOD * 2;    // TTL 10 min.
-
-    private final Number160 locationKey;
-    private PeerAddress storedPeerAddress;
-    private Timer timerForStoreAddress;
-    private Timer timerForIPCheck;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public TomP2PAddressService(TomP2PNode tomP2PNode, KeyRing keyRing) {
-        super(tomP2PNode, keyRing);
-
-        locationKey = Utils.makeSHAHash(keyRing.getPubKeyRing().getDhtSignaturePubKey().getEncoded());
-    }
-
-    @Override
-    public void bootstrapCompleted() {
-        super.bootstrapCompleted();
-        setupTimerForIPCheck();
-        setupTimerForStoreAddress();
-        storeAddress();
-    }
-
-    @Override
-    public void shutDown() {
-        if (timerForIPCheck != null)
-            timerForIPCheck.cancel();
-        if (timerForStoreAddress != null)
-            timerForStoreAddress.cancel();
-        super.shutDown();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Find peer address by publicKey
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void findPeerAddress(PubKeyRing pubKeyRing, GetPeerAddressListener listener) {
-        final Number160 locationKey = Utils.makeSHAHash(pubKeyRing.getDhtSignaturePubKey().getEncoded());
-        FutureGet futureGet = getDataOfProtectedDomain(locationKey, pubKeyRing.getDhtSignaturePubKey());
-        log.trace("findPeerAddress called");
-        futureGet.addListener(new BaseFutureAdapter<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture baseFuture) throws Exception {
-                if (baseFuture.isSuccess() && futureGet.data() != null) {
-                    final Peer peer = (Peer) futureGet.data().object();
-                    log.trace("Peer found in DHT. Peer = " + peer);
-                    executor.execute(() -> listener.onResult(peer));
-                }
-                else {
-                    log.error("getPeerAddress failed. failedReason = " + baseFuture.failedReason());
-                    executor.execute(listener::onFailed);
-                }
-            }
-        });
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void setupTimerForStoreAddress() {
-        timerForStoreAddress = new Timer();
-        timerForStoreAddress.scheduleAtFixedRate(new TimerTask() {
-            @Override
-            public void run() {
-                if (storedPeerAddress != null && peerDHT != null && !storedPeerAddress.equals(peerDHT.peerAddress()))
-                    storeAddress();
-            }
-        }, STORE_ADDRESS_PERIOD, STORE_ADDRESS_PERIOD);
-    }
-
-    private void setupTimerForIPCheck() {
-        timerForIPCheck = new Timer();
-        timerForIPCheck.scheduleAtFixedRate(new TimerTask() {
-            @Override
-            public void run() {
-                if (storedPeerAddress != null && peerDHT != null && !storedPeerAddress.equals(peerDHT.peerAddress()))
-                    storeAddress();
-            }
-        }, IP_CHECK_PERIOD, IP_CHECK_PERIOD);
-    }
-
-    private void storeAddress() {
-        try {
-            Data data = new Data(new TomP2PPeer(peerDHT.peerAddress()));
-            // We set a short time-to-live to make getAddress checks fail fast in case if the offerer is offline and to support cheap offerbook state updates
-            data.ttlSeconds(ADDRESS_TTL);
-            log.debug("storePeerAddress " + peerDHT.peerAddress().toString());
-            FuturePut futurePut = putDataToMyProtectedDomain(locationKey, data);
-            futurePut.addListener(new BaseFutureListener<BaseFuture>() {
-                @Override
-                public void operationComplete(BaseFuture future) throws Exception {
-                    if (future.isSuccess()) {
-                        storedPeerAddress = peerDHT.peerAddress();
-                        log.debug("storedPeerAddress = " + storedPeerAddress);
-                    }
-                    else {
-                        log.error("storedPeerAddress not successful");
-                        throw new NetworkException("Storing address was not successful. Reason: " + future.failedReason());
-                    }
-                }
-
-                @Override
-                public void exceptionCaught(Throwable t) throws Exception {
-                    log.error("Exception at storedPeerAddress " + t.toString());
-                    throw new NetworkException("Exception at storeAddress.", t);
-                }
-            });
-        } catch (IOException e) {
-            e.printStackTrace();
-            log.error("Exception at storePeerAddress " + e.toString());
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java
deleted file mode 100644
index 80d8aec9df..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.p2p.DHTService;
-
-import java.security.KeyPair;
-import java.security.PublicKey;
-
-import javax.inject.Inject;
-
-import net.tomp2p.dht.FutureGet;
-import net.tomp2p.dht.FuturePut;
-import net.tomp2p.dht.FutureRemove;
-import net.tomp2p.dht.StorageLayer;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.storage.Data;
-import net.tomp2p.utils.Utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TomP2PDHTService extends TomP2PService implements DHTService {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PDHTService.class);
-    private final KeyPair dhtSignatureKeyPair;
-    private final Number160 pubKeyHashForMyDomain;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public TomP2PDHTService(TomP2PNode tomP2PNode, KeyRing keyRing) {
-        super(tomP2PNode);
-
-        dhtSignatureKeyPair = keyRing.getDhtSignatureKeyPair();
-        pubKeyHashForMyDomain = Utils.makeSHAHash(dhtSignatureKeyPair.getPublic().getEncoded());
-    }
-
-    @Override
-    public void bootstrapCompleted() {
-        super.bootstrapCompleted();
-
-        StorageLayer.ProtectionEnable protectionDomainEnable = StorageLayer.ProtectionEnable.ALL;
-        StorageLayer.ProtectionMode protectionDomainMode = StorageLayer.ProtectionMode.MASTER_PUBLIC_KEY;
-        StorageLayer.ProtectionEnable protectionEntryEnable = StorageLayer.ProtectionEnable.ALL;
-        StorageLayer.ProtectionMode protectionEntryMode = StorageLayer.ProtectionMode.MASTER_PUBLIC_KEY;
-
-        peerDHT.storageLayer().protection(protectionDomainEnable, protectionDomainMode, protectionEntryEnable, protectionEntryMode);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Put/Get: Public access. 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    // Use case: Used for offerbook invalidation timestamp. Everybody can write that data.
-
-    /**
-     * Store data to given location key.
-     * Write access: Anyone with locationKey
-     *
-     * @param locationKey
-     * @param data
-     * @return
-     */
-    public FuturePut putData(Number160 locationKey, Data data) {
-        log.trace("putData");
-        return peerDHT.put(locationKey).data(data).start();
-    }
-    // No protection, everybody can read.
-
-    /**
-     * Get data for given locationKey
-     * Read access: Anyone with locationKey
-     *
-     * @param locationKey
-     * @return
-     */
-    public FutureGet getData(Number160 locationKey) {
-        //log.trace("getData");
-        return peerDHT.get(locationKey).start();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Put/Get: Domain protected, entry protected. 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    // Use case: Used for storing address. Only domain owner can write and change that data. Data protection gives additional protection (is it needed?)
-
-    /**
-     * Store data to given location key and my domain.
-     * Write access: Anybody who has pubKey if domain is not used before. KeyPair owner of pubKey can overwrite and reserve that domain.
-     * We save early an entry so we have that domain reserved and nobody else can use it.
-     * Additionally we use entry protection, so domain owner is data owner.
-     *
-     * @param locationKey
-     * @param data
-     * @return
-     */
-    public FuturePut putDataToMyProtectedDomain(Number160 locationKey, Data data) {
-        log.trace("putDataToMyProtectedDomain");
-        data.protectEntry(dhtSignatureKeyPair);
-        return peerDHT.put(locationKey).data(data).protectDomain().domainKey(pubKeyHashForMyDomain).start();
-    }
-
-    /**
-     * Removes data for given location and my domain.
-     * Access: Domain owner only can remove
-     *
-     * @param locationKey
-     * @return
-     */
-    public FutureRemove removeDataFromMyProtectedDomain(Number160 locationKey) {
-        log.trace("removeDataOfProtectedDomain");
-        if (peerDHT != null)
-            return peerDHT.remove(locationKey).domainKey(pubKeyHashForMyDomain).keyPair(dhtSignatureKeyPair).start();
-        else
-            return null;
-    }
-
-    /**
-     * Read data for given location and publicKey of that domain.
-     * Read access: Anyone who has publicKey
-     *
-     * @param locationKey
-     * @param publicKey
-     * @return
-     */
-    public FutureGet getDataOfProtectedDomain(Number160 locationKey, PublicKey publicKey) {
-        log.trace("getDataOfProtectedDomain");
-        final Number160 pubKeyHashOfDomainOwner = Utils.makeSHAHash(publicKey.getEncoded());
-        return peerDHT.get(locationKey).domainKey(pubKeyHashOfDomainOwner).start();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Add/remove/get from map: Entry protected, no domain protection. 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    // Use case: Used for offerbook and arbitrators. Everybody can add entries, but those entries are data protected so only the owner can remove it.
-
-    /**
-     * Add data to a map. For the entry contentKey of data is used (internally).
-     * Write access: Anyone can add entries. But nobody can overwrite an existing entry as it is protected by data protection.
-     *
-     * @param locationKey
-     * @param data
-     * @return
-     */
-    public FuturePut addProtectedDataToMap(Number160 locationKey, Data data) {
-        log.trace("addProtectedDataToMap locationKey = " + locationKey);
-        data.protectEntry(dhtSignatureKeyPair);
-        log.trace("addProtectedDataToMap with contentKey " + data.hash().toString());
-
-        return peerDHT.add(locationKey).data(data).keyPair(dhtSignatureKeyPair).start();
-    }
-
-    /**
-     * Remove entry from map for given locationKey. ContentKey of data is used for removing the entry.
-     * Access: Only the owner of the data entry can remove it, as it was written with entry protection.
-     *
-     * @param locationKey
-     * @param data
-     * @return
-     */
-    public FutureRemove removeProtectedDataFromMap(Number160 locationKey, Data data) {
-        log.trace("removeProtectedDataFromMap locationKey = " + locationKey);
-        Number160 contentKey = data.hash();
-        log.trace("removeProtectedDataFromMap with contentKey " + contentKey.toString());
-        return peerDHT.remove(locationKey).contentKey(contentKey).keyPair(dhtSignatureKeyPair).start();
-    }
-
-    /**
-     * Get map for given locationKey with all entries.
-     * Access: Everybody can read.
-     *
-     * @param locationKey
-     * @return
-     */
-    public FutureGet getMap(Number160 locationKey) {
-        log.trace("getMap");
-        return peerDHT.get(locationKey).all().start();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Add/remove/get from map: Domain protection, no data protection. 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    // Use case: Used for mailbox. Everybody can add message entries to ones mailbox, but only mailbox owner (domain owner) can remove entries.
-    // For protecting privacy we use encryption for the messages (not part of DHT infrastructure), so everybody can read the messages but only domain owner 
-    // can decrypt it.
-
-    /**
-     * Add data to a map. For the entry contentKey of data is used (internally).
-     * Write access: Anyone can add entries. But nobody expect the domain owner can overwrite/remove an existing entry as it is protected by the domain owner.
-     *
-     * @param locationKey
-     * @param data
-     * @return
-     */
-    public FuturePut addDataToMapOfProtectedDomain(Number160 locationKey, Data data, PublicKey publicKey) {
-        log.trace("addDataToMapOfProtectedDomain");
-        log.trace("addDataToMapOfProtectedDomain with contentKey " + data.hash().toString());
-        final Number160 pubKeyHashOfDomainOwner = Utils.makeSHAHash(publicKey.getEncoded());
-        return peerDHT.add(locationKey).protectDomain().domainKey(pubKeyHashOfDomainOwner).keyPair(dhtSignatureKeyPair)
-                .data(data).protectDomain().domainKey(pubKeyHashOfDomainOwner).keyPair(dhtSignatureKeyPair).start();
-    }
-
-    /**
-     * Remove entry from map for given locationKey. ContentKey of data is used for removing the entry.
-     * Access: Only the owner of the data entry can remove it, as it was written with entry protection.
-     *
-     * @param locationKey
-     * @param data
-     * @return
-     */
-    public FutureRemove removeDataFromMapOfMyProtectedDomain(Number160 locationKey, Data data) {
-        log.trace("removeDataFromMapOfMyProtectedDomain");
-        Number160 contentKey = data.hash();
-        log.trace("removeDataFromMapOfMyProtectedDomain with contentKey " + contentKey.toString());
-        return peerDHT.remove(locationKey).contentKey(contentKey).domainKey(pubKeyHashForMyDomain).keyPair(dhtSignatureKeyPair).start();
-    }
-
-    /**
-     * Get map for given locationKey with all entries.
-     * Access: Everybody can read.
-     *
-     * @param locationKey
-     * @return
-     */
-    public FutureGet getDataFromMapOfMyProtectedDomain(Number160 locationKey) {
-        log.trace("getDataFromMapOfMyProtectedDomain");
-        return peerDHT.get(locationKey).all().domainKey(pubKeyHashForMyDomain).start();
-    }
-
-    /**
-     * Remove all data from map for given locationKey.
-     * Access: Only the domain owner.
-     *
-     * @param locationKey
-     * @return
-     */
-    public FutureRemove removeAllDataFromMapOfMyProtectedDomain(Number160 locationKey) {
-        log.trace("getDataFromMapOfMyProtectedDomain");
-        return peerDHT.remove(locationKey).domainKey(pubKeyHashForMyDomain).keyPair(dhtSignatureKeyPair).all().domainKey(pubKeyHashForMyDomain).keyPair
-                (dhtSignatureKeyPair).start();
-    }
-
-
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMailboxService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMailboxService.java
deleted file mode 100644
index 5750a19e5a..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMailboxService.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.common.handlers.FaultHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.crypto.SealedAndSignedMessage;
-import io.bitsquare.p2p.MailboxMessagesResultHandler;
-import io.bitsquare.p2p.MailboxService;
-import io.bitsquare.trade.offer.OfferBookService;
-
-import java.io.IOException;
-
-import java.security.KeyPair;
-import java.security.PublicKey;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import net.tomp2p.dht.FutureGet;
-import net.tomp2p.dht.FuturePut;
-import net.tomp2p.dht.FutureRemove;
-import net.tomp2p.futures.BaseFuture;
-import net.tomp2p.futures.BaseFutureAdapter;
-import net.tomp2p.futures.BaseFutureListener;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.Number640;
-import net.tomp2p.storage.Data;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TomP2PMailboxService extends TomP2PDHTService implements MailboxService {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PMailboxService.class);
-    private static final int TTL = 21 * 24 * 60 * 60;    // the message is default 21 days valid, as a max trade period might be about 2 weeks.
-
-    private final List<OfferBookService.Listener> offerRepositoryListeners = new ArrayList<>();
-    private final KeyPair dhtSignatureKeyPair;
-
-    @Inject
-    public TomP2PMailboxService(TomP2PNode tomP2PNode, KeyRing keyRing) {
-        super(tomP2PNode, keyRing);
-
-        dhtSignatureKeyPair = keyRing.getDhtSignatureKeyPair();
-    }
-
-    @Override
-    public void bootstrapCompleted() {
-        super.bootstrapCompleted();
-    }
-
-    @Override
-    public void shutDown() {
-        super.shutDown();
-    }
-
-    @Override
-    public void addMessage(PubKeyRing pubKeyRing, SealedAndSignedMessage message, ResultHandler resultHandler, FaultHandler faultHandler) {
-        try {
-            final Data data = new Data(message);
-            data.ttlSeconds(TTL);
-            Number160 locationKey = getLocationKey(pubKeyRing.getDhtSignaturePubKey());
-            log.trace("Add message to DHT requested. Added data: [locationKey: " + locationKey +
-                    ", hash: " + data.hash().toString() + "]");
-
-            openRequestsUp();
-            FuturePut futurePut = addDataToMapOfProtectedDomain(locationKey,
-                    data, pubKeyRing.getDhtSignaturePubKey());
-            futurePut.addListener(new BaseFutureListener<BaseFuture>() {
-                @Override
-                public void operationComplete(BaseFuture future) throws Exception {
-                    openRequestsDown();
-                    if (future.isSuccess()) {
-                        executor.execute(() -> {
-                            log.trace("Add message to mailbox was successful. Added data: [locationKey: " + locationKey + ", value: " + data + "]");
-                            resultHandler.handleResult();
-                        });
-                    }
-                    else {
-                        // Seems to be a bug in TomP2P that when one peer shuts down the expected nr of peers and the delivered are not matching
-                        // As far tested the storage succeeded, so seems to be a wrong message.
-                        //Future (compl/canc):true/false, FAILED, Expected 3 result, but got 2 
-
-                        log.warn("Ignoring isSuccess=false case. failedReason: {}", future.failedReason());
-                        resultHandler.handleResult();
-                    }
-                }
-
-                @Override
-                public void exceptionCaught(Throwable ex) throws Exception {
-                    openRequestsDown();
-                    executor.execute(() -> faultHandler.handleFault("Add message to mailbox failed.", ex));
-                }
-            });
-        } catch (IOException ex) {
-            openRequestsDown();
-            executor.execute(() -> faultHandler.handleFault("Add message to mailbox failed.", ex));
-        }
-    }
-
-    @Override
-    public void getAllMessages(MailboxMessagesResultHandler resultHandler) {
-        log.trace("Get messages from DHT requested for locationKey: " + getLocationKey(dhtSignatureKeyPair.getPublic()));
-        FutureGet futureGet = getDataFromMapOfMyProtectedDomain(getLocationKey(dhtSignatureKeyPair.getPublic()));
-        futureGet.addListener(new BaseFutureAdapter<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                if (future.isSuccess()) {
-                    final Map<Number640, Data> dataMap = futureGet.dataMap();
-                    List<SealedAndSignedMessage> messages = new ArrayList<>();
-                    if (dataMap != null) {
-                        for (Data messageData : dataMap.values()) {
-                            try {
-                                Object messageDataObject = messageData.object();
-                                if (messageDataObject instanceof SealedAndSignedMessage) {
-                                    messages.add((SealedAndSignedMessage) messageDataObject);
-                                }
-                            } catch (ClassNotFoundException | IOException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                        executor.execute(() -> resultHandler.handleResult(messages));
-                    }
-
-                    log.trace("Get messages from DHT was successful. Stored data: [key: " + getLocationKey(dhtSignatureKeyPair.getPublic())
-                            + ", values: " + futureGet.dataMap() + "]");
-                }
-                else {
-                    final Map<Number640, Data> dataMap = futureGet.dataMap();
-                    if (dataMap == null || dataMap.size() == 0) {
-                        log.trace("Get messages from DHT delivered empty dataMap.");
-                        executor.execute(() -> resultHandler.handleResult(new ArrayList<>()));
-                    }
-                    else {
-                        log.error("Get messages from DHT  was not successful with reason:" + future.failedReason());
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    public void removeAllMessages(ResultHandler resultHandler, FaultHandler faultHandler) {
-        log.trace("Remove all messages from DHT requested. locationKey: " + getLocationKey(dhtSignatureKeyPair.getPublic()));
-        FutureRemove futureRemove = removeAllDataFromMapOfMyProtectedDomain(getLocationKey(dhtSignatureKeyPair.getPublic()));
-        futureRemove.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                // We don't test futureRemove.isSuccess() as this API does not fit well to that operation, 
-                // it might change in future to something like foundAndRemoved and notFound
-                // See discussion at: https://github.com/tomp2p/TomP2P/issues/57#issuecomment-62069840
-                log.trace("isRemoved? " + futureRemove.isRemoved());
-                executor.execute(resultHandler::handleResult);
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-                log.error("Remove all messages from DHT failed. Error: " + t.getMessage());
-                faultHandler.handleFault("Remove all messages from DHT failed. Error: " + t.getMessage(), t);
-            }
-        });
-    }
-
-
-    private Number160 getLocationKey(PublicKey p2pSigPubKey) {
-        return Number160.createHash("mailbox" + p2pSigPubKey.hashCode());
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
deleted file mode 100644
index 65a92234d0..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.crypto.CryptoException;
-import io.bitsquare.crypto.CryptoService;
-import io.bitsquare.crypto.MessageWithPubKey;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.crypto.SealedAndSignedMessage;
-import io.bitsquare.p2p.DecryptedMessageHandler;
-import io.bitsquare.p2p.MailboxMessage;
-import io.bitsquare.p2p.MailboxService;
-import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.MessageHandler;
-import io.bitsquare.p2p.MessageService;
-import io.bitsquare.p2p.Peer;
-import io.bitsquare.p2p.listener.SendMessageListener;
-import io.bitsquare.util.Utilities;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.inject.Inject;
-
-import net.tomp2p.futures.BaseFuture;
-import net.tomp2p.futures.BaseFutureListener;
-import net.tomp2p.futures.FutureDirect;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TomP2PMessageService extends TomP2PService implements MessageService {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PMessageService.class);
-    private static final int MAX_MESSAGE_SIZE = 100 * 1024; // 34 kb is currently the max size used
-
-    private final CopyOnWriteArrayList<MessageHandler> messageHandlers = new CopyOnWriteArrayList<>();
-    private final CopyOnWriteArrayList<DecryptedMessageHandler> decryptedMessageHandlers = new CopyOnWriteArrayList<>();
-    private final MailboxService mailboxService;
-    private final CryptoService<MailboxMessage> cryptoService;
-
-    @Inject
-    public TomP2PMessageService(TomP2PNode tomP2PNode, MailboxService mailboxService, CryptoService<MailboxMessage> cryptoService) {
-        super(tomP2PNode);
-        this.mailboxService = mailboxService;
-        this.cryptoService = cryptoService;
-    }
-
-
-    @Override
-    public void bootstrapCompleted() {
-        super.bootstrapCompleted();
-        setupReplyHandler();
-    }
-
-    @Override
-    public void shutDown() {
-        super.shutDown();
-    }
-
-    @Override
-    public void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, boolean useMailboxIfUnreachable, SendMessageListener listener) {
-        assert pubKeyRing != null;
-
-        log.debug("sendMessage called");
-        if (peer == null)
-            throw new IllegalArgumentException("Peer must not be null");
-        else if (!(peer instanceof TomP2PPeer))
-            throw new IllegalArgumentException("Peer must be of type TomP2PPeer");
-
-        try {
-            final Message encryptedMessage = cryptoService.encryptAndSignMessage(pubKeyRing, message);
-
-            openRequestsUp();
-            FutureDirect futureDirect = peerDHT.peer().sendDirect(((TomP2PPeer) peer).getPeerAddress()).object(encryptedMessage).start();
-            futureDirect.addListener(new BaseFutureListener<BaseFuture>() {
-                                         @Override
-                                         public void operationComplete(BaseFuture future) throws Exception {
-                                             if (future.isSuccess()) {
-                                                 openRequestsDown();
-                                                 log.debug("sendMessage completed");
-                                                 executor.execute(listener::handleResult);
-                                             }
-                                             else {
-                                                 log.info("sendMessage failed. We will try to send the message to the mailbox. Fault reason:  " +
-                                                         futureDirect.failedReason());
-                                                 if (useMailboxIfUnreachable) {
-                                                     sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
-                                                 }
-                                                 else {
-                                                     openRequestsDown();
-                                                     log.error("Send message was not successful");
-                                                     executor.execute(listener::handleFault);
-                                                 }
-                                             }
-                                         }
-
-                                         @Override
-                                         public void exceptionCaught(Throwable t) throws Exception {
-                                             log.info("sendMessage failed with exception. We will try to send the message to the mailbox. Exception: "
-                                                     + t.getMessage());
-                                             if (useMailboxIfUnreachable) {
-                                                 sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
-                                             }
-                                             else {
-                                                 openRequestsDown();
-                                                 log.error("Send message was not successful");
-                                                 executor.execute(listener::handleFault);
-                                             }
-                                         }
-                                     }
-            );
-        } catch (Throwable t) {
-            openRequestsDown();
-            t.printStackTrace();
-            log.error(t.getMessage());
-            executor.execute(listener::handleFault);
-        }
-    }
-
-    private void sendMailboxMessage(PubKeyRing pubKeyRing, SealedAndSignedMessage message, SendMessageListener listener) {
-        log.info("sendMailboxMessage called");
-        mailboxService.addMessage(
-                pubKeyRing,
-                message,
-                () -> {
-                    openRequestsDown();
-                    log.debug("Message successfully added to peers mailbox.");
-                    executor.execute(listener::handleResult);
-                },
-                (errorMessage, throwable) -> {
-                    openRequestsDown();
-                    log.error("Message failed to add to peers mailbox.");
-                    executor.execute(listener::handleFault);
-                }
-        );
-    }
-
-    @Override
-    public void addMessageHandler(MessageHandler listener) {
-        if (!messageHandlers.add(listener))
-            log.error("Add listener did not change list. Probably listener has been already added.");
-    }
-
-    @Override
-    public void removeMessageHandler(MessageHandler listener) {
-        if (!messageHandlers.remove(listener))
-            log.error("Try to remove listener which was never added.");
-    }
-
-    @Override
-    public void addDecryptedMessageHandler(DecryptedMessageHandler listener) {
-        if (!decryptedMessageHandlers.add(listener))
-            log.error("Add listener did not change list. Probably listener has been already added.");
-    }
-
-    @Override
-    public void removeDecryptedMessageHandler(DecryptedMessageHandler listener) {
-        if (!decryptedMessageHandlers.remove(listener))
-            log.error("Try to remove listener which was never added.");
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void setupReplyHandler() {
-        peerDHT.peer().objectDataReply((sender, message) -> {
-            //log.debug("Incoming message with peerAddress " + sender);
-            //log.debug("Incoming message with type " + message);
-
-            int messageSize = 0;
-            if (message != null)
-                messageSize = Utilities.objectToBytArray(message).length;
-
-            log.debug("Incoming message with size " + messageSize);
-
-            if (!sender.equals(peerDHT.peer().peerAddress())) {
-                if (messageSize == 0)
-                    log.warn("Received msg is null");
-                else if (messageSize > MAX_MESSAGE_SIZE)
-                    log.warn("Received msg size of  {} is exceeding the max message size of {}.",
-                            Utilities.objectToBytArray(message).length, MAX_MESSAGE_SIZE);
-                else if (message instanceof SealedAndSignedMessage)
-                    executor.execute(() -> decryptedMessageHandlers.stream().forEach(e -> {
-                                MessageWithPubKey messageWithPubKey = null;
-                                try {
-                                    messageWithPubKey = getDecryptedMessageWithPubKey((SealedAndSignedMessage) message);
-                                    //log.debug("decrypted message " + messageWithPubKey.getMessage());
-                                    e.handleMessage(messageWithPubKey, new TomP2PPeer(sender));
-                                } catch (CryptoException e1) {
-                                    e1.printStackTrace();
-                                    log.warn("decryptAndVerifyMessage msg failed", e1.getMessage());
-                                }
-                            }
-                    ));
-                else if (message instanceof Message)
-                    executor.execute(() -> messageHandlers.stream().forEach(e -> e.handleMessage((Message) message, new TomP2PPeer(sender))));
-                else
-                    log.warn("We got an object which is not type of Message. Object = " + message);
-            }
-            else {
-                log.error("Received msg from myself. That must never happen.");
-            }
-            return true;
-        });
-    }
-
-    private MessageWithPubKey getDecryptedMessageWithPubKey(SealedAndSignedMessage message) throws CryptoException {
-        return cryptoService.decryptAndVerifyMessage(message);
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PModule.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PModule.java
deleted file mode 100644
index ea67a11207..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PModule.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.p2p.AddressService;
-import io.bitsquare.p2p.BootstrapNodes;
-import io.bitsquare.p2p.ClientNode;
-import io.bitsquare.p2p.MailboxService;
-import io.bitsquare.p2p.MessageService;
-import io.bitsquare.p2p.Node;
-import io.bitsquare.p2p.P2PModule;
-
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-import com.google.inject.name.Names;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.core.env.Environment;
-
-import static io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder.NETWORK_INTERFACE_UNSPECIFIED;
-
-public class TomP2PModule extends P2PModule {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PModule.class);
-    public static final String BOOTSTRAP_NODE_NAME_KEY = "bootstrap.node.name"; 
-    public static final String BOOTSTRAP_NODE_IP_KEY = "bootstrap.node.ip";
-    public static final String BOOTSTRAP_NODE_P2P_ID_KEY = "bootstrap.node.p2pId";
-    public static final String BOOTSTRAP_NODE_PORT_KEY = "bootstrap.node.port";
-    public static final String NETWORK_INTERFACE_KEY = BootstrappedPeerBuilder.NETWORK_INTERFACE_KEY;
-    public static final String USE_MANUAL_PORT_FORWARDING_KEY = BootstrappedPeerBuilder.USE_MANUAL_PORT_FORWARDING_KEY;
-
-    public TomP2PModule(Environment env) {
-        super(env);
-    }
-
-    @Override
-    protected void doConfigure() {
-        // Used both ClientNode and TomP2PNode for injection
-        bind(BootstrapNodes.class).in(Singleton.class);
-        bind(ClientNode.class).to(TomP2PNode.class).in(Singleton.class);
-        bind(TomP2PNode.class).in(Singleton.class);
-
-        bind(BootstrappedPeerBuilder.class).in(Singleton.class);
-
-        bind(AddressService.class).to(TomP2PAddressService.class).in(Singleton.class);
-        bind(MessageService.class).to(TomP2PMessageService.class).in(Singleton.class);
-        bind(MailboxService.class).to(TomP2PMailboxService.class).in(Singleton.class);
-
-        bind(int.class).annotatedWith(Names.named(Node.PORT_KEY)).toInstance(env.getProperty(Node.PORT_KEY, int.class, Node.CLIENT_PORT));
-        bind(boolean.class).annotatedWith(Names.named(USE_MANUAL_PORT_FORWARDING_KEY)).toInstance(
-                env.getProperty(USE_MANUAL_PORT_FORWARDING_KEY, boolean.class, false));
-
-        bind(Node.class).annotatedWith(Names.named(BootstrapNodes.BOOTSTRAP_NODE_KEY)).toInstance(
-                Node.at(env.getProperty(BOOTSTRAP_NODE_NAME_KEY, ""),
-                        env.getProperty(BOOTSTRAP_NODE_IP_KEY, ""),
-                        Integer.valueOf(env.getProperty(BOOTSTRAP_NODE_P2P_ID_KEY, "-1")),
-                        Integer.valueOf(env.getProperty(BOOTSTRAP_NODE_PORT_KEY, "-1"))
-                ));
-        bindConstant().annotatedWith(Names.named(NETWORK_INTERFACE_KEY)).to(env.getProperty(NETWORK_INTERFACE_KEY, NETWORK_INTERFACE_UNSPECIFIED));
-    }
-
-    @Override
-    protected void doClose(Injector injector) {
-        log.trace("doClose " + getClass().getSimpleName());
-        // First shut down AddressService to remove address from DHT
-        injector.getInstance(AddressService.class).shutDown();
-        injector.getInstance(BootstrappedPeerBuilder.class).shutDown();
-        injector.getInstance(MailboxService.class).shutDown();
-        injector.getInstance(MessageService.class).shutDown();
-
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PNode.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PNode.java
deleted file mode 100644
index c9a8e390ae..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PNode.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.BitsquareException;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.p2p.BaseP2PService;
-import io.bitsquare.p2p.ClientNode;
-
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.SettableFuture;
-
-import java.security.KeyPair;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Executor;
-
-import javax.annotation.Nullable;
-
-import javax.inject.Inject;
-
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ReadOnlyIntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-
-import net.tomp2p.dht.PeerDHT;
-import net.tomp2p.peers.PeerAddress;
-import net.tomp2p.peers.PeerMapChangeListener;
-import net.tomp2p.peers.PeerStatistic;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import rx.Observable;
-import rx.subjects.BehaviorSubject;
-import rx.subjects.Subject;
-
-public class TomP2PNode implements ClientNode {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PNode.class);
-
-    private PeerDHT peerDHT;
-    private BootstrappedPeerBuilder bootstrappedPeerBuilder;
-    private final Subject<BootstrappedPeerBuilder.State, BootstrappedPeerBuilder.State> bootstrapStateSubject;
-    private final List<ResultHandler> resultHandlers = new CopyOnWriteArrayList<>();
-    private final IntegerProperty numPeers = new SimpleIntegerProperty(0);
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public TomP2PNode(BootstrappedPeerBuilder bootstrappedPeerBuilder) {
-        this.bootstrappedPeerBuilder = bootstrappedPeerBuilder;
-        bootstrapStateSubject = BehaviorSubject.create();
-    }
-
-    // for unit testing
-    TomP2PNode(KeyPair keyPair, PeerDHT peerDHT) {
-        this.peerDHT = peerDHT;
-        peerDHT.peerBean().keyPair(keyPair);
-        bootstrapStateSubject = BehaviorSubject.create();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Public methods
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setExecutor(Executor executor) {
-        bootstrappedPeerBuilder.setExecutor(executor);
-    }
-
-    public Observable<BootstrappedPeerBuilder.State> bootstrap(KeyPair keyPair) {
-        bootstrappedPeerBuilder.setKeyPair(keyPair);
-
-        bootstrappedPeerBuilder.getState().addListener((ov, oldValue, newValue) -> {
-            log.debug("BootstrapState changed " + newValue);
-            bootstrapStateSubject.onNext(newValue);
-        });
-
-        SettableFuture<PeerDHT> bootstrapFuture = bootstrappedPeerBuilder.start();
-        Futures.addCallback(bootstrapFuture, new FutureCallback<PeerDHT>() {
-            @Override
-            public void onSuccess(@Nullable PeerDHT peerDHT) {
-                if (peerDHT != null) {
-                    TomP2PNode.this.peerDHT = peerDHT;
-
-                    BaseP2PService.getUserThread().execute(() -> numPeers.set(peerDHT.peerBean().peerMap().all().size()));
-                    log.debug("Number of peers = " + peerDHT.peerBean().peerMap().all().size());
-
-                    peerDHT.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() {
-                        @Override
-                        public void peerInserted(PeerAddress peerAddress, boolean b) {
-                            BaseP2PService.getUserThread().execute(() -> numPeers.set(peerDHT.peerBean().peerMap().all().size()));
-                            log.debug("peerInserted " + peerAddress);
-                            log.debug("Number of peers = " + peerDHT.peerBean().peerMap().all().size());
-                        }
-
-                        @Override
-                        public void peerRemoved(PeerAddress peerAddress, PeerStatistic peerStatistic) {
-                            BaseP2PService.getUserThread().execute(() -> numPeers.set(peerDHT.peerBean().peerMap().all().size()));
-                            log.debug("peerRemoved " + peerAddress);
-                            log.debug("Number of peers = " + peerDHT.peerBean().peerMap().all().size());
-                        }
-
-                        @Override
-                        public void peerUpdated(PeerAddress peerAddress, PeerStatistic peerStatistic) {
-                            BaseP2PService.getUserThread().execute(() -> numPeers.set(peerDHT.peerBean().peerMap().all().size()));
-                            // log.debug("peerUpdated " + peerAddress);
-                            // log.debug("Number of peers = " + peerDHT.peerBean().peerMap().all().size());
-                        }
-                    });
-                 /*   peerDHT.peerBean().addPeerStatusListener(new PeerStatusListener() {
-                        @Override
-                        public boolean peerFailed(PeerAddress peerAddress, PeerException e) {
-                            return false;
-                        }
-
-                        @Override
-                        public boolean peerFound(PeerAddress peerAddress, PeerAddress peerAddress1, PeerConnection peerConnection, RTT rtt) {
-                            BaseP2PService.getUserThread().execute(() -> numPeers.set(peerDHT.peerBean().peerMap().size()));
-                            return false;
-                        }
-                    });*/
-
-                    resultHandlers.stream().forEach(ResultHandler::handleResult);
-                    bootstrapStateSubject.onCompleted();
-                }
-                else {
-                    log.error("Error at bootstrap: peerDHT = null");
-                    bootstrapStateSubject.onError(new BitsquareException("Error at bootstrap: peerDHT = null"));
-                }
-            }
-
-            @Override
-            public void onFailure(@NotNull Throwable t) {
-                log.error("Exception at bootstrap " + t.getMessage());
-                bootstrapStateSubject.onError(t);
-            }
-        });
-
-        return bootstrapStateSubject.asObservable();
-    }
-
-    public PeerDHT getPeerDHT() {
-        return peerDHT;
-    }
-
-    @Override
-    public BootstrappedPeerBuilder.ConnectionType getConnectionType() {
-        return bootstrappedPeerBuilder.getConnectionType();
-    }
-
-    public String getClientNodeInfo() {
-        PeerAddress peerAddress = peerDHT.peerBean().serverPeerAddress();
-        return "IP='" + peerAddress.inetAddress().getHostAddress() + '\'' +
-                "; P2P network ID='" + peerDHT.peer().p2pId() + '\'' +
-                "; port=" + peerAddress.peerSocketAddress().tcpPort();
-    }
-
-    public void addResultHandler(ResultHandler resultHandler) {
-        resultHandlers.add(resultHandler);
-    }
-
-    public void removeResultHandler(ResultHandler resultHandler) {
-        resultHandlers.remove(resultHandler);
-    }
-
-    public int getNumPeers() {
-        return numPeers.get();
-    }
-
-    public ReadOnlyIntegerProperty numPeersProperty() {
-        return numPeers;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PPeer.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PPeer.java
deleted file mode 100644
index 63aeaa0ebd..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PPeer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Peer;
-
-import com.google.common.base.Objects;
-
-import java.io.Serializable;
-
-import javax.annotation.concurrent.Immutable;
-
-import net.tomp2p.peers.PeerAddress;
-
-/**
- * A {@link Peer} implementation that encapsulates a TomP2P {@link PeerAddress}.
- *
- * @author Chris Beams
- */
-@Immutable
-public class TomP2PPeer implements Peer, Serializable {
-    // That object is sent over the wire, so we need to take care of version compatibility.
-    private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
-
-    private final PeerAddress peerAddress;
-
-    public TomP2PPeer(PeerAddress peerAddress) {
-        this.peerAddress = peerAddress;
-    }
-
-    public PeerAddress getPeerAddress() {
-        return peerAddress;
-    }
-
-    public String toString() {
-        return Objects.toStringHelper(this)
-                .add("peerAddress", peerAddress)
-                .toString();
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PService.java
deleted file mode 100644
index af3d201055..0000000000
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import io.bitsquare.p2p.BaseP2PService;
-
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * That service delivers direct messaging and DHT functionality from the TomP2P library
- * It is the translating domain specific functionality to the messaging layer.
- * The TomP2P library codebase shall not be used outside that service.
- * That way we limit the dependency of the TomP2P library only to that class (and it's sub components).
- * <p/>
- */
-public class TomP2PService extends BaseP2PService {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PService.class);
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public TomP2PService(TomP2PNode tomP2PNode) {
-        tomP2PNode.addResultHandler(() -> {
-            peerDHT = tomP2PNode.getPeerDHT();
-            bootstrapCompleted();
-        });
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/storage/FileManager.java b/core/src/main/java/io/bitsquare/storage/FileManager.java
index af472d40a8..415a13d44f 100644
--- a/core/src/main/java/io/bitsquare/storage/FileManager.java
+++ b/core/src/main/java/io/bitsquare/storage/FileManager.java
@@ -18,13 +18,13 @@
 /**
  * Copyright 2013 Google Inc.
  * Copyright 2014 Andreas Schildbach
- * <p/>
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,30 +35,22 @@
 package io.bitsquare.storage;
 
 
-import org.bitcoinj.core.Utils;
-import org.bitcoinj.utils.Threading;
-
 import com.google.common.io.Files;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.bitsquare.common.UserThread;
+import org.bitcoinj.core.Utils;
+import org.bitcoinj.utils.Threading;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
+import java.io.*;
 import java.nio.file.Paths;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -97,17 +89,17 @@ public class FileManager<T> {
                 .setPriority(Thread.MIN_PRIORITY);  // Avoid competing with the GUI thread.
 
         // An executor that starts up threads when needed and shuts them down later.
-        this.executor = new ScheduledThreadPoolExecutor(1, builder.build());
-        this.executor.setKeepAliveTime(5, TimeUnit.SECONDS);
-        this.executor.allowCoreThreadTimeOut(true);
-        this.executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+        executor = new ScheduledThreadPoolExecutor(1, builder.build());
+        executor.setKeepAliveTime(5, TimeUnit.SECONDS);
+        executor.allowCoreThreadTimeOut(true);
+        executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
 
         // File must only be accessed from the auto-save executor from now on, to avoid simultaneous access.
-        this.savePending = new AtomicBoolean();
+        savePending = new AtomicBoolean();
         this.delay = delay;
         this.delayTimeUnit = checkNotNull(delayTimeUnit);
 
-        this.saver = () -> {
+        saver = () -> {
             // Runs in an auto save thread.
             if (!savePending.getAndSet(false)) {
                 // Some other scheduled request already beat us to it.
@@ -121,7 +113,7 @@ public class FileManager<T> {
             @Override
             public void run() {
                 try {
-                    FileManager.this.shutdown();
+                    FileManager.this.shutDown();
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -137,7 +129,7 @@ public class FileManager<T> {
     /**
      * Actually write the wallet file to disk, using an atomic rename when possible. Runs on the current thread.
      */
-    public void saveNow(T serializable) throws IOException {
+    public void saveNow(T serializable) {
         saveNowInternal(serializable);
     }
 
@@ -152,12 +144,15 @@ public class FileManager<T> {
         executor.schedule(saver, delay, delayTimeUnit);
     }
 
-    public T read(File file) throws IOException, ClassNotFoundException {
+    public T read(File file) {
         log.debug("read" + file);
         lock.lock();
         try (final FileInputStream fileInputStream = new FileInputStream(file);
              final ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream)) {
             return (T) objectInputStream.readObject();
+        } catch (Throwable t) {
+            log.error("Exception at read: " + t.getMessage());
+            return null;
         } finally {
             lock.unlock();
         }
@@ -190,7 +185,7 @@ public class FileManager<T> {
     /**
      * Shut down auto-saving.
      */
-    public void shutdown() {
+    public void shutDown() {
       /*  if (serializable != null)
             log.debug("shutDown " + serializable.getClass().getSimpleName());
         else
@@ -198,9 +193,10 @@ public class FileManager<T> {
 
         executor.shutdown();
         try {
-            executor.awaitTermination(Long.MAX_VALUE, TimeUnit.DAYS); // forever
-        } catch (InterruptedException x) {
-            throw new RuntimeException(x);
+            //executor.awaitTermination(Long.MAX_VALUE, TimeUnit.DAYS); // forever
+            executor.awaitTermination(5, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         }
     }
 
@@ -241,7 +237,7 @@ public class FileManager<T> {
     private void saveNowInternal(T serializable) {
         long now = System.currentTimeMillis();
         saveToFile(serializable, dir, storageFile);
-        Threading.USER_THREAD.execute(() -> log.info("Save {} completed in {}msec", storageFile, System.currentTimeMillis() - now));
+        UserThread.execute(() -> log.info("Save {} completed in {}msec", storageFile, System.currentTimeMillis() - now));
     }
 
     private void saveToFile(T serializable, File dir, File storageFile) {
@@ -264,7 +260,6 @@ public class FileManager<T> {
 
             // TODO ConcurrentModificationException happens sometimes at that line
             objectOutputStream.writeObject(serializable);
-
             // Attempt to force the bits to hit the disk. In reality the OS or hard disk itself may still decide
             // to not write through to physical media for at least a few seconds, but this is the best we can do.
             fileOutputStream.flush();
@@ -313,8 +308,7 @@ public class FileManager<T> {
                 if (!tempFile.renameTo(canonical)) {
                     throw new IOException("Failed to rename " + tempFile + " to " + canonical);
                 }
-            }
-            else if (!tempFile.renameTo(file)) {
+            } else if (!tempFile.renameTo(file)) {
                 throw new IOException("Failed to rename " + tempFile + " to " + file);
             }
         } finally {
diff --git a/core/src/main/java/io/bitsquare/storage/Storage.java b/core/src/main/java/io/bitsquare/storage/Storage.java
index f5e82e1137..11a7a52c2f 100644
--- a/core/src/main/java/io/bitsquare/storage/Storage.java
+++ b/core/src/main/java/io/bitsquare/storage/Storage.java
@@ -18,20 +18,18 @@
 package io.bitsquare.storage;
 
 import com.google.common.base.Throwables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Named;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * That class handles the storage of a particular object to disk using Java serialisation.
@@ -39,15 +37,15 @@ import org.slf4j.LoggerFactory;
  * Java serialisation is tolerant with added fields, but removing or changing existing fields will break the backwards compatibility.
  * Alternative frameworks for serialisation like Kyro or mapDB have shown problems with version migration, so we stuck with plain Java
  * serialisation.
- * <p/>
+ * <p>
  * For every data object we write a separate file to minimize the risk of corrupted files in case of inconsistency from newer versions.
  * In case of a corrupted file we backup the old file to a separate directory, so if it holds critical data it might be helpful for recovery.
- * <p/>
+ * <p>
  * We also backup at first read the file, so we have a valid file form the latest version in case a write operation corrupted the file.
- * <p/>
+ * <p>
  * The read operation is triggered just at object creation (startup) and is at the moment not executed on a background thread to avoid asynchronous behaviour.
  * As the data are small and it is just one read access the performance penalty is small and might be even worse to create and setup a thread for it.
- * <p/>
+ * <p>
  * The write operation used a background thread and supports a delayed write to avoid too many repeated write operations.
  */
 public class Storage<T extends Serializable> {
@@ -98,8 +96,7 @@ public class Storage<T extends Serializable> {
     // Save delayed and on a background thread
     public void queueUpForSave() {
         log.debug("save " + fileName);
-        if (storageFile == null)
-            throw new RuntimeException("storageFile = null. Call setupFileStorage before using read/write.");
+        checkNotNull(storageFile, "storageFile = null. Call setupFileStorage before using read/write.");
 
         fileManager.saveLater(serializable);
     }
@@ -129,7 +126,7 @@ public class Storage<T extends Serializable> {
                 log.info("Backup {} completed in {}msec", serializable.getClass().getSimpleName(), System.currentTimeMillis() - now);
 
                 return persistedObject;
-            } catch (ClassCastException | ClassNotFoundException | IOException e) {
+            } catch (ClassCastException | IOException e) {
                 e.printStackTrace();
                 log.error("Version of persisted class has changed. We cannot read the persisted data anymore. We make a backup and remove the inconsistent " +
                         "file.");
diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java
index b75a3ad9b3..d491ac068c 100644
--- a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java
+++ b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java
@@ -18,21 +18,22 @@
 package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.btc.FeePolicy;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.trade.BuyerAsOffererProtocol;
 import io.bitsquare.trade.protocol.trade.OffererProtocol;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-
 import org.bitcoinj.core.Coin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BuyerAsOffererTrade extends BuyerTrade implements OffererTrade, Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
@@ -50,10 +51,13 @@ public class BuyerAsOffererTrade extends BuyerTrade implements OffererTrade, Ser
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-
-        initStateProperties();
-        initAmountProperty();
+        try {
+            in.defaultReadObject();
+            initStateProperties();
+            initAmountProperty();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
     @Override
@@ -67,13 +71,15 @@ public class BuyerAsOffererTrade extends BuyerTrade implements OffererTrade, Ser
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void handleTakeOfferRequest(TradeMessage message, Peer taker) {
+    public void handleTakeOfferRequest(TradeMessage message, Address taker) {
         ((OffererProtocol) tradeProtocol).handleTakeOfferRequest(message, taker);
     }
 
     @Override
     public Coin getPayoutAmount() {
-        return getSecurityDeposit().add(getTradeAmount());
+        checkNotNull(getTradeAmount(), "Invalid state: getTradeAmount() = null");
+
+        return FeePolicy.SECURITY_DEPOSIT.add(getTradeAmount());
     }
 
 }
diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java
index 9c3ad201af..ecaf826d79 100644
--- a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java
+++ b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java
@@ -18,20 +18,22 @@
 package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.btc.FeePolicy;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.trade.BuyerAsTakerProtocol;
 import io.bitsquare.trade.protocol.trade.TakerProtocol;
-
 import org.bitcoinj.core.Coin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade, Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
@@ -44,15 +46,18 @@ public class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade, Seriali
     // Constructor, initialization
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public BuyerAsTakerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, Storage<? extends TradableList> storage) {
-        super(offer, tradeAmount, tradingPeer, storage);
+    public BuyerAsTakerTrade(Offer offer, Coin tradeAmount, Address tradingPeerAddress, Storage<? extends TradableList> storage) {
+        super(offer, tradeAmount, tradingPeerAddress, storage);
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-
-        initStateProperties();
-        initAmountProperty();
+        try {
+            in.defaultReadObject();
+            initStateProperties();
+            initAmountProperty();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
     @Override
@@ -67,12 +72,14 @@ public class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade, Seriali
 
     @Override
     public void takeAvailableOffer() {
-        assert tradeProtocol instanceof TakerProtocol;
+        checkArgument(tradeProtocol instanceof TakerProtocol, "tradeProtocol NOT instanceof TakerProtocol");
         ((TakerProtocol) tradeProtocol).takeAvailableOffer();
     }
 
     @Override
     public Coin getPayoutAmount() {
-        return getSecurityDeposit().add(getTradeAmount());
+        checkNotNull(getTradeAmount(), "Invalid state: getTradeAmount() = null");
+
+        return FeePolicy.SECURITY_DEPOSIT.add(getTradeAmount());
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/BuyerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerTrade.java
index a1266dc1a0..b3237afdff 100644
--- a/core/src/main/java/io/bitsquare/trade/BuyerTrade.java
+++ b/core/src/main/java/io/bitsquare/trade/BuyerTrade.java
@@ -18,19 +18,17 @@
 package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.trade.BuyerProtocol;
-
 import org.bitcoinj.core.Coin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 
-import java.util.Date;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkArgument;
 
 public abstract class BuyerTrade extends Trade implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
@@ -38,8 +36,8 @@ public abstract class BuyerTrade extends Trade implements Serializable {
 
     transient private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererTrade.class);
 
-    public BuyerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, Storage<? extends TradableList> storage) {
-        super(offer, tradeAmount, tradingPeer, storage);
+    public BuyerTrade(Offer offer, Coin tradeAmount, Address tradingPeerAddress, Storage<? extends TradableList> storage) {
+        super(offer, tradeAmount, tradingPeerAddress, storage);
     }
 
     public BuyerTrade(Offer offer, Storage<? extends TradableList> storage) {
@@ -48,92 +46,26 @@ public abstract class BuyerTrade extends Trade implements Serializable {
 
     @Override
     protected void initStates() {
-        if (tradeState == null)
-            tradeState = TradeState.BuyerState.PREPARATION;
-        initStateProperties();
+        if (state == null)
+            state = State.PREPARATION;
     }
 
     public void onFiatPaymentStarted() {
-        assert tradeProtocol instanceof BuyerProtocol;
+        checkArgument(tradeProtocol instanceof BuyerProtocol, "tradeProtocol NOT instanceof BuyerProtocol");
         ((BuyerProtocol) tradeProtocol).onFiatPaymentStarted();
     }
 
 
-    @Override
-    public boolean isFailedState() {
-        return tradeState == TradeState.BuyerState.FAILED;
-    }
-
-    @Override
-    public void setFailedState() {
-        TradeState tradeState = TradeState.BuyerState.FAILED;
-        // We store the phase of the last state into the failed state
-        tradeState.setPhase(tradeState.getPhase());
-        setTradeState(tradeState);
-    }
-
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Setter for Mutable objects
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void setTradeState(TradeState tradeState) {
-        super.setTradeState(tradeState);
+    public void setState(State state) {
+        super.setState(state);
 
-        switch ((TradeState.BuyerState) tradeState) {
-            case PREPARATION:
-                break;
-
-            case DEPOSIT_PUBLISHED:
-                takeOfferDate = new Date();
-
-                if (this instanceof OffererTrade)
-                    openOfferManager.closeOpenOffer(getOffer());
-                break;
-            case DEPOSIT_PUBLISHED_MSG_SENT:
-                break;
-            case DEPOSIT_CONFIRMED:
-                break;
-
-            case FIAT_PAYMENT_STARTED:
-                break;
-            case FIAT_PAYMENT_STARTED_MSG_SENT:
-                break;
-
-            case FIAT_PAYMENT_RECEIPT_MSG_RECEIVED:
-                break;
-
-            case PAYOUT_TX_COMMITTED:
-                break;
-            case PAYOUT_TX_SENT:
-                break;
-
-            case PAYOUT_BROAD_CASTED:
-                break;
-
-            case WITHDRAW_COMPLETED:
-                disposeProtocol();
-                break;
-
-            case FAILED:
-                disposeProtocol();
-                break;
-
-            default:
-                log.error("Unhandled state " + tradeState);
-                break;
-        }
+        if (state == State.WITHDRAW_COMPLETED)
+            tradeProtocol.completed();
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Protected
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void handleConfidenceResult() {
-        if (((TradeState.BuyerState) tradeState).ordinal() < TradeState.BuyerState.DEPOSIT_CONFIRMED.ordinal())
-            setTradeState(TradeState.BuyerState.DEPOSIT_CONFIRMED);
-    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/Contract.java b/core/src/main/java/io/bitsquare/trade/Contract.java
index 280113a2ce..9fdc5cf846 100644
--- a/core/src/main/java/io/bitsquare/trade/Contract.java
+++ b/core/src/main/java/io/bitsquare/trade/Contract.java
@@ -18,64 +18,232 @@
 package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.common.util.JsonExclude;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.payment.PaymentAccountContractData;
 import io.bitsquare.trade.offer.Offer;
-
 import org.bitcoinj.core.Coin;
 
-import java.io.Serializable;
-
 import javax.annotation.concurrent.Immutable;
+import java.io.Serializable;
+import java.util.Arrays;
+
+import static com.google.common.base.Preconditions.checkArgument;
 
 @SuppressWarnings("WeakerAccess")
 @Immutable
 public class Contract implements Serializable {
     // That object is sent over the wire, so we need to take care of version compatibility.
-    private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
+    @JsonExclude
+    public static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
     public final Offer offer;
+    private final long tradeAmount;
     public final String takeOfferFeeTxID;
-    public final Coin tradeAmount;
-    public final String buyerAccountID;
-    public final String sellerAccountID;
-    public final FiatAccount buyerFiatAccount;
-    public final FiatAccount sellerFiatAccount;
-    public final String buyerP2pSigPubKeyAsString;
-    public final String sellerP2pSigPubKeyAsString;
+    public final Address arbitratorAddress;
+    private final boolean isBuyerOffererOrSellerTaker;
+    private final String offererAccountId;
+    private final String takerAccountId;
+    private final PaymentAccountContractData offererPaymentAccountContractData;
+    private final PaymentAccountContractData takerPaymentAccountContractData;
+    @JsonExclude
+    private final PubKeyRing offererPubKeyRing;
+    @JsonExclude
+    private final PubKeyRing takerPubKeyRing;
+    private final Address buyerAddress;
+    private final Address sellerAddress;
+
+
+    private final String offererPayoutAddressString;
+    private final String takerPayoutAddressString;
+    @JsonExclude
+    private final byte[] offererBtcPubKey;
+    @JsonExclude
+    private final byte[] takerBtcPubKey;
+
+    // TODO some basic TAC
+    public final String tac = "With my signature I commit to the trading agreement of Bitsquare and to fulfill the trade as defined there.";
+
 
     public Contract(Offer offer,
                     Coin tradeAmount,
                     String takeOfferFeeTxID,
-                    String buyerAccountID,
-                    String sellerAccountID,
-                    FiatAccount buyerFiatAccount,
-                    FiatAccount sellerFiatAccount,
-                    PubKeyRing buyerPubKeyRing,
-                    PubKeyRing sellerPubKeyRing) {
+                    Address buyerAddress,
+                    Address sellerAddress,
+                    Address arbitratorAddress,
+                    boolean isBuyerOffererOrSellerTaker,
+                    String offererAccountId,
+                    String takerAccountId,
+                    PaymentAccountContractData offererPaymentAccountContractData,
+                    PaymentAccountContractData takerPaymentAccountContractData,
+                    PubKeyRing offererPubKeyRing,
+                    PubKeyRing takerPubKeyRing,
+                    String offererPayoutAddressString,
+                    String takerPayoutAddressString,
+                    byte[] offererBtcPubKey,
+                    byte[] takerBtcPubKey) {
         this.offer = offer;
-        this.tradeAmount = tradeAmount;
+        this.buyerAddress = buyerAddress;
+        this.sellerAddress = sellerAddress;
+        this.tradeAmount = tradeAmount.value;
         this.takeOfferFeeTxID = takeOfferFeeTxID;
-        this.buyerAccountID = buyerAccountID;
-        this.sellerAccountID = sellerAccountID;
-        this.buyerFiatAccount = buyerFiatAccount;
-        this.sellerFiatAccount = sellerFiatAccount;
-        this.buyerP2pSigPubKeyAsString = buyerPubKeyRing.toString();
-        this.sellerP2pSigPubKeyAsString = sellerPubKeyRing.toString();
+        this.arbitratorAddress = arbitratorAddress;
+        this.isBuyerOffererOrSellerTaker = isBuyerOffererOrSellerTaker;
+        this.offererAccountId = offererAccountId;
+        this.takerAccountId = takerAccountId;
+        this.offererPaymentAccountContractData = offererPaymentAccountContractData;
+        this.takerPaymentAccountContractData = takerPaymentAccountContractData;
+        this.offererPubKeyRing = offererPubKeyRing;
+        this.takerPubKeyRing = takerPubKeyRing;
+        this.offererPayoutAddressString = offererPayoutAddressString;
+        this.takerPayoutAddressString = takerPayoutAddressString;
+        this.offererBtcPubKey = offererBtcPubKey;
+        this.takerBtcPubKey = takerBtcPubKey;
+    }
+
+    public String getBuyerAccountId() {
+        return isBuyerOffererOrSellerTaker ? offererAccountId : takerAccountId;
+    }
+
+    public String getSellerAccountId() {
+        return isBuyerOffererOrSellerTaker ? takerAccountId : offererAccountId;
+    }
+
+
+    public String getBuyerPayoutAddressString() {
+        return isBuyerOffererOrSellerTaker ? offererPayoutAddressString : takerPayoutAddressString;
+    }
+
+    public String getSellerPayoutAddressString() {
+        return isBuyerOffererOrSellerTaker ? takerPayoutAddressString : offererPayoutAddressString;
+    }
+
+    public PubKeyRing getBuyerPubKeyRing() {
+        return isBuyerOffererOrSellerTaker ? offererPubKeyRing : takerPubKeyRing;
+    }
+
+    public PubKeyRing getSellerPubKeyRing() {
+        return isBuyerOffererOrSellerTaker ? takerPubKeyRing : offererPubKeyRing;
+    }
+
+    public byte[] getBuyerBtcPubKey() {
+        return isBuyerOffererOrSellerTaker ? offererBtcPubKey : takerBtcPubKey;
+    }
+
+    public byte[] getSellerBtcPubKey() {
+        return isBuyerOffererOrSellerTaker ? takerBtcPubKey : offererBtcPubKey;
+    }
+
+    public PaymentAccountContractData getBuyerPaymentAccountContractData() {
+        return isBuyerOffererOrSellerTaker ? offererPaymentAccountContractData : takerPaymentAccountContractData;
+    }
+
+    public PaymentAccountContractData getSellerPaymentAccountContractData() {
+        return isBuyerOffererOrSellerTaker ? takerPaymentAccountContractData : offererPaymentAccountContractData;
+    }
+
+    public String getPaymentMethodName() {
+        // PaymentMethod need to be the same
+        checkArgument(offererPaymentAccountContractData.getPaymentMethodName().equals(takerPaymentAccountContractData.getPaymentMethodName()),
+                "NOT offererPaymentAccountContractData.getPaymentMethodName().equals(takerPaymentAccountContractData.getPaymentMethodName())");
+        return offererPaymentAccountContractData.getPaymentMethodName();
+    }
+
+    public Coin getTradeAmount() {
+        return Coin.valueOf(tradeAmount);
+    }
+
+    public Address getBuyerAddress() {
+        return buyerAddress;
+    }
+
+
+    public Address getSellerAddress() {
+        return sellerAddress;
     }
 
     @Override
     public String toString() {
         return "Contract{" +
-                "offer=" + offer +
-                ", takeOfferFeeTxID='" + takeOfferFeeTxID + '\'' +
+                "tac='" + tac + '\'' +
+                ", offer=" + offer +
                 ", tradeAmount=" + tradeAmount +
-                ", buyerAccountID='" + buyerAccountID + '\'' +
-                ", sellerAccountID='" + sellerAccountID + '\'' +
-                ", buyerFiatAccount=" + buyerFiatAccount +
-                ", sellerFiatAccount=" + sellerFiatAccount +
-                ", buyerP2pSigPubKeyAsString='" + buyerP2pSigPubKeyAsString + '\'' +
-                ", sellerP2pSigPubKeyAsString='" + sellerP2pSigPubKeyAsString + '\'' +
+                ", isBuyerOffererOrSellerTaker=" + isBuyerOffererOrSellerTaker +
+                ", takeOfferFeeTxID='" + takeOfferFeeTxID + '\'' +
+                ", offererAccountID='" + offererAccountId + '\'' +
+                ", takerAccountID='" + takerAccountId + '\'' +
+                ", offererPaymentAccount=" + offererPaymentAccountContractData +
+                ", takerPaymentAccount=" + takerPaymentAccountContractData +
+                ", offererPubKeyRing=" + offererPubKeyRing +
+                ", takerPubKeyRing=" + takerPubKeyRing +
+                ", offererPayoutAddressString='" + offererPayoutAddressString + '\'' +
+                ", takerPayoutAddressString='" + takerPayoutAddressString + '\'' +
+                ", offererBtcPubKey=" + Arrays.toString(offererBtcPubKey) +
+                ", takerBtcPubKey=" + Arrays.toString(takerBtcPubKey) +
                 '}';
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Contract)) return false;
+
+        Contract contract = (Contract) o;
+
+        if (tradeAmount != contract.tradeAmount) return false;
+        if (isBuyerOffererOrSellerTaker != contract.isBuyerOffererOrSellerTaker) return false;
+        if (offer != null ? !offer.equals(contract.offer) : contract.offer != null) return false;
+        if (takeOfferFeeTxID != null ? !takeOfferFeeTxID.equals(contract.takeOfferFeeTxID) : contract.takeOfferFeeTxID != null)
+            return false;
+        if (arbitratorAddress != null ? !arbitratorAddress.equals(contract.arbitratorAddress) : contract.arbitratorAddress != null)
+            return false;
+        if (offererAccountId != null ? !offererAccountId.equals(contract.offererAccountId) : contract.offererAccountId != null)
+            return false;
+        if (takerAccountId != null ? !takerAccountId.equals(contract.takerAccountId) : contract.takerAccountId != null)
+            return false;
+        if (offererPaymentAccountContractData != null ? !offererPaymentAccountContractData.equals(contract.offererPaymentAccountContractData) : contract.offererPaymentAccountContractData != null)
+            return false;
+        if (takerPaymentAccountContractData != null ? !takerPaymentAccountContractData.equals(contract.takerPaymentAccountContractData) : contract.takerPaymentAccountContractData != null)
+            return false;
+        if (offererPubKeyRing != null ? !offererPubKeyRing.equals(contract.offererPubKeyRing) : contract.offererPubKeyRing != null)
+            return false;
+        if (takerPubKeyRing != null ? !takerPubKeyRing.equals(contract.takerPubKeyRing) : contract.takerPubKeyRing != null)
+            return false;
+        if (buyerAddress != null ? !buyerAddress.equals(contract.buyerAddress) : contract.buyerAddress != null)
+            return false;
+        if (sellerAddress != null ? !sellerAddress.equals(contract.sellerAddress) : contract.sellerAddress != null)
+            return false;
+        if (offererPayoutAddressString != null ? !offererPayoutAddressString.equals(contract.offererPayoutAddressString) : contract.offererPayoutAddressString != null)
+            return false;
+        if (takerPayoutAddressString != null ? !takerPayoutAddressString.equals(contract.takerPayoutAddressString) : contract.takerPayoutAddressString != null)
+            return false;
+        if (!Arrays.equals(offererBtcPubKey, contract.offererBtcPubKey)) return false;
+        if (!Arrays.equals(takerBtcPubKey, contract.takerBtcPubKey)) return false;
+        return !(tac != null ? !tac.equals(contract.tac) : contract.tac != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = offer != null ? offer.hashCode() : 0;
+        result = 31 * result + (int) (tradeAmount ^ (tradeAmount >>> 32));
+        result = 31 * result + (takeOfferFeeTxID != null ? takeOfferFeeTxID.hashCode() : 0);
+        result = 31 * result + (arbitratorAddress != null ? arbitratorAddress.hashCode() : 0);
+        result = 31 * result + (isBuyerOffererOrSellerTaker ? 1 : 0);
+        result = 31 * result + (offererAccountId != null ? offererAccountId.hashCode() : 0);
+        result = 31 * result + (takerAccountId != null ? takerAccountId.hashCode() : 0);
+        result = 31 * result + (offererPaymentAccountContractData != null ? offererPaymentAccountContractData.hashCode() : 0);
+        result = 31 * result + (takerPaymentAccountContractData != null ? takerPaymentAccountContractData.hashCode() : 0);
+        result = 31 * result + (offererPubKeyRing != null ? offererPubKeyRing.hashCode() : 0);
+        result = 31 * result + (takerPubKeyRing != null ? takerPubKeyRing.hashCode() : 0);
+        result = 31 * result + (buyerAddress != null ? buyerAddress.hashCode() : 0);
+        result = 31 * result + (sellerAddress != null ? sellerAddress.hashCode() : 0);
+        result = 31 * result + (offererPayoutAddressString != null ? offererPayoutAddressString.hashCode() : 0);
+        result = 31 * result + (takerPayoutAddressString != null ? takerPayoutAddressString.hashCode() : 0);
+        result = 31 * result + (offererBtcPubKey != null ? Arrays.hashCode(offererBtcPubKey) : 0);
+        result = 31 * result + (takerBtcPubKey != null ? Arrays.hashCode(takerBtcPubKey) : 0);
+        result = 31 * result + (tac != null ? tac.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/OffererTrade.java b/core/src/main/java/io/bitsquare/trade/OffererTrade.java
index 4059bc53b8..340e9fd24c 100644
--- a/core/src/main/java/io/bitsquare/trade/OffererTrade.java
+++ b/core/src/main/java/io/bitsquare/trade/OffererTrade.java
@@ -17,9 +17,10 @@
 
 package io.bitsquare.trade;
 
-import io.bitsquare.p2p.Peer;
+
+import io.bitsquare.p2p.Address;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
 
 public interface OffererTrade {
-    void handleTakeOfferRequest(TradeMessage message, Peer taker);
+    void handleTakeOfferRequest(TradeMessage message, Address peerAddress);
 }
diff --git a/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java
index 8af27c7e27..2e8122d036 100644
--- a/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java
+++ b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java
@@ -18,20 +18,19 @@
 package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.trade.OffererProtocol;
 import io.bitsquare.trade.protocol.trade.SellerAsOffererProtocol;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class SellerAsOffererTrade extends SellerTrade implements OffererTrade, Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
@@ -48,10 +47,13 @@ public class SellerAsOffererTrade extends SellerTrade implements OffererTrade, S
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-
-        initStateProperties();
-        initAmountProperty();
+        try {
+            in.defaultReadObject();
+            initStateProperties();
+            initAmountProperty();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
     @Override
@@ -65,7 +67,7 @@ public class SellerAsOffererTrade extends SellerTrade implements OffererTrade, S
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void handleTakeOfferRequest(TradeMessage message, Peer taker) {
+    public void handleTakeOfferRequest(TradeMessage message, Address taker) {
         ((OffererProtocol) tradeProtocol).handleTakeOfferRequest(message, taker);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java
index 6dc0f24d04..81d0cd4923 100644
--- a/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java
+++ b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java
@@ -18,19 +18,19 @@
 package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.trade.SellerAsTakerProtocol;
 import io.bitsquare.trade.protocol.trade.TakerProtocol;
-
 import org.bitcoinj.core.Coin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkArgument;
 
 public class SellerAsTakerTrade extends SellerTrade implements TakerTrade, Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
@@ -43,15 +43,18 @@ public class SellerAsTakerTrade extends SellerTrade implements TakerTrade, Seria
     // Constructor, initialization
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public SellerAsTakerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, Storage<? extends TradableList> storage) {
-        super(offer, tradeAmount, tradingPeer, storage);
+    public SellerAsTakerTrade(Offer offer, Coin tradeAmount, Address tradingPeerAddress, Storage<? extends TradableList> storage) {
+        super(offer, tradeAmount, tradingPeerAddress, storage);
     }
 
     private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-
-        initStateProperties();
-        initAmountProperty();
+        try {
+            in.defaultReadObject();
+            initStateProperties();
+            initAmountProperty();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
     @Override
@@ -66,7 +69,7 @@ public class SellerAsTakerTrade extends SellerTrade implements TakerTrade, Seria
 
     @Override
     public void takeAvailableOffer() {
-        assert tradeProtocol instanceof TakerProtocol;
+        checkArgument(tradeProtocol instanceof TakerProtocol, "tradeProtocol NOT instanceof TakerProtocol");
         ((TakerProtocol) tradeProtocol).takeAvailableOffer();
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/SellerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerTrade.java
index bc3f885dc1..e1489ec95a 100644
--- a/core/src/main/java/io/bitsquare/trade/SellerTrade.java
+++ b/core/src/main/java/io/bitsquare/trade/SellerTrade.java
@@ -18,19 +18,17 @@
 package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.trade.SellerProtocol;
-
 import org.bitcoinj.core.Coin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 
-import java.util.Date;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkArgument;
 
 public abstract class SellerTrade extends Trade implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
@@ -38,8 +36,8 @@ public abstract class SellerTrade extends Trade implements Serializable {
 
     transient private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerTrade.class);
 
-    public SellerTrade(Offer offer, Coin tradeAmount, Peer tradingPeer, Storage<? extends TradableList> storage) {
-        super(offer, tradeAmount, tradingPeer, storage);
+    public SellerTrade(Offer offer, Coin tradeAmount, Address tradingPeerAddress, Storage<? extends TradableList> storage) {
+        super(offer, tradeAmount, tradingPeerAddress, storage);
     }
 
     public SellerTrade(Offer offer, Storage<? extends TradableList> storage) {
@@ -48,88 +46,27 @@ public abstract class SellerTrade extends Trade implements Serializable {
 
     @Override
     protected void initStates() {
-        if (tradeState == null)
-            tradeState = TradeState.SellerState.PREPARATION;
-        initStateProperties();
+        if (state == null)
+            state = State.PREPARATION;
     }
 
     public void onFiatPaymentReceived() {
-        assert tradeProtocol instanceof SellerProtocol;
+        checkArgument(tradeProtocol instanceof SellerProtocol, "tradeProtocol NOT instanceof SellerProtocol");
         ((SellerProtocol) tradeProtocol).onFiatPaymentReceived();
     }
 
 
-    public boolean isFailedState() {
-        return tradeState == TradeState.SellerState.FAILED;
-    }
-
-    public void setFailedState() {
-        TradeState tradeState = TradeState.SellerState.FAILED;
-        // We store the phase of the last state into the failed state
-        tradeState.setPhase(tradeState.getPhase());
-        setTradeState(tradeState);
-    }
-
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Setter for Mutable objects
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void setTradeState(TradeState tradeState) {
-        super.setTradeState(tradeState);
+    public void setState(State state) {
+        super.setState(state);
 
-        switch ((TradeState.SellerState) tradeState) {
-
-            case PREPARATION:
-                break;
-
-            case DEPOSIT_PUBLISHED_MSG_RECEIVED:
-                takeOfferDate = new Date();
-                if (this instanceof OffererTrade)
-                    openOfferManager.closeOpenOffer(getOffer());
-                break;
-            case DEPOSIT_CONFIRMED:
-                break;
-
-            case FIAT_PAYMENT_STARTED_MSG_RECEIVED:
-                break;
-
-            case FIAT_PAYMENT_RECEIPT:
-                break;
-            case FIAT_PAYMENT_RECEIPT_MSG_SENT:
-                break;
-
-            case PAYOUT_TX_RECEIVED:
-                break;
-            case PAYOUT_TX_COMMITTED:
-                break;
-
-            case PAYOUT_BROAD_CASTED:
-                break;
-
-            case WITHDRAW_COMPLETED:
-                disposeProtocol();
-                break;
-
-            case FAILED:
-                disposeProtocol();
-                break;
-
-            default:
-                log.error("Unhandled state " + tradeState);
-                break;
-        }
+        if (state == State.WITHDRAW_COMPLETED)
+            tradeProtocol.completed();
     }
 
 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Protected
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void handleConfidenceResult() {
-        if (((TradeState.SellerState) tradeState).ordinal() < TradeState.SellerState.DEPOSIT_CONFIRMED.ordinal())
-            setTradeState(TradeState.SellerState.DEPOSIT_CONFIRMED);
-    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/Tradable.java b/core/src/main/java/io/bitsquare/trade/Tradable.java
index 1309b935ea..1b3f7cabfc 100644
--- a/core/src/main/java/io/bitsquare/trade/Tradable.java
+++ b/core/src/main/java/io/bitsquare/trade/Tradable.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade;
 import io.bitsquare.trade.offer.Offer;
 
 import java.io.Serializable;
-
 import java.util.Date;
 
 public interface Tradable extends Serializable {
@@ -29,4 +28,6 @@ public interface Tradable extends Serializable {
     Date getDate();
 
     String getId();
+
+    String getShortId();
 }
diff --git a/core/src/main/java/io/bitsquare/trade/TradableList.java b/core/src/main/java/io/bitsquare/trade/TradableList.java
index c2963a36f6..5fe0af2662 100644
--- a/core/src/main/java/io/bitsquare/trade/TradableList.java
+++ b/core/src/main/java/io/bitsquare/trade/TradableList.java
@@ -19,19 +19,16 @@ package io.bitsquare.trade;
 
 import io.bitsquare.app.Version;
 import io.bitsquare.storage.Storage;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-
 import java.util.ArrayList;
 
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class TradableList<T extends Tradable> extends ArrayList<T> implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
@@ -59,7 +56,11 @@ public class TradableList<T extends Tradable> extends ArrayList<T> implements Se
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
+        try {
+            in.defaultReadObject();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
     @Override
diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java
index 69484eeeee..501a7fd27a 100644
--- a/core/src/main/java/io/bitsquare/trade/Trade.java
+++ b/core/src/main/java/io/bitsquare/trade/Trade.java
@@ -17,52 +17,41 @@
 
 package io.bitsquare.trade;
 
+import com.google.common.base.Throwables;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import io.bitsquare.app.Version;
-import io.bitsquare.arbitration.ArbitrationRepository;
-import io.bitsquare.btc.BlockChainService;
+import io.bitsquare.arbitration.ArbitratorManager;
+import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.common.taskrunner.Model;
-import io.bitsquare.crypto.CryptoService;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.MessageWithPubKey;
-import io.bitsquare.p2p.AddressService;
-import io.bitsquare.p2p.MessageService;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.messaging.DecryptedMessageWithPubKey;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.offer.OpenOfferManager;
 import io.bitsquare.trade.protocol.trade.ProcessModel;
 import io.bitsquare.trade.protocol.trade.TradeProtocol;
 import io.bitsquare.user.User;
-
+import javafx.beans.property.*;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.utils.Fiat;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-
 import java.util.Date;
 
-import javax.annotation.Nullable;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Holds all data which are relevant to the trade, but not those which are only needed in the trade process as shared data between tasks. Those data are
  * stored in the task model.
@@ -73,20 +62,72 @@ abstract public class Trade implements Tradable, Model, Serializable {
 
     private transient static final Logger log = LoggerFactory.getLogger(Trade.class);
 
-  /*  public enum CriticalPhase {
+    public enum State {
+        PREPARATION(Phase.PREPARATION),
+
+        TAKER_FEE_PAID(Phase.TAKER_FEE_PAID),
+
+        DEPOSIT_PUBLISH_REQUESTED(Phase.DEPOSIT_REQUESTED),
+        DEPOSIT_PUBLISHED(Phase.DEPOSIT_PAID),
+        DEPOSIT_SEEN_IN_NETWORK(Phase.DEPOSIT_PAID), // triggered by balance update, used only in error cases
+        DEPOSIT_PUBLISHED_MSG_SENT(Phase.DEPOSIT_PAID),
+        DEPOSIT_PUBLISHED_MSG_RECEIVED(Phase.DEPOSIT_PAID),
+        DEPOSIT_CONFIRMED(Phase.DEPOSIT_PAID),
+
+        FIAT_PAYMENT_STARTED(Phase.FIAT_SENT),
+        FIAT_PAYMENT_STARTED_MSG_SENT(Phase.FIAT_SENT),
+        FIAT_PAYMENT_STARTED_MSG_RECEIVED(Phase.FIAT_SENT),
+
+        FIAT_PAYMENT_RECEIPT(Phase.FIAT_RECEIVED),
+        FIAT_PAYMENT_RECEIPT_MSG_SENT(Phase.FIAT_RECEIVED),
+        FIAT_PAYMENT_RECEIPT_MSG_RECEIVED(Phase.FIAT_RECEIVED),
+
+        PAYOUT_TX_COMMITTED(Phase.PAYOUT_PAID),
+        PAYOUT_TX_SENT(Phase.PAYOUT_PAID),
+        PAYOUT_TX_RECEIVED(Phase.PAYOUT_PAID),
+        PAYOUT_BROAD_CASTED(Phase.PAYOUT_PAID),
+
+        WITHDRAW_COMPLETED(Phase.WITHDRAWN);
+
+        public Phase getPhase() {
+            return phase;
+        }
+
+        private final Phase phase;
+
+        State(Phase phase) {
+            this.phase = phase;
+        }
+    }
+
+    public enum Phase {
         PREPARATION,
         TAKER_FEE_PAID,
+        DEPOSIT_REQUESTED,
         DEPOSIT_PAID,
         FIAT_SENT,
         FIAT_RECEIVED,
         PAYOUT_PAID,
         WITHDRAWN,
-        FAILED
-    }*/
+        DISPUTE
+    }
+
+    public enum DisputeState {
+        NONE,
+        DISPUTE_REQUESTED,
+        DISPUTE_STARTED_BY_PEER,
+        DISPUTE_CLOSED
+    }
+
+    public enum TradePeriodState {
+        NORMAL,
+        HALF_REACHED,
+        TRADE_PERIOD_OVER
+    }
 
     // Mutable
     private Coin tradeAmount;
-    private Peer tradingPeer;
+    private Address tradingPeerAddress;
     private transient ObjectProperty<Coin> tradeAmountProperty;
     private transient ObjectProperty<Fiat> tradeVolumeProperty;
 
@@ -96,31 +137,41 @@ abstract public class Trade implements Tradable, Model, Serializable {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     // Transient/Immutable
-    private transient ObjectProperty<TradeState> processStateProperty;
+    private transient ObjectProperty<State> processStateProperty;
+    private transient ObjectProperty<DisputeState> disputeStateProperty;
+    private transient ObjectProperty<TradePeriodState> tradePeriodStateProperty;
     // Trades are saved in the TradeList
     transient private Storage<? extends TradableList> storage;
     transient protected TradeProtocol tradeProtocol;
 
-    transient protected TradeManager tradeManager;
-    transient protected OpenOfferManager openOfferManager;
-
     // Immutable
     private final Offer offer;
     private final ProcessModel processModel;
-    private final Date creationDate;
 
     // Mutable
-    private MessageWithPubKey messageWithPubKey;
-    protected Date takeOfferDate;
-    protected TradeState tradeState;
+    private DecryptedMessageWithPubKey decryptedMessageWithPubKey;
+    private Date takeOfferDate = new Date(0); // in some error cases the date is not set and cause null pointers, so we set a default
+
+    protected State state;
+    private DisputeState disputeState = DisputeState.NONE;
+    private TradePeriodState tradePeriodState = TradePeriodState.NORMAL;
     private Transaction depositTx;
     private Contract contract;
     private String contractAsJson;
-    private String sellerContractSignature;
-    private String buyerContractSignature;
+    private byte[] contractHash;
+    private String takerContractSignature;
+    private String offererContractSignature;
     private Transaction payoutTx;
-    private long lockTime;
+    private long lockTimeAsBlockHeight;
+    private int openDisputeTimeAsBlockHeight;
+    private int checkPaymentTimeAsBlockHeight;
+    private String arbitratorId;
+    private Address arbitratorAddress;
+    private String takerPaymentAccountId;
+    private boolean halfTradePeriodReachedWarningDisplayed;
+    private boolean tradePeriodOverWarningDisplayed;
     private String errorMessage;
+    transient private StringProperty errorMessageProperty;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -134,55 +185,50 @@ abstract public class Trade implements Tradable, Model, Serializable {
         processModel = new ProcessModel();
         tradeVolumeProperty = new SimpleObjectProperty<>();
         tradeAmountProperty = new SimpleObjectProperty<>();
+        errorMessageProperty = new SimpleStringProperty();
 
         initStates();
         initStateProperties();
-
-        // That will only be used in case of a canceled open offer trade
-        creationDate = new Date();
     }
 
     // taker
-    protected Trade(Offer offer, Coin tradeAmount, Peer tradingPeer,
+    protected Trade(Offer offer, Coin tradeAmount, Address tradingPeerAddress,
                     Storage<? extends TradableList> storage) {
 
         this(offer, storage);
         this.tradeAmount = tradeAmount;
-        this.tradingPeer = tradingPeer;
+        this.tradingPeerAddress = tradingPeerAddress;
         tradeAmountProperty.set(tradeAmount);
         tradeVolumeProperty.set(getTradeVolume());
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-
-        initStateProperties();
-        initAmountProperty();
+        try {
+            in.defaultReadObject();
+            initStateProperties();
+            initAmountProperty();
+            errorMessageProperty = new SimpleStringProperty(errorMessage);
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
-    public void init(MessageService messageService,
+    public void init(P2PService p2PService,
                      WalletService walletService,
-                     AddressService addressService,
                      TradeWalletService tradeWalletService,
-                     BlockChainService blockChainService,
-                     CryptoService cryptoService,
-                     ArbitrationRepository arbitrationRepository,
+                     ArbitratorManager arbitratorManager,
                      TradeManager tradeManager,
                      OpenOfferManager openOfferManager,
                      User user,
                      KeyRing keyRing) {
 
-        this.tradeManager = tradeManager;
-        this.openOfferManager = openOfferManager;
-
         processModel.onAllServicesInitialized(offer,
-                messageService,
-                addressService,
+                tradeManager,
+                openOfferManager,
+                p2PService,
                 walletService,
                 tradeWalletService,
-                blockChainService,
-                cryptoService,
-                arbitrationRepository,
+                arbitratorManager,
                 user,
                 keyRing);
 
@@ -190,15 +236,15 @@ abstract public class Trade implements Tradable, Model, Serializable {
 
         tradeProtocol.checkPayoutTxTimeLock(this);
 
-        if (messageWithPubKey != null) {
-            tradeProtocol.applyMailboxMessage(messageWithPubKey, this);
-            // After applied to protocol we remove it
-            messageWithPubKey = null;
+        if (decryptedMessageWithPubKey != null) {
+            tradeProtocol.applyMailboxMessage(decryptedMessageWithPubKey, this);
         }
     }
 
     protected void initStateProperties() {
-        processStateProperty = new SimpleObjectProperty<>(tradeState);
+        processStateProperty = new SimpleObjectProperty<>(state);
+        disputeStateProperty = new SimpleObjectProperty<>(disputeState);
+        tradePeriodStateProperty = new SimpleObjectProperty<>(tradePeriodState);
     }
 
     protected void initAmountProperty() {
@@ -223,43 +269,72 @@ abstract public class Trade implements Tradable, Model, Serializable {
     }
 
     public void setDepositTx(Transaction tx) {
+        log.debug("setDepositTx " + tx);
         this.depositTx = tx;
         setupConfidenceListener();
         storage.queueUpForSave();
     }
 
-    public void disposeProtocol() {
-        if (tradeProtocol != null) {
-            tradeProtocol.cleanup();
-            tradeProtocol = null;
-        }
+    @Nullable
+    public Transaction getDepositTx() {
+        return depositTx;
     }
 
-    public void setMailboxMessage(MessageWithPubKey messageWithPubKey) {
-        this.messageWithPubKey = messageWithPubKey;
+    public void setMailboxMessage(DecryptedMessageWithPubKey decryptedMessageWithPubKey) {
+        log.trace("setMailboxMessage " + decryptedMessageWithPubKey);
+        this.decryptedMessageWithPubKey = decryptedMessageWithPubKey;
+    }
+
+    public DecryptedMessageWithPubKey getMailboxMessage() {
+        return decryptedMessageWithPubKey;
     }
 
     public void setStorage(Storage<? extends TradableList> storage) {
         this.storage = storage;
     }
 
-    public void setTradeState(TradeState tradeState) {
-        this.tradeState = tradeState;
-        processStateProperty.set(tradeState);
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // States
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void setState(State state) {
+        this.state = state;
+        processStateProperty.set(state);
         storage.queueUpForSave();
     }
 
-    abstract public boolean isFailedState();
-
-    abstract public void setFailedState();
-
-    public boolean isCriticalFault() {
-        return tradeState.getPhase() != null && tradeState.getPhase().ordinal() >= TradeState.Phase.DEPOSIT_PAID.ordinal();
+    public void setDisputeState(DisputeState disputeState) {
+        this.disputeState = disputeState;
+        disputeStateProperty.set(disputeState);
+        storage.queueUpForSave();
     }
-    
+
+    public DisputeState getDisputeState() {
+        return disputeState;
+    }
+
+    public void setTradePeriodState(TradePeriodState tradePeriodState) {
+        this.tradePeriodState = tradePeriodState;
+        tradePeriodStateProperty.set(tradePeriodState);
+        storage.queueUpForSave();
+    }
+
+    public TradePeriodState getTradePeriodState() {
+        return tradePeriodState;
+    }
+
+    public boolean isTakerFeePaid() {
+        return state.getPhase() != null && state.getPhase().ordinal() >= Phase.TAKER_FEE_PAID.ordinal();
+    }
+
+    public State getState() {
+        return state;
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Storage
+    // Model implementation
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     // Get called from taskRunner after each completed task
@@ -282,22 +357,16 @@ abstract public class Trade implements Tradable, Model, Serializable {
         return offer.getId();
     }
 
+    public String getShortId() {
+        return offer.getShortId();
+    }
+
     public Offer getOffer() {
         return offer;
     }
 
-    @Nullable
-    public Transaction getDepositTx() {
-        return depositTx;
-    }
-
-    @NotNull
-    public Coin getSecurityDeposit() {
-        return offer.getSecurityDeposit();
-    }
-
     public Coin getPayoutAmount() {
-        return getSecurityDeposit();
+        return FeePolicy.SECURITY_DEPOSIT;
     }
 
     public ProcessModel getProcessModel() {
@@ -312,7 +381,8 @@ abstract public class Trade implements Tradable, Model, Serializable {
             return null;
     }
 
-    public ReadOnlyObjectProperty<? extends TradeState> tradeStateProperty() {
+
+    public ReadOnlyObjectProperty<? extends State> stateProperty() {
         return processStateProperty;
     }
 
@@ -325,25 +395,36 @@ abstract public class Trade implements Tradable, Model, Serializable {
     }
 
 
+    public ReadOnlyObjectProperty<DisputeState> disputeStateProperty() {
+        return disputeStateProperty;
+    }
+
+    public ReadOnlyObjectProperty<TradePeriodState> getTradePeriodStateProperty() {
+        return tradePeriodStateProperty;
+    }
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getter/Setter for Mutable objects
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public Date getDate() {
-        return takeOfferDate != null ? takeOfferDate : creationDate;
+        return takeOfferDate;
     }
 
     public void setTakeOfferDate(Date takeOfferDate) {
         this.takeOfferDate = takeOfferDate;
     }
 
-    public void setTradingPeer(Peer tradingPeer) {
-        this.tradingPeer = tradingPeer;
+    public void setTradingPeerAddress(Address tradingPeerAddress) {
+        if (tradingPeerAddress == null)
+            log.error("tradingPeerAddress=null");
+        else
+            this.tradingPeerAddress = tradingPeerAddress;
     }
 
     @Nullable
-    public Peer getTradingPeer() {
-        return tradingPeer;
+    public Address getTradingPeerAddress() {
+        return tradingPeerAddress;
     }
 
     public void setTradeAmount(Coin tradeAmount) {
@@ -357,31 +438,46 @@ abstract public class Trade implements Tradable, Model, Serializable {
         return tradeAmount;
     }
 
-    public void setLockTime(long lockTime) {
-        log.debug("lockTime " + lockTime);
-        this.lockTime = lockTime;
+    public void setLockTimeAsBlockHeight(long lockTimeAsBlockHeight) {
+        this.lockTimeAsBlockHeight = lockTimeAsBlockHeight;
     }
 
-    public long getLockTime() {
-        return lockTime;
+    public long getLockTimeAsBlockHeight() {
+        return lockTimeAsBlockHeight;
     }
 
-    public void setSellerContractSignature(String takerSignature) {
-        this.sellerContractSignature = takerSignature;
+    public int getOpenDisputeTimeAsBlockHeight() {
+        return openDisputeTimeAsBlockHeight;
+    }
+
+    public void setOpenDisputeTimeAsBlockHeight(int openDisputeTimeAsBlockHeight) {
+        this.openDisputeTimeAsBlockHeight = openDisputeTimeAsBlockHeight;
+    }
+
+    public int getCheckPaymentTimeAsBlockHeight() {
+        return checkPaymentTimeAsBlockHeight;
+    }
+
+    public void setCheckPaymentTimeAsBlockHeight(int checkPaymentTimeAsBlockHeight) {
+        this.checkPaymentTimeAsBlockHeight = checkPaymentTimeAsBlockHeight;
+    }
+
+    public void setTakerContractSignature(String takerSignature) {
+        this.takerContractSignature = takerSignature;
     }
 
     @Nullable
-    public String getSellerContractSignature() {
-        return sellerContractSignature;
+    public String getTakerContractSignature() {
+        return takerContractSignature;
     }
 
-    public void setBuyerContractSignature(String buyerContractSignature) {
-        this.buyerContractSignature = buyerContractSignature;
+    public void setOffererContractSignature(String offererContractSignature) {
+        this.offererContractSignature = offererContractSignature;
     }
 
     @Nullable
-    public String getBuyerContractSignature() {
-        return buyerContractSignature;
+    public String getOffererContractSignature() {
+        return offererContractSignature;
     }
 
     public void setContractAsJson(String contractAsJson) {
@@ -414,20 +510,53 @@ abstract public class Trade implements Tradable, Model, Serializable {
 
     public void setErrorMessage(String errorMessage) {
         this.errorMessage = errorMessage;
-
-        if (errorMessage != null && errorMessage.length() > 0) {
-            setFailedState();
-
-            if (isCriticalFault())
-                tradeManager.addTradeToFailedTrades(this);
-            else if (isFailedState())
-                tradeManager.addTradeToClosedTrades(this);
-        }
+        errorMessageProperty.set(errorMessage);
     }
 
-    @Nullable
-    public String getErrorMessage() {
-        return errorMessage;
+    public ReadOnlyStringProperty errorMessageProperty() {
+        return errorMessageProperty;
+    }
+
+    public Address getArbitratorAddress() {
+        return arbitratorAddress;
+    }
+
+    public void setArbitratorAddress(Address arbitratorAddress) {
+        this.arbitratorAddress = arbitratorAddress;
+    }
+
+    public String getTakerPaymentAccountId() {
+        return takerPaymentAccountId;
+    }
+
+    public void setTakerPaymentAccountId(String takerPaymentAccountId) {
+        this.takerPaymentAccountId = takerPaymentAccountId;
+    }
+
+    public void setHalfTradePeriodReachedWarningDisplayed(boolean halfTradePeriodReachedWarningDisplayed) {
+        this.halfTradePeriodReachedWarningDisplayed = halfTradePeriodReachedWarningDisplayed;
+        storage.queueUpForSave();
+    }
+
+    public boolean isHalfTradePeriodReachedWarningDisplayed() {
+        return halfTradePeriodReachedWarningDisplayed;
+    }
+
+    public void setTradePeriodOverWarningDisplayed(boolean tradePeriodOverWarningDisplayed) {
+        this.tradePeriodOverWarningDisplayed = tradePeriodOverWarningDisplayed;
+        storage.queueUpForSave();
+    }
+
+    public boolean isTradePeriodOverWarningDisplayed() {
+        return tradePeriodOverWarningDisplayed;
+    }
+
+    public void setContractHash(byte[] contractHash) {
+        this.contractHash = contractHash;
+    }
+
+    public byte[] getContractHash() {
+        return contractHash;
     }
 
 
@@ -436,28 +565,42 @@ abstract public class Trade implements Tradable, Model, Serializable {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private void setupConfidenceListener() {
+        log.debug("setupConfidenceListener");
         if (depositTx != null) {
             TransactionConfidence transactionConfidence = depositTx.getConfidence();
-            ListenableFuture<TransactionConfidence> future = transactionConfidence.getDepthFuture(1);
-            Futures.addCallback(future, new FutureCallback<TransactionConfidence>() {
-                @Override
-                public void onSuccess(TransactionConfidence result) {
-                    handleConfidenceResult();
-                }
+            log.debug("transactionConfidence " + transactionConfidence.getDepthInBlocks());
+            if (transactionConfidence.getDepthInBlocks() > 0) {
+                handleConfidenceResult();
+            } else {
+                ListenableFuture<TransactionConfidence> future = transactionConfidence.getDepthFuture(1);
+                Futures.addCallback(future, new FutureCallback<TransactionConfidence>() {
+                    @Override
+                    public void onSuccess(TransactionConfidence result) {
+                        log.debug("transactionConfidence " + transactionConfidence.getDepthInBlocks());
+                        log.debug("state " + state);
+                        handleConfidenceResult();
+                    }
 
-                @Override
-                public void onFailure(@NotNull Throwable t) {
-                    t.printStackTrace();
-                    log.error(t.getMessage());
-                    Throwables.propagate(t);
-                }
-            });
+                    @Override
+                    public void onFailure(@NotNull Throwable t) {
+                        t.printStackTrace();
+                        log.error(t.getMessage());
+                        Throwables.propagate(t);
+                    }
+                });
+            }
+
+        } else {
+            log.error("depositTx == null. That must not happen.");
         }
     }
 
     abstract protected void createProtocol();
 
-    abstract protected void handleConfidenceResult();
+    private void handleConfidenceResult() {
+        if (state.ordinal() < State.DEPOSIT_CONFIRMED.ordinal())
+            setState(State.DEPOSIT_CONFIRMED);
+    }
 
     abstract protected void initStates();
 
@@ -465,7 +608,7 @@ abstract public class Trade implements Tradable, Model, Serializable {
     public String toString() {
         return "Trade{" +
                 "tradeAmount=" + tradeAmount +
-                ", tradingPeer=" + tradingPeer +
+                ", tradingPeer=" + tradingPeerAddress +
                 ", tradeAmountProperty=" + tradeAmountProperty +
                 ", tradeVolumeProperty=" + tradeVolumeProperty +
                 ", processStateProperty=" + processStateProperty +
@@ -474,8 +617,8 @@ abstract public class Trade implements Tradable, Model, Serializable {
                 ", offer=" + offer +
                 ", date=" + takeOfferDate +
                 ", processModel=" + processModel +
-                ", processState=" + tradeState +
-                ", messageWithPubKey=" + messageWithPubKey +
+                ", processState=" + state +
+                ", messageWithPubKey=" + decryptedMessageWithPubKey +
                 ", depositTx=" + depositTx +
                /* ", contract=" + contract +
                 ", contractAsJson='" + contractAsJson + '\'' +*/
@@ -485,5 +628,4 @@ abstract public class Trade implements Tradable, Model, Serializable {
                 ", errorMessage='" + errorMessage + '\'' +
                 '}';
     }
-
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index d2928cc7ee..8b49cfe112 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -17,61 +17,52 @@
 
 package io.bitsquare.trade;
 
-import io.bitsquare.arbitration.ArbitrationRepository;
+import com.google.common.util.concurrent.FutureCallback;
+import io.bitsquare.arbitration.ArbitratorManager;
 import io.bitsquare.btc.AddressEntry;
-import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.common.handlers.FaultHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.CryptoService;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.MessageWithPubKey;
-import io.bitsquare.crypto.SealedAndSignedMessage;
-import io.bitsquare.p2p.AddressService;
-import io.bitsquare.p2p.DecryptedMessageHandler;
-import io.bitsquare.p2p.MailboxMessage;
-import io.bitsquare.p2p.MailboxService;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.MessageService;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.P2PServiceListener;
+import io.bitsquare.p2p.messaging.DecryptedMailListener;
+import io.bitsquare.p2p.messaging.DecryptedMailboxListener;
+import io.bitsquare.p2p.messaging.DecryptedMessageWithPubKey;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.closed.ClosedTradableManager;
 import io.bitsquare.trade.failed.FailedTradesManager;
-import io.bitsquare.trade.handlers.TakeOfferResultHandler;
+import io.bitsquare.trade.handlers.TradeResultHandler;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.offer.OpenOffer;
 import io.bitsquare.trade.offer.OpenOfferManager;
 import io.bitsquare.trade.protocol.availability.OfferAvailabilityModel;
-import io.bitsquare.trade.protocol.trade.messages.DepositTxInputsRequest;
 import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
 import io.bitsquare.user.User;
-
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.ObservableList;
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.InsufficientMoneyException;
 import org.bitcoinj.core.Transaction;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.spongycastle.crypto.params.KeyParameter;
 
-import com.google.common.util.concurrent.FutureCallback;
-
+import javax.inject.Inject;
+import javax.inject.Named;
 import java.io.File;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import javafx.collections.ObservableList;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static io.bitsquare.util.Validator.nonEmptyStringOf;
 
 public class TradeManager {
@@ -79,20 +70,18 @@ public class TradeManager {
 
     private final User user;
     private final KeyRing keyRing;
-    private final MessageService messageService;
-    private final MailboxService mailboxService;
-    private final AddressService addressService;
-    private final BlockChainService blockChainService;
     private final WalletService walletService;
     private final TradeWalletService tradeWalletService;
-    private final CryptoService<MailboxMessage> cryptoService;
     private final OpenOfferManager openOfferManager;
     private final ClosedTradableManager closedTradableManager;
     private final FailedTradesManager failedTradesManager;
-    private final ArbitrationRepository arbitrationRepository;
+    private final ArbitratorManager arbitratorManager;
+    private final P2PService p2PService;
 
-    private final Storage<TradableList<Trade>> pendingTradesStorage;
-    private final TradableList<Trade> pendingTrades;
+    private final Storage<TradableList<Trade>> tradableListStorage;
+    private final TradableList<Trade> trades;
+    private final BooleanProperty pendingTradesInitialized = new SimpleBooleanProperty();
+    private P2PServiceListener p2PServiceListener;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -102,34 +91,86 @@ public class TradeManager {
     @Inject
     public TradeManager(User user,
                         KeyRing keyRing,
-                        MessageService messageService,
-                        MailboxService mailboxService,
-                        AddressService addressService,
-                        BlockChainService blockChainService,
                         WalletService walletService,
                         TradeWalletService tradeWalletService,
-                        CryptoService<MailboxMessage> cryptoService,
                         OpenOfferManager openOfferManager,
                         ClosedTradableManager closedTradableManager,
                         FailedTradesManager failedTradesManager,
-                        ArbitrationRepository arbitrationRepository,
+                        ArbitratorManager arbitratorManager,
+                        P2PService p2PService,
                         @Named("storage.dir") File storageDir) {
         this.user = user;
         this.keyRing = keyRing;
-        this.messageService = messageService;
-        this.mailboxService = mailboxService;
-        this.addressService = addressService;
-        this.blockChainService = blockChainService;
         this.walletService = walletService;
         this.tradeWalletService = tradeWalletService;
-        this.cryptoService = cryptoService;
         this.openOfferManager = openOfferManager;
         this.closedTradableManager = closedTradableManager;
         this.failedTradesManager = failedTradesManager;
-        this.arbitrationRepository = arbitrationRepository;
+        this.arbitratorManager = arbitratorManager;
+        this.p2PService = p2PService;
 
-        pendingTradesStorage = new Storage<>(storageDir);
-        this.pendingTrades = new TradableList<>(pendingTradesStorage, "PendingTrades");
+        tradableListStorage = new Storage<>(storageDir);
+        this.trades = new TradableList<>(tradableListStorage, "PendingTrades");
+
+        p2PService.addDecryptedMailListener(new DecryptedMailListener() {
+            @Override
+            public void onMailMessage(DecryptedMessageWithPubKey decryptedMessageWithPubKey, Address peerAddress) {
+                Message message = decryptedMessageWithPubKey.message;
+
+                // Handler for incoming initial messages from taker
+                if (message instanceof PayDepositRequest) {
+                    log.trace("Received PayDepositRequest: " + message);
+                    handleInitialTakeOfferRequest((PayDepositRequest) message, peerAddress);
+                }
+            }
+        });
+        p2PService.addDecryptedMailboxListener(new DecryptedMailboxListener() {
+            @Override
+            public void onMailboxMessageAdded(DecryptedMessageWithPubKey decryptedMessageWithPubKey, Address senderAddress) {
+                log.trace("onMailboxMessageAdded decryptedMessageWithPubKey: " + decryptedMessageWithPubKey);
+                log.trace("onMailboxMessageAdded senderAddress: " + senderAddress);
+                Message message = decryptedMessageWithPubKey.message;
+                if (message instanceof PayDepositRequest) {
+                    //TODO is that used????
+                    PayDepositRequest payDepositRequest = (PayDepositRequest) message;
+                    log.trace("Received payDepositRequest: " + payDepositRequest);
+                    if (payDepositRequest.getSenderAddress().equals(senderAddress))
+                        handleInitialTakeOfferRequest(payDepositRequest, senderAddress);
+                    else
+                        log.warn("Peer address not matching for payDepositRequest");
+                } else if (message instanceof TradeMessage) {
+                    log.trace("Received TradeMessage: " + message);
+                    String tradeId = ((TradeMessage) message).tradeId;
+                    Optional<Trade> tradeOptional = trades.stream().filter(e -> e.getId().equals(tradeId)).findAny();
+                    if (tradeOptional.isPresent())
+                        tradeOptional.get().setMailboxMessage(decryptedMessageWithPubKey);
+                }
+            }
+        });
+
+        p2PServiceListener = new P2PServiceListener() {
+            @Override
+            public void onTorNodeReady() {
+            }
+
+            @Override
+            public void onHiddenServiceReady() {
+            }
+
+            @Override
+            public void onSetupFailed(Throwable throwable) {
+            }
+
+            @Override
+            public void onAllDataReceived() {
+            }
+
+            @Override
+            public void onAuthenticated() {
+                initPendingTrades();
+            }
+        };
+        p2PService.addP2PServiceListener(p2PServiceListener);
     }
 
 
@@ -141,35 +182,41 @@ public class TradeManager {
     // OffererAsBuyerProtocol listens for take offer requests, so we need to instantiate it early.
     public void onAllServicesInitialized() {
         log.trace("onAllServicesInitialized");
-
-        // If there are messages in our mailbox we apply it and remove them from the DHT
-        // We run that before initializing the pending trades to be sure the state is correct
-        mailboxService.getAllMessages(
-                (encryptedMailboxMessages) -> {
-                    log.trace("mailboxService.getAllMessages success");
-                    setMailboxMessagesToTrades(encryptedMailboxMessages);
-                    emptyMailbox();
-                    initPendingTrades();
-                });
-
-        // Handler for incoming initial messages from taker
-        messageService.addDecryptedMessageHandler(new DecryptedMessageHandler() {
-            @Override
-            public void handleMessage(MessageWithPubKey messageWithPubKey, Peer sender) {
-                // We get an encrypted message but don't do the signature check as we don't know the peer yet.
-                // A basic sig check is in done also at decryption time
-                Message message = messageWithPubKey.getMessage();
-                // Those 2 messages are initial request form the taker.
-                // RequestPayDepositMessage is used also in case of SellerAsTaker but there it is handled in the protocol as it is not an initial request
-                if (message instanceof DepositTxInputsRequest ||
-                        (message instanceof PayDepositRequest && ((PayDepositRequest) message).isInitialRequest))
-                    handleInitialTakeOfferRequest((TradeMessage) message, sender);
-            }
-        });
     }
 
-    private void handleInitialTakeOfferRequest(TradeMessage message, Peer sender) {
-        log.trace("handleNewMessage: message = " + message.getClass().getSimpleName() + " from " + sender);
+    private void initPendingTrades() {
+        if (p2PServiceListener != null) p2PService.removeP2PServiceListener(p2PServiceListener);
+
+        List<Trade> failedTrades = new ArrayList<>();
+        for (Trade trade : trades) {
+            // We continue an interrupted trade.
+            // TODO if the peer has changed its IP address, we need to make another findPeer request. At the moment we use the peer stored in trade to
+            // continue the trade, but that might fail.
+
+            // TODO
+           /* if (trade.isFailedState()) {
+                failedTrades.add(trade);
+            }
+            else {*/
+            trade.setStorage(tradableListStorage);
+            trade.updateDepositTxFromWallet(tradeWalletService);
+            initTrade(trade);
+
+            // after we are authenticated we remove mailbox messages. 
+            DecryptedMessageWithPubKey mailboxMessage = trade.getMailboxMessage();
+            if (mailboxMessage != null) {
+                p2PService.removeEntryFromMailbox(mailboxMessage);
+                trade.setMailboxMessage(null);
+            }
+            // }
+        }
+        pendingTradesInitialized.set(true);
+
+        failedTrades.stream().filter(Trade::isTakerFeePaid).forEach(this::addTradeToFailedTrades);
+    }
+
+    private void handleInitialTakeOfferRequest(TradeMessage message, Address peerAddress) {
+        log.trace("handleNewMessage: message = " + message.getClass().getSimpleName() + " from " + peerAddress);
         try {
             nonEmptyStringOf(message.tradeId);
         } catch (Throwable t) {
@@ -184,93 +231,35 @@ public class TradeManager {
 
             Trade trade;
             if (offer.getDirection() == Offer.Direction.BUY)
-                trade = new BuyerAsOffererTrade(offer, pendingTradesStorage);
+                trade = new BuyerAsOffererTrade(offer, tradableListStorage);
             else
-                trade = new SellerAsOffererTrade(offer, pendingTradesStorage);
+                trade = new SellerAsOffererTrade(offer, tradableListStorage);
 
-            trade.setStorage(pendingTradesStorage);
+            trade.setStorage(tradableListStorage);
             initTrade(trade);
-            pendingTrades.add(trade);
-            ((OffererTrade) trade).handleTakeOfferRequest(message, sender);
-        }
-        else {
+            trades.add(trade);
+            ((OffererTrade) trade).handleTakeOfferRequest(message, peerAddress);
+        } else {
             // TODO respond
             //(RequestDepositTxInputsMessage)message.
-            //  messageService.sendEncryptedMessage(sender,messageWithPubKey.getMessage().);
+            //  messageService.sendEncryptedMessage(peerAddress,messageWithPubKey.getMessage().);
             log.info("We received a take offer request but don't have that offer anymore.");
         }
     }
 
     private void initTrade(Trade trade) {
-        trade.init(messageService,
+        trade.init(p2PService,
                 walletService,
-                addressService,
                 tradeWalletService,
-                blockChainService,
-                cryptoService,
-                arbitrationRepository,
+                arbitratorManager,
                 this,
                 openOfferManager,
                 user,
                 keyRing);
     }
 
-    private void setMailboxMessagesToTrades(List<SealedAndSignedMessage> encryptedMessages) {
-        log.trace("applyMailboxMessage encryptedMailboxMessage.size=" + encryptedMessages.size());
-        for (SealedAndSignedMessage encrypted : encryptedMessages) {
-            try {
-                MessageWithPubKey messageWithPubKey = cryptoService.decryptAndVerifyMessage(encrypted);
-                Message message = messageWithPubKey.getMessage();
-                if (message instanceof MailboxMessage && message instanceof TradeMessage) {
-                    String tradeId = ((TradeMessage) message).tradeId;
-                    Optional<Trade> tradeOptional = pendingTrades.stream().filter(e -> e.getId().equals(tradeId)).findAny();
-                    if (tradeOptional.isPresent())
-                        tradeOptional.get().setMailboxMessage(messageWithPubKey);
-                }
-            } catch (Throwable e) {
-                e.printStackTrace();
-                log.error(e.getMessage());
-            }
-        }
-    }
-
-    private void emptyMailbox() {
-        mailboxService.removeAllMessages(
-                () -> log.debug("All mailbox entries removed"),
-                (errorMessage, fault) -> {
-                    log.error(errorMessage);
-                    log.error(fault.getMessage());
-                });
-    }
-
-    private void initPendingTrades() {
-        List<Trade> failedTrades = new ArrayList<>();
-        for (Trade trade : pendingTrades) {
-            // We continue an interrupted trade.
-            // TODO if the peer has changed its IP address, we need to make another findPeer request. At the moment we use the peer stored in trade to
-            // continue the trade, but that might fail.
-
-            if (trade.isFailedState()) {
-                failedTrades.add(trade);
-            }
-            else {
-                trade.setStorage(pendingTradesStorage);
-                trade.updateDepositTxFromWallet(tradeWalletService);
-                initTrade(trade);
-            }
-        }
-
-        for (Trade trade : failedTrades) {
-            if (trade.isCriticalFault())
-                addTradeToFailedTrades(trade);
-            else
-                addTradeToClosedTrades(trade);
-        }
-    }
-
-
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Called from Offerbook when offer gets removed from DHT
+    // Called from Offerbook when offer gets removed from P2P network
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public void onOfferRemovedFromRemoteOfferBook(Offer offer) {
@@ -282,8 +271,9 @@ public class TradeManager {
     // Take offer
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void onCheckOfferAvailability(Offer offer) {
-        offer.checkOfferAvailability(getOfferAvailabilityModel(offer));
+    public void checkOfferAvailability(Offer offer,
+                                       ResultHandler resultHandler) {
+        offer.checkOfferAvailability(getOfferAvailabilityModel(offer), resultHandler);
     }
 
     // When closing take offer view, we are not interested in the onCheckOfferAvailability result anymore, so remove from the map
@@ -292,34 +282,44 @@ public class TradeManager {
     }
 
     // First we check if offer is still available then we create the trade with the protocol
-    public void onTakeOffer(Coin amount, Offer offer, TakeOfferResultHandler takeOfferResultHandler) {
+    public void onTakeOffer(Coin amount,
+                            Offer offer,
+                            String paymentAccountId,
+                            TradeResultHandler tradeResultHandler) {
         final OfferAvailabilityModel model = getOfferAvailabilityModel(offer);
-        offer.checkOfferAvailability(model, () -> {
-            if (offer.getState() == Offer.State.AVAILABLE)
-                createTrade(amount, offer, model, takeOfferResultHandler);
-        });
+        offer.checkOfferAvailability(model,
+                () -> {
+                    if (offer.getState() == Offer.State.AVAILABLE)
+                        createTrade(amount, offer, paymentAccountId, model, tradeResultHandler);
+                });
     }
 
-    private void createTrade(Coin amount, Offer offer, OfferAvailabilityModel model, TakeOfferResultHandler takeOfferResultHandler) {
+    private void createTrade(Coin amount,
+                             Offer offer,
+                             String paymentAccountId,
+                             OfferAvailabilityModel model,
+                             TradeResultHandler tradeResultHandler) {
         Trade trade;
         if (offer.getDirection() == Offer.Direction.BUY)
-            trade = new SellerAsTakerTrade(offer, amount, model.getPeer(), pendingTradesStorage);
+            trade = new SellerAsTakerTrade(offer, amount, model.getPeerAddress(), tradableListStorage);
         else
-            trade = new BuyerAsTakerTrade(offer, amount, model.getPeer(), pendingTradesStorage);
+            trade = new BuyerAsTakerTrade(offer, amount, model.getPeerAddress(), tradableListStorage);
 
         trade.setTakeOfferDate(new Date());
+        trade.setTakerPaymentAccountId(paymentAccountId);
+
         initTrade(trade);
-        pendingTrades.add(trade);
+
+        trades.add(trade);
         ((TakerTrade) trade).takeAvailableOffer();
-        takeOfferResultHandler.handleResult(trade);
+        tradeResultHandler.handleResult(trade);
     }
 
     private OfferAvailabilityModel getOfferAvailabilityModel(Offer offer) {
         return new OfferAvailabilityModel(
                 offer,
                 keyRing.getPubKeyRing(),
-                messageService,
-                addressService);
+                p2PService);
     }
 
 
@@ -327,8 +327,8 @@ public class TradeManager {
     // Trade
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void onWithdrawRequest(String toAddress, Trade trade, ResultHandler resultHandler, FaultHandler faultHandler) {
-        AddressEntry addressEntry = walletService.getAddressEntry(trade.getId());
+    public void onWithdrawRequest(String toAddress, KeyParameter aesKey, Trade trade, ResultHandler resultHandler, FaultHandler faultHandler) {
+        AddressEntry addressEntry = walletService.getAddressEntryByOfferId(trade.getId());
         String fromAddress = addressEntry.getAddressString();
 
         FutureCallback<Transaction> callback = new FutureCallback<Transaction>() {
@@ -336,15 +336,8 @@ public class TradeManager {
             public void onSuccess(@javax.annotation.Nullable Transaction transaction) {
                 if (transaction != null) {
                     log.info("onWithdraw onSuccess tx ID:" + transaction.getHashAsString());
-
-                    if (trade instanceof BuyerTrade)
-                        trade.setTradeState(TradeState.BuyerState.WITHDRAW_COMPLETED);
-                    else if (trade instanceof SellerTrade)
-                        trade.setTradeState(TradeState.SellerState.WITHDRAW_COMPLETED);
-
-                    pendingTrades.remove(trade);
-                    closedTradableManager.add(trade);
-
+                    trade.setState(Trade.State.WITHDRAW_COMPLETED);
+                    addTradeToClosedTrades(trade);
                     resultHandler.handleResult();
                 }
             }
@@ -357,7 +350,7 @@ public class TradeManager {
             }
         };
         try {
-            walletService.sendFunds(fromAddress, toAddress, trade.getPayoutAmount(), callback);
+            walletService.sendFunds(fromAddress, toAddress, trade.getPayoutAmount(), aesKey, callback);
         } catch (AddressFormatException | InsufficientMoneyException e) {
             e.printStackTrace();
             log.error(e.getMessage());
@@ -365,26 +358,57 @@ public class TradeManager {
         }
     }
 
-    // In a fault case we remove it and add it to the closed trades
-    public void addTradeToClosedTrades(Trade trade) {
-        pendingTrades.remove(trade);
+    // If trade was completed (closed without fault but might be closed by a dispute) we move it to the closed trades
+    private void addTradeToClosedTrades(Trade trade) {
+        trades.remove(trade);
         closedTradableManager.add(trade);
     }
 
+    // If trade is in already in critical state (if taker role: taker fee; both roles: after deposit published)
+    // we move the trade to failedTradesManager
     public void addTradeToFailedTrades(Trade trade) {
-        pendingTrades.remove(trade);
+        trades.remove(trade);
         failedTradesManager.add(trade);
     }
 
+    // If trade is in preparation (if taker role: before taker fee is paid; both roles: before deposit published)
+    // we just remove the trade from our list. We don't store those trades.
+    public void removePreparedTrade(Trade trade) {
+        trades.remove(trade);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Dispute
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void closeDisputedTrade(String tradeId) {
+        Optional<Trade> tradeOptional = getTradeById(tradeId);
+        if (tradeOptional.isPresent()) {
+            Trade trade = tradeOptional.get();
+            trade.setDisputeState(Trade.DisputeState.DISPUTE_CLOSED);
+            addTradeToClosedTrades(trade);
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public ObservableList<Trade> getPendingTrades() {
-        return pendingTrades.getObservableList();
+    public ObservableList<Trade> getTrades() {
+        return trades.getObservableList();
+    }
+
+    public BooleanProperty pendingTradesInitializedProperty() {
+        return pendingTradesInitialized;
     }
 
     public boolean isMyOffer(Offer offer) {
         return offer.isMyOffer(keyRing);
     }
+
+    public Optional<Trade> getTradeById(String tradeId) {
+        return trades.stream().filter(e -> e.getId().equals(tradeId)).findFirst();
+    }
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/TradeModule.java b/core/src/main/java/io/bitsquare/trade/TradeModule.java
index 2521e6df9f..3d1b5878fd 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeModule.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeModule.java
@@ -17,18 +17,15 @@
 
 package io.bitsquare.trade;
 
-import io.bitsquare.BitsquareModule;
+import com.google.inject.Singleton;
+import io.bitsquare.app.AppModule;
 import io.bitsquare.trade.closed.ClosedTradableManager;
 import io.bitsquare.trade.failed.FailedTradesManager;
-
-import com.google.inject.Singleton;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.core.env.Environment;
 
-public class TradeModule extends BitsquareModule {
+public class TradeModule extends AppModule {
     private static final Logger log = LoggerFactory.getLogger(TradeModule.class);
 
     public TradeModule(Environment env) {
diff --git a/core/src/main/java/io/bitsquare/trade/TradeState.java b/core/src/main/java/io/bitsquare/trade/TradeState.java
deleted file mode 100644
index 74dcbf5d21..0000000000
--- a/core/src/main/java/io/bitsquare/trade/TradeState.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.trade;
-
-public interface TradeState {
-    Phase getPhase();
-
-    void setPhase(Phase phase);
-
-    enum SellerState implements TradeState {
-        PREPARATION(Phase.PREPARATION),
-
-        DEPOSIT_PUBLISHED_MSG_RECEIVED(Phase.DEPOSIT_PAID),
-        DEPOSIT_CONFIRMED(Phase.DEPOSIT_PAID),
-
-        FIAT_PAYMENT_STARTED_MSG_RECEIVED(Phase.FIAT_SENT),
-
-        FIAT_PAYMENT_RECEIPT(Phase.FIAT_RECEIVED),
-        FIAT_PAYMENT_RECEIPT_MSG_SENT(Phase.FIAT_RECEIVED),
-
-        PAYOUT_TX_RECEIVED(Phase.PAYOUT_PAID),
-        PAYOUT_TX_COMMITTED(Phase.PAYOUT_PAID),
-
-        PAYOUT_BROAD_CASTED(Phase.PAYOUT_PAID),
-
-        WITHDRAW_COMPLETED(Phase.WITHDRAWN),
-
-        FAILED();
-
-        public Phase getPhase() {
-            return phase;
-        }
-
-        public void setPhase(Phase phase) {
-            this.phase = phase;
-        }
-
-        private Phase phase;
-
-        SellerState() {
-        }
-
-        SellerState(Phase phase) {
-            this.phase = phase;
-        }
-    }
-
-    enum BuyerState implements TradeState {
-        PREPARATION(Phase.PREPARATION),
-
-        DEPOSIT_PUBLISHED(Phase.DEPOSIT_PAID),
-        DEPOSIT_PUBLISHED_MSG_SENT(Phase.DEPOSIT_PAID),
-        DEPOSIT_CONFIRMED(Phase.DEPOSIT_PAID),
-
-        FIAT_PAYMENT_STARTED(Phase.FIAT_SENT),
-        FIAT_PAYMENT_STARTED_MSG_SENT(Phase.FIAT_SENT),
-
-        FIAT_PAYMENT_RECEIPT_MSG_RECEIVED(Phase.FIAT_RECEIVED),
-
-        PAYOUT_TX_COMMITTED(Phase.PAYOUT_PAID),
-        PAYOUT_TX_SENT(Phase.PAYOUT_PAID),
-
-        PAYOUT_BROAD_CASTED(Phase.PAYOUT_PAID),
-
-        WITHDRAW_COMPLETED(Phase.WITHDRAWN),
-
-        FAILED();
-
-        public Phase getPhase() {
-            return phase;
-        }
-
-        public void setPhase(Phase phase) {
-            this.phase = phase;
-        }
-
-        private Phase phase;
-
-        BuyerState() {
-        }
-
-        BuyerState(Phase phase) {
-            this.phase = phase;
-        }
-    }
-
-    enum Phase {
-        PREPARATION,
-        TAKER_FEE_PAID,
-        DEPOSIT_PAID,
-        FIAT_SENT,
-        FIAT_RECEIVED,
-        PAYOUT_PAID,
-        WITHDRAWN
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/closed/ClosedTradableManager.java b/core/src/main/java/io/bitsquare/trade/closed/ClosedTradableManager.java
index 464c341127..c738c798b5 100644
--- a/core/src/main/java/io/bitsquare/trade/closed/ClosedTradableManager.java
+++ b/core/src/main/java/io/bitsquare/trade/closed/ClosedTradableManager.java
@@ -17,27 +17,24 @@
 
 package io.bitsquare.trade.closed;
 
-import io.bitsquare.crypto.KeyRing;
+import com.google.inject.Inject;
+import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.Tradable;
 import io.bitsquare.trade.TradableList;
 import io.bitsquare.trade.offer.Offer;
-
-import com.google.inject.Inject;
-
-import java.io.File;
-
-import javax.inject.Named;
-
 import javafx.collections.ObservableList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Named;
+import java.io.File;
+import java.util.Optional;
+
 public class ClosedTradableManager {
     private static final Logger log = LoggerFactory.getLogger(ClosedTradableManager.class);
     private final TradableList<Tradable> closedTrades;
-    private KeyRing keyRing;
+    private final KeyRing keyRing;
 
     @Inject
     public ClosedTradableManager(KeyRing keyRing, @Named("storage.dir") File storageDir) {
@@ -57,5 +54,8 @@ public class ClosedTradableManager {
         return closedTrades.getObservableList();
     }
 
+    public Optional<Tradable> getTradableById(String id) {
+        return closedTrades.stream().filter(e -> e.getId().equals(id)).findFirst();
+    }
 
 }
diff --git a/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java b/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java
index db45824071..ba4bb84043 100644
--- a/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java
+++ b/core/src/main/java/io/bitsquare/trade/failed/FailedTradesManager.java
@@ -17,27 +17,24 @@
 
 package io.bitsquare.trade.failed;
 
-import io.bitsquare.crypto.KeyRing;
+import com.google.inject.Inject;
+import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.TradableList;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.offer.Offer;
-
-import com.google.inject.Inject;
-
-import java.io.File;
-
-import javax.inject.Named;
-
 import javafx.collections.ObservableList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Named;
+import java.io.File;
+import java.util.Optional;
+
 public class FailedTradesManager {
     private static final Logger log = LoggerFactory.getLogger(FailedTradesManager.class);
     private final TradableList<Trade> failedTrades;
-    private KeyRing keyRing;
+    private final KeyRing keyRing;
 
     @Inject
     public FailedTradesManager(KeyRing keyRing, @Named("storage.dir") File storageDir) {
@@ -57,4 +54,7 @@ public class FailedTradesManager {
         return failedTrades.getObservableList();
     }
 
+    public Optional<Trade> getTradeById(String id) {
+        return failedTrades.stream().filter(e -> e.getId().equals(id)).findFirst();
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/handlers/TakeOfferResultHandler.java b/core/src/main/java/io/bitsquare/trade/handlers/TakeOfferResultHandler.java
deleted file mode 100644
index 89884e20b5..0000000000
--- a/core/src/main/java/io/bitsquare/trade/handlers/TakeOfferResultHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.trade.handlers;
-
-import io.bitsquare.trade.Trade;
-
-
-public interface TakeOfferResultHandler {
-    void handleResult(Trade trade);
-}
diff --git a/core/src/main/java/io/bitsquare/trade/offer/Offer.java b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
index aa5f37e702..baf416884f 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/Offer.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
@@ -19,50 +19,50 @@ package io.bitsquare.trade.offer;
 
 import io.bitsquare.app.Version;
 import io.bitsquare.btc.Restrictions;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.common.crypto.PubKeyRing;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.common.util.JsonExclude;
 import io.bitsquare.locale.Country;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.storage.data.PubKeyProtectedExpirablePayload;
+import io.bitsquare.payment.PaymentMethod;
 import io.bitsquare.trade.protocol.availability.OfferAvailabilityModel;
 import io.bitsquare.trade.protocol.availability.OfferAvailabilityProtocol;
-
+import javafx.beans.property.*;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
 import org.bitcoinj.utils.Fiat;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-import java.util.Date;
-import java.util.List;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-import org.jetbrains.annotations.NotNull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.google.common.base.Preconditions.*;
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.security.PublicKey;
+import java.util.Date;
+import java.util.List;
 
-public class Offer implements Serializable {
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public final class Offer implements PubKeyProtectedExpirablePayload {
     // That object is sent over the wire, so we need to take care of version compatibility.
+    @JsonExclude
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
+    @JsonExclude
     transient private static final Logger log = LoggerFactory.getLogger(Offer.class);
 
+    public static final long TTL = 10 * 60 * 1000; // 10 min.
+
     public enum Direction {BUY, SELL}
 
     public enum State {
         UNDEFINED,
+        OFFER_FEE_PAID,
         AVAILABLE,
         NOT_AVAILABLE,
         REMOVED,
-        OFFERER_OFFLINE,
-
-        TIMEOUT,
-        FAULT
+        OFFERER_OFFLINE
     }
 
 
@@ -70,31 +70,36 @@ public class Offer implements Serializable {
     private final String id;
     private final Direction direction;
     private final String currencyCode;
-    private final Date creationDate;
+    private final long date;
 
-    //TODO check with latest bitcoinJ version
-    // Fiat cause problems with offer removal (don` found out why, but we want plain objects anyway)
     private final long fiatPrice;
-    private final Coin amount;
-    private final Coin minAmount;
+    private final long amount;
+    private final long minAmount;
+    private final Address offererAddress;
+    @JsonExclude
     private final PubKeyRing pubKeyRing;
-    private final FiatAccount.Type fiatAccountType;
-    private final Country bankAccountCountry;
+    private final String paymentMethodName;
+    @Nullable
+    private final String paymentMethodCountryCode;
+    private final String offererPaymentAccountId;
 
-    private final Coin securityDeposit;
-    private final List<Country> acceptedCountries;
-    private final List<String> acceptedLanguageCodes;
-    private final String bankAccountUID;
-    private final List<String> arbitratorIds;
+    @Nullable
+    private final List<String> acceptedCountryCodes;
+    private final List<Address> arbitratorAddresses;
 
-    // Mutable property. Has to be set before offer is save in DHT as it changes the objects hash!
+    // Mutable property. Has to be set before offer is save in P2P network as it changes the objects hash!
     private String offerFeePaymentTxID;
-    private State state = State.UNDEFINED;
 
+    @JsonExclude
+    transient private State state = State.UNDEFINED;
     // Those state properties are transient and only used at runtime! 
     // don't access directly as it might be null; use getStateProperty() which creates an object if not instantiated
+    @JsonExclude
     transient private ObjectProperty<State> stateProperty = new SimpleObjectProperty<>(state);
+    @JsonExclude
     transient private OfferAvailabilityProtocol availabilityProtocol;
+    @JsonExclude
+    transient private StringProperty errorMessageProperty = new SimpleStringProperty();
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -102,52 +107,52 @@ public class Offer implements Serializable {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public Offer(String id,
+                 Address offererAddress,
                  PubKeyRing pubKeyRing,
                  Direction direction,
                  long fiatPrice,
-                 Coin amount,
-                 Coin minAmount,
-                 FiatAccount.Type fiatAccountType,
+                 long amount,
+                 long minAmount,
+                 String paymentMethodName,
                  String currencyCode,
-                 Country bankAccountCountry,
-                 String bankAccountUID,
-                 List<String> arbitratorIds,
-                 Coin securityDeposit,
-                 List<Country> acceptedCountries,
-                 List<String> acceptedLanguageCodes) {
+                 @Nullable Country paymentMethodCountry,
+                 String offererPaymentAccountId,
+                 List<Address> arbitratorAddresses,
+                 @Nullable List<String> acceptedCountryCodes) {
         this.id = id;
+        this.offererAddress = offererAddress;
         this.pubKeyRing = pubKeyRing;
         this.direction = direction;
         this.fiatPrice = fiatPrice;
         this.amount = amount;
         this.minAmount = minAmount;
-        this.fiatAccountType = fiatAccountType;
+        this.paymentMethodName = paymentMethodName;
         this.currencyCode = currencyCode;
-        this.bankAccountCountry = bankAccountCountry;
-        this.bankAccountUID = bankAccountUID;
-        this.arbitratorIds = arbitratorIds;
-        this.securityDeposit = securityDeposit;
-        this.acceptedCountries = acceptedCountries;
+        this.paymentMethodCountryCode = paymentMethodCountry != null ? paymentMethodCountry.code : null;
+        this.offererPaymentAccountId = offererPaymentAccountId;
+        this.arbitratorAddresses = arbitratorAddresses;
+        this.acceptedCountryCodes = acceptedCountryCodes;
 
-        this.acceptedLanguageCodes = acceptedLanguageCodes;
-
-        creationDate = new Date();
+        date = new Date().getTime();
         setState(State.UNDEFINED);
     }
 
     private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-        stateProperty = new SimpleObjectProperty<>(state);
+        try {
+            in.defaultReadObject();
+            stateProperty = new SimpleObjectProperty<>(State.UNDEFINED);
+
+            // we don't need to fill it as the error message is only relevant locally, so we don't store it in the transmitted object
+            errorMessageProperty = new SimpleStringProperty();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
     public void validate() {
-        checkNotNull(getAcceptedCountries(), "AcceptedCountries is null");
-        checkNotNull(getAcceptedLanguageCodes(), "AcceptedLanguageLocales is null");
         checkNotNull(getAmount(), "Amount is null");
-        checkNotNull(getArbitratorIds(), "Arbitrator is null");
-        checkNotNull(getBankAccountId(), "BankAccountId is null");
-        checkNotNull(getSecurityDeposit(), "SecurityDeposit is null");
-        checkNotNull(getCreationDate(), "CreationDate is null");
+        checkNotNull(getArbitratorAddresses(), "Arbitrator is null");
+        checkNotNull(getDate(), "CreationDate is null");
         checkNotNull(getCurrencyCode(), "Currency is null");
         checkNotNull(getDirection(), "Direction is null");
         checkNotNull(getId(), "Id is null");
@@ -155,14 +160,12 @@ public class Offer implements Serializable {
         checkNotNull(getMinAmount(), "MinAmount is null");
         checkNotNull(getPrice(), "Price is null");
 
-        checkArgument(getMinAmount().compareTo(Restrictions.MIN_TRADE_AMOUNT) >= 0, "MinAmount is less then " + Restrictions.MIN_TRADE_AMOUNT
-                .toFriendlyString());
-        checkArgument(getAmount().compareTo(Restrictions.MAX_TRADE_AMOUNT) <= 0, "Amount is larger then " + Restrictions.MAX_TRADE_AMOUNT.toFriendlyString());
+        checkArgument(getMinAmount().compareTo(Restrictions.MIN_TRADE_AMOUNT) >= 0, "MinAmount is less then "
+                + Restrictions.MIN_TRADE_AMOUNT.toFriendlyString());
+        checkArgument(getAmount().compareTo(Restrictions.MAX_TRADE_AMOUNT) <= 0, "Amount is larger then "
+                + Restrictions.MAX_TRADE_AMOUNT.toFriendlyString());
         checkArgument(getAmount().compareTo(getMinAmount()) >= 0, "MinAmount is larger then Amount");
 
-        checkArgument(getSecurityDeposit().compareTo(Restrictions.MIN_SECURITY_DEPOSIT) >= 0,
-                "SecurityDeposit is less then " + Restrictions.MIN_SECURITY_DEPOSIT.toFriendlyString());
-
         checkArgument(getPrice().isPositive(), "Price is not a positive value");
         // TODO check upper and lower bounds for fiat
     }
@@ -172,7 +175,7 @@ public class Offer implements Serializable {
     }
 
     public boolean isMyOffer(KeyRing keyRing) {
-        return getPubKeyRing().getHashString().equals(keyRing.getPubKeyRing().getHashString());
+        return getPubKeyRing().equals(keyRing.getPubKeyRing());
     }
 
     public Fiat getVolumeByAmount(Coin amount) {
@@ -183,11 +186,15 @@ public class Offer implements Serializable {
     }
 
     public Fiat getOfferVolume() {
-        return getVolumeByAmount(amount);
+        return getVolumeByAmount(getAmount());
     }
 
     public Fiat getMinOfferVolume() {
-        return getVolumeByAmount(minAmount);
+        return getVolumeByAmount(getMinAmount());
+    }
+
+    public String getReferenceText() {
+        return id.substring(0, 8);
     }
 
 
@@ -195,21 +202,16 @@ public class Offer implements Serializable {
     // Availability
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void checkOfferAvailability(OfferAvailabilityModel model) {
-        availabilityProtocol = new OfferAvailabilityProtocol(model,
-                () -> cancelAvailabilityRequest(),
-                (errorMessage) -> cancelAvailabilityRequest());
-        availabilityProtocol.checkOfferAvailability();
-    }
-
-
     public void checkOfferAvailability(OfferAvailabilityModel model, ResultHandler resultHandler) {
         availabilityProtocol = new OfferAvailabilityProtocol(model,
                 () -> {
                     cancelAvailabilityRequest();
                     resultHandler.handleResult();
                 },
-                (errorMessage) -> availabilityProtocol.cancel());
+                (errorMessage) -> {
+                    availabilityProtocol.cancel();
+                    log.error(errorMessage);
+                });
         availabilityProtocol.checkOfferAvailability();
     }
 
@@ -232,31 +234,52 @@ public class Offer implements Serializable {
         this.offerFeePaymentTxID = offerFeePaymentTxID;
     }
 
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessageProperty.set(errorMessage);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @NotNull
+    @Override
+    public long getTTL() {
+        return TTL;
+    }
+
+    @Override
+    public PublicKey getPubKey() {
+        return pubKeyRing.getStorageSignaturePubKey();
+    }
+
+
     public String getId() {
         return id;
     }
 
+    public String getShortId() {
+        return id.substring(0, 8);
+    }
+
+    public Address getOffererAddress() {
+        return offererAddress;
+    }
+
     public PubKeyRing getPubKeyRing() {
         return pubKeyRing;
     }
 
-
     public Fiat getPrice() {
         return Fiat.valueOf(currencyCode, fiatPrice);
     }
 
     public Coin getAmount() {
-        return amount;
+        return Coin.valueOf(amount);
     }
 
     public Coin getMinAmount() {
-        return minAmount;
+        return Coin.valueOf(minAmount);
     }
 
     public Direction getDirection() {
@@ -267,45 +290,34 @@ public class Offer implements Serializable {
         return direction == Direction.BUY ? Direction.SELL : Direction.BUY;
     }
 
-    public FiatAccount.Type getFiatAccountType() {
-        return fiatAccountType;
+    public PaymentMethod getPaymentMethod() {
+        return PaymentMethod.getPaymentMethodByName(paymentMethodName);
     }
 
     public String getCurrencyCode() {
         return currencyCode;
     }
 
-    public Country getBankAccountCountry() {
-        return bankAccountCountry;
+    @Nullable
+    public String getPaymentMethodCountryCode() {
+        return paymentMethodCountryCode;
     }
 
-    public List<Country> getAcceptedCountries() {
-        return acceptedCountries;
-    }
-
-    public List<String> getAcceptedLanguageCodes() {
-        return acceptedLanguageCodes;
+    @Nullable
+    public List<String> getAcceptedCountryCodes() {
+        return acceptedCountryCodes;
     }
 
     public String getOfferFeePaymentTxID() {
         return offerFeePaymentTxID;
     }
 
-    public List<String> getArbitratorIds() {
-        return arbitratorIds;
+    public List<Address> getArbitratorAddresses() {
+        return arbitratorAddresses;
     }
 
-    @NotNull
-    public Coin getSecurityDeposit() {
-        return securityDeposit;
-    }
-
-    public String getBankAccountId() {
-        return bankAccountUID;
-    }
-
-    public Date getCreationDate() {
-        return creationDate;
+    public Date getDate() {
+        return new Date(date);
     }
 
     public State getState() {
@@ -316,27 +328,83 @@ public class Offer implements Serializable {
         return stateProperty;
     }
 
+    public String getOffererPaymentAccountId() {
+        return offererPaymentAccountId;
+    }
+
+    public ReadOnlyStringProperty errorMessageProperty() {
+        return errorMessageProperty;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Offer)) return false;
+
+        Offer offer = (Offer) o;
+
+        if (date != offer.date) return false;
+        if (fiatPrice != offer.fiatPrice) return false;
+        if (amount != offer.amount) return false;
+        if (minAmount != offer.minAmount) return false;
+        if (id != null ? !id.equals(offer.id) : offer.id != null) return false;
+        if (direction != offer.direction) return false;
+        if (currencyCode != null ? !currencyCode.equals(offer.currencyCode) : offer.currencyCode != null) return false;
+        if (offererAddress != null ? !offererAddress.equals(offer.offererAddress) : offer.offererAddress != null)
+            return false;
+        if (pubKeyRing != null ? !pubKeyRing.equals(offer.pubKeyRing) : offer.pubKeyRing != null) return false;
+        if (paymentMethodName != null ? !paymentMethodName.equals(offer.paymentMethodName) : offer.paymentMethodName != null)
+            return false;
+        if (paymentMethodCountryCode != null ? !paymentMethodCountryCode.equals(offer.paymentMethodCountryCode) : offer.paymentMethodCountryCode != null)
+            return false;
+        if (offererPaymentAccountId != null ? !offererPaymentAccountId.equals(offer.offererPaymentAccountId) : offer.offererPaymentAccountId != null)
+            return false;
+        if (acceptedCountryCodes != null ? !acceptedCountryCodes.equals(offer.acceptedCountryCodes) : offer.acceptedCountryCodes != null)
+            return false;
+        if (arbitratorAddresses != null ? !arbitratorAddresses.equals(offer.arbitratorAddresses) : offer.arbitratorAddresses != null)
+            return false;
+        return !(offerFeePaymentTxID != null ? !offerFeePaymentTxID.equals(offer.offerFeePaymentTxID) : offer.offerFeePaymentTxID != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (direction != null ? direction.hashCode() : 0);
+        result = 31 * result + (currencyCode != null ? currencyCode.hashCode() : 0);
+        result = 31 * result + (int) (date ^ (date >>> 32));
+        result = 31 * result + (int) (fiatPrice ^ (fiatPrice >>> 32));
+        result = 31 * result + (int) (amount ^ (amount >>> 32));
+        result = 31 * result + (int) (minAmount ^ (minAmount >>> 32));
+        result = 31 * result + (offererAddress != null ? offererAddress.hashCode() : 0);
+        result = 31 * result + (pubKeyRing != null ? pubKeyRing.hashCode() : 0);
+        result = 31 * result + (paymentMethodName != null ? paymentMethodName.hashCode() : 0);
+        result = 31 * result + (paymentMethodCountryCode != null ? paymentMethodCountryCode.hashCode() : 0);
+        result = 31 * result + (offererPaymentAccountId != null ? offererPaymentAccountId.hashCode() : 0);
+        result = 31 * result + (acceptedCountryCodes != null ? acceptedCountryCodes.hashCode() : 0);
+        result = 31 * result + (arbitratorAddresses != null ? arbitratorAddresses.hashCode() : 0);
+        result = 31 * result + (offerFeePaymentTxID != null ? offerFeePaymentTxID.hashCode() : 0);
+        return result;
+    }
+
     @Override
     public String toString() {
         return "Offer{" +
                 "id='" + id + '\'' +
                 ", direction=" + direction +
                 ", currencyCode='" + currencyCode + '\'' +
-                ", creationDate=" + creationDate +
+                ", date=" + date +
                 ", fiatPrice=" + fiatPrice +
                 ", amount=" + amount +
                 ", minAmount=" + minAmount +
-               /* ", pubKeyRing=" + pubKeyRing +*/
-                ", fiatAccountType=" + fiatAccountType +
-                ", bankAccountCountry=" + bankAccountCountry +
-                ", securityDeposit=" + securityDeposit +
-                ", acceptedCountries=" + acceptedCountries +
-                ", acceptedLanguageCodes=" + acceptedLanguageCodes +
-                ", bankAccountUID='" + bankAccountUID + '\'' +
-                ", arbitratorIds=" + arbitratorIds +
+                ", address=" + offererAddress +
+                ", pubKeyRing.hashCode()=" + pubKeyRing.hashCode() +
+                ", paymentMethodName='" + paymentMethodName + '\'' +
+                ", paymentMethodCountryCode='" + paymentMethodCountryCode + '\'' +
+                ", offererPaymentAccountId='" + offererPaymentAccountId + '\'' +
+                ", acceptedCountryCodes=" + acceptedCountryCodes +
+                ", arbitratorAddresses=" + arbitratorAddresses +
                 ", offerFeePaymentTxID='" + offerFeePaymentTxID + '\'' +
-                ", state=" + state +
-                ", stateProperty=" + stateProperty +
                 '}';
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java b/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java
index ac4d90d7eb..1f1eaca69a 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java
@@ -17,37 +17,69 @@
 
 package io.bitsquare.trade.offer;
 
-import io.bitsquare.common.handlers.FaultHandler;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.p2p.DHTService;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.storage.HashSetChangedListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import javafx.beans.property.ReadOnlyLongProperty;
+/**
+ * Handles storage and retrieval of offers.
+ * Uses an invalidation flag to only request the full offer map in case there was a change (anyone has added or removed an offer).
+ */
+public class OfferBookService {
+    private static final Logger log = LoggerFactory.getLogger(OfferBookService.class);
 
-public interface OfferBookService extends DHTService {
+    private P2PService p2PService;
 
-    void getOffers(String fiatCode);
 
-    void addOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler);
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
 
-    void removeOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler);
+    @Inject
+    public OfferBookService(P2PService p2PService) {
+        this.p2PService = p2PService;
+    }
 
-    void removeOfferAtShutDown(Offer offer);
+    public void addHashSetChangedListener(HashSetChangedListener hashSetChangedListener) {
+        p2PService.addHashSetChangedListener(hashSetChangedListener);
+    }
 
-    void addListener(Listener listener);
+    public void addOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        boolean result = p2PService.addData(offer);
+        if (result) {
+            log.trace("Add offer to network was successful. Offer = " + offer);
+            resultHandler.handleResult();
+        } else {
+            errorMessageHandler.handleErrorMessage("Add offer failed");
+        }
+    }
 
-    void removeListener(Listener listener);
+    public void removeOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        if (p2PService.removeData(offer)) {
+            log.trace("Remove offer from network was successful. Offer = " + offer);
+            if (resultHandler != null) resultHandler.handleResult();
+        } else {
+            if (errorMessageHandler != null) errorMessageHandler.handleErrorMessage("Remove offer failed");
+        }
+    }
 
-    ReadOnlyLongProperty invalidationTimestampProperty();
+    public List<Offer> getOffers() {
+        final List<Offer> offers = p2PService.getDataMap().values().stream()
+                .filter(e -> e.expirablePayload instanceof Offer)
+                .map(e -> (Offer) e.expirablePayload)
+                .collect(Collectors.toList());
+        return offers;
+    }
 
-    void requestInvalidationTimeStampFromDHT(String fiatCode);
-
-    interface Listener {
-        void onOfferAdded(Offer offer);
-
-        void onOffersReceived(List<Offer> offers);
-
-        void onOfferRemoved(Offer offer);
+    public void removeOfferAtShutDown(Offer offer) {
+        log.debug("removeOfferAtShutDown " + offer);
+        removeOffer(offer, null, null);
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/offer/OfferModule.java b/core/src/main/java/io/bitsquare/trade/offer/OfferModule.java
index 3fdb247670..5e655a5a10 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/OfferModule.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/OfferModule.java
@@ -17,35 +17,22 @@
 
 package io.bitsquare.trade.offer;
 
-import io.bitsquare.BitsquareModule;
-
-import com.google.inject.Injector;
 import com.google.inject.Singleton;
-
+import io.bitsquare.app.AppModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.core.env.Environment;
 
-public abstract class OfferModule extends BitsquareModule {
+public class OfferModule extends AppModule {
     private static final Logger log = LoggerFactory.getLogger(OfferModule.class);
 
-    protected OfferModule(Environment env) {
+    public OfferModule(Environment env) {
         super(env);
     }
 
     @Override
     protected final void configure() {
         bind(OpenOfferManager.class).in(Singleton.class);
-        doConfigure();
+        bind(OfferBookService.class).in(Singleton.class);
     }
-
-    protected void doConfigure() {
-    }
-
-    @Override
-    protected void doClose(Injector injector) {
-        log.trace("doClose " + getClass().getSimpleName());
-        injector.getInstance(OpenOfferManager.class).shutDown();
-    }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java b/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java
index 8f1bb547b1..241c3f855d 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java
@@ -21,23 +21,23 @@ import io.bitsquare.app.Version;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.Tradable;
 import io.bitsquare.trade.TradableList;
-import io.bitsquare.util.Utilities;
-
-import java.io.Serializable;
-
-import java.util.Date;
-import java.util.Timer;
-
+import org.reactfx.util.FxTimer;
+import org.reactfx.util.Timer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Serializable;
+import java.time.Duration;
+import java.util.Date;
+
 public class OpenOffer implements Tradable, Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
 
     private static final Logger log = LoggerFactory.getLogger(OpenOffer.class);
 
-    transient private static final long TIMEOUT = 5000;
+    // Timeout for offer reservation during takeoffer process. If deposit tx is not completed in that time we reset the offer to AVAILABLE state. 
+    transient private static final long TIMEOUT = 30 * 1000;
 
     public enum State {
         AVAILABLE,
@@ -58,7 +58,7 @@ public class OpenOffer implements Tradable, Serializable {
     }
 
     public Date getDate() {
-        return offer.getCreationDate();
+        return offer.getDate();
     }
 
     @Override
@@ -66,6 +66,11 @@ public class OpenOffer implements Tradable, Serializable {
         return offer.getId();
     }
 
+    @Override
+    public String getShortId() {
+        return offer.getShortId();
+    }
+
     public Offer getOffer() {
         return offer;
     }
@@ -94,16 +99,18 @@ public class OpenOffer implements Tradable, Serializable {
     private void startTimeout() {
         stopTimeout();
 
-        timeoutTimer = Utilities.setTimeout(TIMEOUT, () -> {
-            log.debug("Timeout reached");
-            if (state == State.RESERVED)
-                setState(State.AVAILABLE);
-        });
+        timeoutTimer = FxTimer.runLater(
+                Duration.ofMillis(TIMEOUT),
+                () -> {
+                    log.debug("Timeout reached");
+                    if (state == State.RESERVED)
+                        setState(State.AVAILABLE);
+                });
     }
 
-    protected void stopTimeout() {
+    private void stopTimeout() {
         if (timeoutTimer != null) {
-            timeoutTimer.cancel();
+            timeoutTimer.stop();
             timeoutTimer = null;
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
index a93f4986af..da5477b7e9 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java
@@ -17,18 +17,18 @@
 
 package io.bitsquare.trade.offer;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.google.inject.Inject;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.MessageWithPubKey;
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.p2p.DecryptedMessageHandler;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.MessageService;
-import io.bitsquare.p2p.Peer;
-import io.bitsquare.p2p.listener.SendMessageListener;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.P2PServiceListener;
+import io.bitsquare.p2p.messaging.SendMailMessageListener;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.TradableList;
 import io.bitsquare.trade.closed.ClosedTradableManager;
@@ -37,43 +37,39 @@ import io.bitsquare.trade.protocol.availability.messages.OfferAvailabilityReques
 import io.bitsquare.trade.protocol.availability.messages.OfferAvailabilityResponse;
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferProtocol;
-import io.bitsquare.user.AccountSettings;
 import io.bitsquare.user.User;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.utils.Fiat;
-
-import com.google.inject.Inject;
-
-import java.io.File;
-
-import java.util.Optional;
-
-import javax.inject.Named;
-
 import javafx.collections.ObservableList;
-
+import org.reactfx.util.FxTimer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Named;
+import java.io.File;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.inject.internal.util.$Preconditions.checkNotNull;
 import static io.bitsquare.util.Validator.nonEmptyStringOf;
 
 public class OpenOfferManager {
     private static final Logger log = LoggerFactory.getLogger(OpenOfferManager.class);
 
-    private final User user;
     private final KeyRing keyRing;
-    private final AccountSettings accountSettings;
+    private User user;
+    private P2PService p2PService;
     private final WalletService walletService;
-    private MessageService messageService;
     private final TradeWalletService tradeWalletService;
     private final OfferBookService offerBookService;
-    private ClosedTradableManager closedTradableManager;
+    private final ClosedTradableManager closedTradableManager;
 
     private final TradableList<OpenOffer> openOffers;
     private final Storage<TradableList<OpenOffer>> openOffersStorage;
     private boolean shutDownRequested;
+    private ScheduledThreadPoolExecutor executor;
+    private P2PServiceListener p2PServiceListener;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -81,20 +77,18 @@ public class OpenOfferManager {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public OpenOfferManager(User user,
-                            KeyRing keyRing,
-                            AccountSettings accountSettings,
+    public OpenOfferManager(KeyRing keyRing,
+                            User user,
+                            P2PService p2PService,
                             WalletService walletService,
-                            MessageService messageService,
                             TradeWalletService tradeWalletService,
                             OfferBookService offerBookService,
                             ClosedTradableManager closedTradableManager,
                             @Named("storage.dir") File storageDir) {
-        this.user = user;
         this.keyRing = keyRing;
-        this.accountSettings = accountSettings;
+        this.user = user;
+        this.p2PService = p2PService;
         this.walletService = walletService;
-        this.messageService = messageService;
         this.tradeWalletService = tradeWalletService;
         this.offerBookService = offerBookService;
         this.closedTradableManager = closedTradableManager;
@@ -105,6 +99,15 @@ public class OpenOfferManager {
         // In case the app did get killed the shutDown from the modules is not called, so we use a shutdown hook
         Thread shutDownHookThread = new Thread(OpenOfferManager.this::shutDown, "OpenOfferManager.ShutDownHook");
         Runtime.getRuntime().addShutdownHook(shutDownHookThread);
+
+        // Handler for incoming offer availability requests
+        p2PService.addDecryptedMailListener((decryptedMessageWithPubKey, peerAddress) -> {
+            // We get an encrypted message but don't do the signature check as we don't know the peer yet.
+            // A basic sig check is in done also at decryption time
+            Message message = decryptedMessageWithPubKey.message;
+            if (message instanceof OfferAvailabilityRequest)
+                handleOfferAvailabilityRequest((OfferAvailabilityRequest) message, peerAddress);
+        });
     }
 
 
@@ -115,36 +118,94 @@ public class OpenOfferManager {
     public void onAllServicesInitialized() {
         log.trace("onAllServicesInitialized");
 
-        // Handler for incoming offer availability requests
-        messageService.addDecryptedMessageHandler(new DecryptedMessageHandler() {
-            @Override
-            public void handleMessage(MessageWithPubKey messageWithPubKey, Peer sender) {
-                // We get an encrypted message but don't do the signature check as we don't know the peer yet.
-                // A basic sig check is in done also at decryption time
-                Message message = messageWithPubKey.getMessage();
-                if (message instanceof OfferAvailabilityRequest)
-                    handleOfferAvailabilityRequest((OfferAvailabilityRequest) message, sender);
-            }
-        });
+        // We add own offers to offerbook when we go online again
+        // setupAnStartRePublishThread will re-publish at method call
 
+        // Before the TTL is reached we re-publish our offers
+        // If offer removal at shutdown fails we don't want to have long term dangling dead offers, so we set TTL quite short and use re-publish as 
+        // strategy. Offerers need to be online anyway.
+        if (!p2PService.isAuthenticated()) {
+            p2PServiceListener = new P2PServiceListener() {
+                @Override
+                public void onTorNodeReady() {
+                }
+
+                @Override
+                public void onHiddenServiceReady() {
+                }
+
+                @Override
+                public void onSetupFailed(Throwable throwable) {
+                }
+
+                @Override
+                public void onAllDataReceived() {
+                }
+
+                @Override
+                public void onAuthenticated() {
+                    startRePublishThread();
+                }
+            };
+            p2PService.addP2PServiceListener(p2PServiceListener);
+
+        } else {
+            startRePublishThread();
+        }
+    }
+
+    private void startRePublishThread() {
+        if (p2PServiceListener != null) p2PService.removeP2PServiceListener(p2PServiceListener);
+
+        ThreadFactoryBuilder builder = new ThreadFactoryBuilder()
+                .setDaemon(true)
+                .setNameFormat("Re-publish offers thread")
+                .setPriority(Thread.MIN_PRIORITY);  // Avoid competing with the GUI thread.
+
+        // An executor that starts up threads when needed and shuts them down later.
+        executor = new ScheduledThreadPoolExecutor(1, builder.build());
+        executor.setKeepAliveTime(5, TimeUnit.SECONDS);
+        executor.allowCoreThreadTimeOut(true);
+        executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+
+        checkArgument(Offer.TTL > 60000, "Offer.TTL <= 60");
+        long period = Offer.TTL - 120000; // 2 min before TTL expires
+        executor.scheduleAtFixedRate(this::rePublishOffers, 0, period, TimeUnit.SECONDS);
+    }
+
+    private void rePublishOffers() {
         for (OpenOffer openOffer : openOffers) {
-            // We add own offers to offerbook when we go online again
             offerBookService.addOffer(openOffer.getOffer(),
-                    () -> log.debug("Successful added offer to DHT"),
-                    (message, throwable) -> log.error("Add offer to DHT failed. " + message));
+                    () -> log.debug("Successful added offer to P2P network"),
+                    errorMessage -> log.error("Add offer to P2P network failed. " + errorMessage));
             //setupDepositPublishedListener(openOffer);
             openOffer.setStorage(openOffersStorage);
         }
     }
 
     public void shutDown() {
+        shutDown(null);
+    }
+
+    public void shutDown(Runnable completeHandler) {
+        if (executor != null) {
+            executor.shutdown();
+            try {
+                executor.awaitTermination(5, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+
         if (!shutDownRequested) {
             log.debug("shutDown");
             shutDownRequested = true;
-            // we remove own offers form offerbook when we go offline
+            // we remove own offers from offerbook when we go offline
             for (OpenOffer openOffer : openOffers) {
                 offerBookService.removeOfferAtShutDown(openOffer.getOffer());
             }
+
+            FxTimer.runLater(Duration.ofMillis(500), completeHandler::run);
         }
     }
 
@@ -153,31 +214,10 @@ public class OpenOfferManager {
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void onPlaceOffer(String id,
-                             Offer.Direction direction,
-                             Fiat price,
-                             Coin amount,
-                             Coin minAmount,
-                             TransactionResultHandler resultHandler,
-                             ErrorMessageHandler errorMessageHandler) {
+    public void onPlaceOffer(Offer offer,
+                             TransactionResultHandler resultHandler) {
 
-        FiatAccount fiatAccount = user.currentFiatAccountProperty().get();
-        Offer offer = new Offer(id,
-                keyRing.getPubKeyRing(),
-                direction,
-                price.getValue(),
-                amount,
-                minAmount,
-                fiatAccount.type,
-                fiatAccount.currencyCode,
-                fiatAccount.country,
-                fiatAccount.id,
-                accountSettings.getAcceptedArbitratorIds(),
-                accountSettings.getSecurityDeposit(),
-                accountSettings.getAcceptedCountries(),
-                accountSettings.getAcceptedLanguageLocaleCodes());
-
-        PlaceOfferModel model = new PlaceOfferModel(offer, walletService, tradeWalletService, offerBookService);
+        PlaceOfferModel model = new PlaceOfferModel(offer, walletService, tradeWalletService, offerBookService, user);
 
         PlaceOfferProtocol placeOfferProtocol = new PlaceOfferProtocol(
                 model,
@@ -186,21 +226,20 @@ public class OpenOfferManager {
                     openOffers.add(openOffer);
                     openOffersStorage.queueUpForSave();
                     resultHandler.handleResult(transaction);
-                },
-                errorMessageHandler::handleErrorMessage
+                }
         );
 
         placeOfferProtocol.placeOffer();
     }
 
 
-    public void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+    public void onRemoveOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
         Optional<OpenOffer> openOfferOptional = findOpenOffer(offer.getId());
         if (openOfferOptional.isPresent())
-            onCancelOpenOffer(openOfferOptional.get(), resultHandler, errorMessageHandler);
+            onRemoveOpenOffer(openOfferOptional.get(), resultHandler, errorMessageHandler);
     }
 
-    public void onCancelOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+    public void onRemoveOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
         offerBookService.removeOffer(openOffer.getOffer(),
                 () -> {
                     openOffer.getOffer().setState(Offer.State.REMOVED);
@@ -210,7 +249,7 @@ public class OpenOfferManager {
                     //disposeCheckOfferAvailabilityRequest(offer);
                     resultHandler.handleResult();
                 },
-                (message, throwable) -> errorMessageHandler.handleErrorMessage(message));
+                errorMessageHandler);
     }
 
     public void reserveOpenOffer(OpenOffer openOffer) {
@@ -241,7 +280,7 @@ public class OpenOfferManager {
             openOffer.setState(OpenOffer.State.CLOSED);
             offerBookService.removeOffer(openOffer.getOffer(),
                     () -> log.trace("Successful removed offer"),
-                    (message, throwable) -> log.error(message));
+                    errorMessage -> log.error(errorMessage));
         });
 
     }
@@ -251,7 +290,7 @@ public class OpenOfferManager {
     // Offer Availability
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handleOfferAvailabilityRequest(OfferAvailabilityRequest message, Peer sender) {
+    private void handleOfferAvailabilityRequest(OfferAvailabilityRequest message, Address sender) {
         log.trace("handleNewMessage: message = " + message.getClass().getSimpleName() + " from " + sender);
         try {
             nonEmptyStringOf(message.offerId);
@@ -264,20 +303,18 @@ public class OpenOfferManager {
         Optional<OpenOffer> openOfferOptional = findOpenOffer(message.offerId);
         boolean isAvailable = openOfferOptional.isPresent() && openOfferOptional.get().getState() == OpenOffer.State.AVAILABLE;
         try {
-            OfferAvailabilityResponse offerAvailabilityResponse = new OfferAvailabilityResponse(message.offerId, isAvailable);
-            messageService.sendEncryptedMessage(sender,
+            p2PService.sendEncryptedMailMessage(sender,
                     message.getPubKeyRing(),
-                    offerAvailabilityResponse,
-                    false,
-                    new SendMessageListener() {
+                    new OfferAvailabilityResponse(message.offerId, isAvailable),
+                    new SendMailMessageListener() {
                         @Override
-                        public void handleResult() {
-                            log.trace("ReportOfferAvailabilityMessage successfully arrived at peer");
+                        public void onArrived() {
+                            log.trace("OfferAvailabilityResponse successfully arrived at peer");
                         }
 
                         @Override
-                        public void handleFault() {
-                            log.info("Sending ReportOfferAvailabilityMessage failed.");
+                        public void onFault() {
+                            log.info("Sending OfferAvailabilityResponse failed.");
                         }
                     });
         } catch (Throwable t) {
@@ -285,4 +322,8 @@ public class OpenOfferManager {
             log.info("Exception at handleRequestIsOfferAvailableMessage " + t.getMessage());
         }
     }
+
+    public Optional<OpenOffer> getOpenOfferById(String offerId) {
+        return openOffers.stream().filter(e -> e.getId().equals(offerId)).findFirst();
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferBookService.java b/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferBookService.java
deleted file mode 100644
index fc2e7fa520..0000000000
--- a/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferBookService.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * 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.trade.offer.tomp2p;
-
-import io.bitsquare.common.handlers.FaultHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.p2p.tomp2p.TomP2PDHTService;
-import io.bitsquare.p2p.tomp2p.TomP2PNode;
-import io.bitsquare.trade.offer.Offer;
-import io.bitsquare.trade.offer.OfferBookService;
-
-import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import javafx.beans.property.LongProperty;
-import javafx.beans.property.ReadOnlyLongProperty;
-import javafx.beans.property.SimpleLongProperty;
-
-import net.tomp2p.dht.FutureGet;
-import net.tomp2p.dht.FuturePut;
-import net.tomp2p.dht.FutureRemove;
-import net.tomp2p.futures.BaseFuture;
-import net.tomp2p.futures.BaseFutureAdapter;
-import net.tomp2p.futures.BaseFutureListener;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.Number640;
-import net.tomp2p.storage.Data;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TomP2POfferBookService extends TomP2PDHTService implements OfferBookService {
-    private static final Logger log = LoggerFactory.getLogger(TomP2POfferBookService.class);
-    //private static final int TTL = 30 * 24 * 60 * 60;   // the offer is default 30 days valid
-    private static final int TTL = 2 * 60 * 60;   // for testing the offer is only 2 hour valid
-
-    private final List<Listener> offerRepositoryListeners = new ArrayList<>();
-    private final LongProperty invalidationTimestamp = new SimpleLongProperty(0);
-
-    @Inject
-    public TomP2POfferBookService(TomP2PNode tomP2PNode, KeyRing keyRing) {
-        super(tomP2PNode, keyRing);
-    }
-
-    @Override
-    public void shutDown() {
-        super.shutDown();
-    }
-
-    @Override
-    public void addOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler) {
-        log.debug("addOffer " + offer);
-        Number160 locationKey = Number160.createHash(offer.getCurrencyCode());
-        try {
-            final Data offerData = new Data(offer);
-            offerData.ttlSeconds(TTL);
-            log.trace("Add offer to DHT requested. Added data: [locationKey: " + locationKey +
-                    ", hash: " + offerData.hash().toString() + "]");
-            openRequestsUp();
-            FuturePut futurePut = addProtectedDataToMap(locationKey, offerData);
-            futurePut.addListener(new BaseFutureListener<BaseFuture>() {
-                @Override
-                public void operationComplete(BaseFuture future) throws Exception {
-                    openRequestsDown();
-                    if (future.isSuccess()) {
-                        executor.execute(() -> {
-                            resultHandler.handleResult();
-                            offerRepositoryListeners.stream().forEach(listener -> {
-                                try {
-                                    Object offerDataObject = offerData.object();
-                                    if (offerDataObject instanceof Offer) {
-                                        log.info("Added offer to DHT with ID: " + offerDataObject);
-                                        listener.onOfferAdded((Offer) offerDataObject);
-                                    }
-                                } catch (ClassNotFoundException | IOException e) {
-                                    e.printStackTrace();
-                                    log.error("Add offer to DHT failed: " + e.getMessage());
-                                }
-                            });
-
-                            writeInvalidationTimestampToDHT(offer.getCurrencyCode());
-                            log.trace("Add offer to DHT was successful. Added data: [locationKey: " + locationKey +
-                                    ", value: " + offerData + "]");
-                        });
-                    }
-                }
-
-                @Override
-                public void exceptionCaught(Throwable ex) throws Exception {
-                    openRequestsDown();
-                    executor.execute(() -> faultHandler.handleFault("Failed to add offer to DHT", ex));
-                }
-            });
-        } catch (IOException ex) {
-            openRequestsDown();
-            executor.execute(() -> faultHandler.handleFault("Failed to add offer to DHT", ex));
-        }
-    }
-
-    public void removeOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler) {
-        log.debug("removeOffer " + offer);
-        Number160 locationKey = Number160.createHash(offer.getCurrencyCode());
-        try {
-            final Data offerData = new Data(offer);
-            log.trace("Remove offer from DHT requested. Removed data: [locationKey: " + locationKey +
-                    ", hash: " + offerData.hash().toString() + "]");
-            openRequestsUp();
-            FutureRemove futureRemove = removeProtectedDataFromMap(locationKey, offerData);
-            futureRemove.addListener(new BaseFutureListener<BaseFuture>() {
-                @Override
-                public void operationComplete(BaseFuture future) throws Exception {
-                    openRequestsDown();
-                    // We don't test futureRemove.isSuccess() as this API does not fit well to that operation, 
-                    // it might change in future to something like foundAndRemoved and notFound
-                    // See discussion at: https://github.com/tomp2p/TomP2P/issues/57#issuecomment-62069840
-                    log.trace("isRemoved? " + futureRemove.isRemoved());
-                    executor.execute(() -> {
-                        resultHandler.handleResult();
-                        offerRepositoryListeners.stream().forEach(listener -> {
-                            try {
-                                Object offerDataObject = offerData.object();
-                                if (offerDataObject instanceof Offer) {
-                                    log.trace("Remove offer from DHT was successful. Removed data: [key: " +
-                                            locationKey + ", " +
-                                            "offer: " + offerDataObject + "]");
-                                    listener.onOfferRemoved((Offer) offerDataObject);
-                                }
-                            } catch (ClassNotFoundException | IOException e) {
-                                e.printStackTrace();
-                                log.error("Remove offer from DHT failed. Error: " + e.getMessage());
-                                faultHandler.handleFault("Remove offer from DHT failed. Error: " + e.getMessage(), e);
-                            }
-                        });
-                        writeInvalidationTimestampToDHT(offer.getCurrencyCode());
-                    });
-                }
-
-                @Override
-                public void exceptionCaught(Throwable t) throws Exception {
-                    openRequestsDown();
-                    log.error("Remove offer from DHT failed. Error: " + t.getMessage());
-                    faultHandler.handleFault("Remove offer from DHT failed. Error: " + t.getMessage(), t);
-                }
-            });
-        } catch (IOException e) {
-            openRequestsDown();
-            e.printStackTrace();
-            log.error("Remove offer from DHT failed. Error: " + e.getMessage());
-            faultHandler.handleFault("Remove offer from DHT failed. Error: " + e.getMessage(), e);
-        }
-    }
-
-    public void removeOfferAtShutDown(Offer offer) {
-        log.debug("removeOfferAtShutDown " + offer);
-        Number160 locationKey = Number160.createHash(offer.getCurrencyCode());
-        try {
-            final Data offerData = new Data(offer);
-            log.trace("Remove offer from DHT requested. Removed data: [locationKey: " + locationKey +
-                    ", hash: " + offerData.hash().toString() + "]");
-            openRequestsUp();
-            FutureRemove futureRemove = removeProtectedDataFromMap(locationKey, offerData);
-            writeInvalidationTimestampToDHT(offer.getCurrencyCode());
-            futureRemove.addListener(new BaseFutureListener<BaseFuture>() {
-                @Override
-                public void operationComplete(BaseFuture future) throws Exception {
-                    openRequestsDown();
-                    log.trace("isRemoved? " + futureRemove.isRemoved());
-                }
-
-                @Override
-                public void exceptionCaught(Throwable t) throws Exception {
-                    openRequestsDown();
-                    log.error("Remove offer from DHT failed. Error: " + t.getMessage());
-                }
-            });
-
-            log.trace("isRemoved? " + futureRemove.isRemoved());
-        } catch (IOException e) {
-            openRequestsDown();
-            e.printStackTrace();
-            log.error("Remove offer from DHT failed. Error: " + e.getMessage());
-        }
-    }
-
-    public void getOffers(String currencyCode) {
-        Number160 locationKey = Number160.createHash(currencyCode);
-        log.trace("Get offers from DHT requested for locationKey: " + locationKey);
-        FutureGet futureGet = getMap(locationKey);
-        futureGet.addListener(new BaseFutureAdapter<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                final Map<Number640, Data> dataMap = futureGet.dataMap();
-                if (future.isSuccess()) {
-                    log.trace("Get offers from DHT was successful. Received data: [key: " + locationKey
-                            + ", values: " + futureGet.dataMap() + "]");
-                    final List<Offer> offers = new ArrayList<>();
-                    if (dataMap != null) {
-                        for (Data offerData : dataMap.values()) {
-                            try {
-                                Object offerDataObject = offerData.object();
-                                if (offerDataObject instanceof Offer) {
-                                    offers.add((Offer) offerDataObject);
-                                }
-                            } catch (ClassCastException | ClassNotFoundException | IOException e) {
-                                e.printStackTrace();
-                                log.warn(e.getMessage());
-                            }
-                        }
-                        log.trace("Get offers with offers.size(): " + offers.size());
-                        executor.execute(() -> offerRepositoryListeners.stream().forEach(listener ->
-                                listener.onOffersReceived(offers)));
-                    }
-                }
-                else {
-                    if (dataMap == null || dataMap.size() == 0) {
-                        log.trace("Get offers from DHT delivered empty dataMap.");
-                        executor.execute(() -> offerRepositoryListeners.stream().forEach(listener ->
-                                listener.onOffersReceived(new ArrayList<>())));
-                    }
-                    else {
-                        log.error("Get offers from DHT  was not successful with reason:" + future.failedReason());
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    public void addListener(Listener listener) {
-        offerRepositoryListeners.add(listener);
-    }
-
-    @Override
-    public void removeListener(Listener listener) {
-        offerRepositoryListeners.remove(listener);
-    }
-
-    /*
-     * We store the timestamp of any change of the offer list (add, remove offer) and we poll
-     * in intervals for changes. If we detect a change we request the offer list from the DHT.
-     * Polling should be replaced by a push based solution later.
-     */
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Polling
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void writeInvalidationTimestampToDHT(String currencyCode) {
-        invalidationTimestamp.set(System.currentTimeMillis());
-        try {
-            openRequestsUp();
-            FuturePut putFuture = putData(getInvalidatedLocationKey(currencyCode),
-                    new Data(invalidationTimestamp.get()));
-            putFuture.addListener(new BaseFutureListener<BaseFuture>() {
-                @Override
-                public void operationComplete(BaseFuture future) throws Exception {
-                    openRequestsDown();
-                    if (future.isSuccess())
-                        log.trace("Update invalidationTimestamp to DHT was successful. TimeStamp=" +
-                                invalidationTimestamp.get());
-                    else
-                        log.error("Update invalidationTimestamp to DHT failed with reason:" + putFuture.failedReason());
-                }
-
-                @Override
-                public void exceptionCaught(Throwable t) throws Exception {
-                    openRequestsDown();
-                    log.error("Update invalidationTimestamp to DHT failed with exception:" + t.getMessage());
-                }
-            });
-        } catch (IOException e) {
-            openRequestsDown();
-            log.error("Update invalidationTimestamp to DHT failed with exception:" + e.getMessage());
-        }
-    }
-
-    public ReadOnlyLongProperty invalidationTimestampProperty() {
-        return invalidationTimestamp;
-    }
-
-    public void requestInvalidationTimeStampFromDHT(String currencyCode) {
-        FutureGet futureGet = getData(getInvalidatedLocationKey(currencyCode));
-        futureGet.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                if (future.isSuccess()) {
-                    Data data = futureGet.data();
-                    if (data != null && data.object() instanceof Long) {
-                        final Object object = data.object();
-                        executor.execute(() -> {
-                            Long timeStamp = (Long) object;
-                            //log.trace("Get invalidationTimestamp from DHT was successful. TimeStamp=" + timeStamp);
-                            invalidationTimestamp.set(timeStamp);
-                        });
-                    }
-                    else if (data == null) {
-                        // OK for an empty list
-                        // log.trace("Get invalidationTimestamp from DHT returns null. That is ok for an empty list.");
-                    }
-                    else if (data != null) {
-                        log.error("Get invalidationTimestamp from DHT failed. Data = " + data);
-                    }
-                }
-                else if (futureGet.data() == null) {
-                    // OK as nothing is set at the moment
-                    // log.trace("Get invalidationTimestamp from DHT returns null. That is ok for the startup.");
-                }
-                else {
-                    log.error("Get invalidationTimestamp from DHT failed with reason:" + futureGet.failedReason());
-                }
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-                log.error("Get invalidationTimestamp from DHT failed with exception:" + t.getMessage());
-                t.printStackTrace();
-            }
-        });
-    }
-
-    private Number160 getInvalidatedLocationKey(String currencyCode) {
-        return Number160.createHash(currencyCode + "lastChangeTimestamp");
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferModule.java b/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferModule.java
deleted file mode 100644
index 915b9fa0cf..0000000000
--- a/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferModule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.trade.offer.tomp2p;
-
-import io.bitsquare.trade.offer.OfferBookService;
-import io.bitsquare.trade.offer.OfferModule;
-
-import com.google.inject.Singleton;
-
-import org.springframework.core.env.Environment;
-
-public class TomP2POfferModule extends OfferModule {
-
-    public TomP2POfferModule(Environment env) {
-        super(env);
-    }
-
-    @Override
-    protected void doConfigure() {
-        bind(OfferBookService.class).to(TomP2POfferBookService.class).in(Singleton.class);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityModel.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityModel.java
index 563e5ad377..41af1f317d 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityModel.java
@@ -17,14 +17,12 @@
 
 package io.bitsquare.trade.protocol.availability;
 
+import io.bitsquare.common.crypto.PubKeyRing;
 import io.bitsquare.common.taskrunner.Model;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.p2p.AddressService;
-import io.bitsquare.p2p.MessageService;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.P2PService;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.availability.messages.OfferMessage;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,26 +30,26 @@ public class OfferAvailabilityModel implements Model {
     private static final Logger log = LoggerFactory.getLogger(OfferAvailabilityModel.class);
 
     public final Offer offer;
-    private final PubKeyRing pubKeyRing;
-    public final MessageService messageService;
-    public final AddressService addressService;
+    public final PubKeyRing pubKeyRing;
+    public final P2PService p2PService;
 
-    private Peer peer;
+    private Address peerAddress;
     private OfferMessage message;
 
-    public OfferAvailabilityModel(Offer offer, PubKeyRing pubKeyRing, MessageService messageService, AddressService addressService) {
+    public OfferAvailabilityModel(Offer offer,
+                                  PubKeyRing pubKeyRing,
+                                  P2PService p2PService) {
         this.offer = offer;
         this.pubKeyRing = pubKeyRing;
-        this.messageService = messageService;
-        this.addressService = addressService;
+        this.p2PService = p2PService;
     }
 
-    public Peer getPeer() {
-        return peer;
+    public Address getPeerAddress() {
+        return peerAddress;
     }
 
-    public void setPeer(Peer peer) {
-        this.peer = peer;
+    public void setPeerAddress(Address peerAddress) {
+        this.peerAddress = peerAddress;
     }
 
     public void setMessage(OfferMessage message) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java
index 0ac463b9e4..612fca53f0 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/OfferAvailabilityProtocol.java
@@ -20,34 +20,32 @@ package io.bitsquare.trade.protocol.availability;
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.crypto.MessageWithPubKey;
-import io.bitsquare.p2p.DecryptedMessageHandler;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.messaging.DecryptedMailListener;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.availability.messages.OfferAvailabilityResponse;
 import io.bitsquare.trade.protocol.availability.messages.OfferMessage;
 import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress;
 import io.bitsquare.trade.protocol.availability.tasks.ProcessOfferAvailabilityResponse;
 import io.bitsquare.trade.protocol.availability.tasks.SendOfferAvailabilityRequest;
-import io.bitsquare.util.Utilities;
-
-import java.util.Timer;
-
+import org.reactfx.util.FxTimer;
+import org.reactfx.util.Timer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.time.Duration;
+
 import static io.bitsquare.util.Validator.nonEmptyStringOf;
 
 public class OfferAvailabilityProtocol {
     private static final Logger log = LoggerFactory.getLogger(OfferAvailabilityProtocol.class);
 
-    private static final long TIMEOUT = 10000;
+    private static final long TIMEOUT = 30 * 1000;
 
     private final OfferAvailabilityModel model;
     private final ResultHandler resultHandler;
     private final ErrorMessageHandler errorMessageHandler;
-    private final DecryptedMessageHandler decryptedMessageHandler;
+    private final DecryptedMailListener decryptedMailListener;
     private Timer timeoutTimer;
 
     private TaskRunner<OfferAvailabilityModel> taskRunner;
@@ -61,12 +59,24 @@ public class OfferAvailabilityProtocol {
         this.model = model;
         this.resultHandler = resultHandler;
         this.errorMessageHandler = errorMessageHandler;
-        decryptedMessageHandler = this::handleDecryptedMessageWithPubKey;
+
+        decryptedMailListener = (decryptedMessageWithPubKey, peerAddress) -> {
+            Message message = decryptedMessageWithPubKey.message;
+            if (message instanceof OfferMessage) {
+                OfferMessage offerMessage = (OfferMessage) message;
+                nonEmptyStringOf(offerMessage.offerId);
+                if (message instanceof OfferAvailabilityResponse
+                        && model.offer.getId().equals(offerMessage.offerId)) {
+                    log.trace("handle OfferAvailabilityResponse = " + message.getClass().getSimpleName() + " from " + peerAddress);
+                    handle((OfferAvailabilityResponse) message);
+                }
+            }
+        };
     }
 
     private void cleanup() {
         stopTimeout();
-        model.messageService.removeDecryptedMessageHandler(decryptedMessageHandler);
+        model.p2PService.removeDecryptedMailListener(decryptedMailListener);
     }
 
 
@@ -78,7 +88,7 @@ public class OfferAvailabilityProtocol {
         // reset
         model.offer.setState(Offer.State.UNDEFINED);
 
-        model.messageService.addDecryptedMessageHandler(decryptedMessageHandler);
+        model.p2PService.addDecryptedMailListener(decryptedMailListener);
 
         taskRunner = new TaskRunner<>(model,
                 () -> {
@@ -88,6 +98,7 @@ public class OfferAvailabilityProtocol {
                 (errorMessage) -> {
                     log.error(errorMessage);
                     stopTimeout();
+                    errorMessageHandler.handleErrorMessage(errorMessage);
                 }
         );
         taskRunner.addTasks(
@@ -108,17 +119,6 @@ public class OfferAvailabilityProtocol {
     // Incoming message handling
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    protected void handleDecryptedMessageWithPubKey(MessageWithPubKey messageWithPubKey, Peer sender) {
-        Message message = messageWithPubKey.getMessage();
-        log.trace("handleNewMessage: message = " + message.getClass().getSimpleName() + " from " + sender);
-        if (message instanceof OfferMessage) {
-            nonEmptyStringOf(((OfferMessage) message).offerId);
-            if (message instanceof OfferAvailabilityResponse && model.offer.getId().equals(((OfferMessage) message).offerId))
-                handle((OfferAvailabilityResponse) message);
-        }
-    }
-
-
     private void handle(OfferAvailabilityResponse message) {
         stopTimeout();
         startTimeout();
@@ -140,19 +140,18 @@ public class OfferAvailabilityProtocol {
         taskRunner.run();
     }
 
-    protected void startTimeout() {
+    private void startTimeout() {
         stopTimeout();
 
-        timeoutTimer = Utilities.setTimeout(TIMEOUT, () -> {
+        timeoutTimer = FxTimer.runLater(Duration.ofMillis(TIMEOUT), () -> {
             log.warn("Timeout reached");
             errorMessageHandler.handleErrorMessage("Timeout reached: Peer has not responded.");
-            model.offer.setState(Offer.State.TIMEOUT);
         });
     }
 
-    protected void stopTimeout() {
+    private void stopTimeout() {
         if (timeoutTimer != null) {
-            timeoutTimer.cancel();
+            timeoutTimer.stop();
             timeoutTimer = null;
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityRequest.java
index 92efbd25f9..cbf90fd61b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityRequest.java
@@ -18,11 +18,9 @@
 package io.bitsquare.trade.protocol.availability.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.crypto.PubKeyRing;
+import io.bitsquare.common.crypto.PubKeyRing;
 
-import java.io.Serializable;
-
-public class OfferAvailabilityRequest extends OfferMessage implements Serializable {
+public class OfferAvailabilityRequest extends OfferMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
@@ -40,8 +38,8 @@ public class OfferAvailabilityRequest extends OfferMessage implements Serializab
     @Override
     public String toString() {
         return "RequestIsOfferAvailableMessage{" +
-                "offerId=" + offerId +
-                "pubKeyRing=" + pubKeyRing != null ? pubKeyRing.toString() : "null" +
+                "\nofferId=" + offerId +
+                "\npubKeyRing=" + pubKeyRing != null ? pubKeyRing.toString() : "null" +
                 '}';
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityResponse.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityResponse.java
index 8d8e428964..7a90bbd47a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityResponse.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferAvailabilityResponse.java
@@ -19,9 +19,7 @@ package io.bitsquare.trade.protocol.availability.messages;
 
 import io.bitsquare.app.Version;
 
-import java.io.Serializable;
-
-public class OfferAvailabilityResponse extends OfferMessage implements Serializable {
+public class OfferAvailabilityResponse extends OfferMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java
index 4e18eaa7b2..8b77e50270 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/OfferMessage.java
@@ -18,14 +18,12 @@
 package io.bitsquare.trade.protocol.availability.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Message;
-
-import java.io.Serializable;
+import io.bitsquare.p2p.messaging.MailMessage;
 
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
-public abstract class OfferMessage implements Message, Serializable {
+public abstract class OfferMessage implements MailMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
index 9be278505a..0fd9af50bf 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
@@ -19,43 +19,25 @@ package io.bitsquare.trade.protocol.availability.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.Peer;
-import io.bitsquare.p2p.listener.GetPeerAddressListener;
-import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.availability.OfferAvailabilityModel;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class GetPeerAddress extends Task<OfferAvailabilityModel> {
-    private static final Logger log = LoggerFactory.getLogger(GetPeerAddress.class);
 
     public GetPeerAddress(TaskRunner taskHandler, OfferAvailabilityModel model) {
         super(taskHandler, model);
-
-        errorMessage = "DHT lookup for peer address failed. Maybe the offerer was offline for too long time.";
     }
 
     @Override
     protected void run() {
         try {
             runInterceptHook();
-            model.addressService.findPeerAddress(model.offer.getPubKeyRing(), new GetPeerAddressListener() {
-                @Override
-                public void onResult(Peer peer) {
-                    model.setPeer(peer);
-                    complete();
-                }
-
-                @Override
-                public void onFailed() {
-                    model.offer.setState(Offer.State.OFFERER_OFFLINE);
-
-                    failed();
-                }
-            });
+            model.setPeerAddress(model.offer.getOffererAddress());
+            complete();
         } catch (Throwable t) {
-            model.offer.setState(Offer.State.FAULT);
+            model.offer.setErrorMessage("An error occurred.\n" +
+                    "Error message:\n"
+                    + t.getMessage());
+
             failed(t);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessOfferAvailabilityResponse.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessOfferAvailabilityResponse.java
index 8751f214d8..073317a80a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessOfferAvailabilityResponse.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessOfferAvailabilityResponse.java
@@ -22,7 +22,6 @@ import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.availability.OfferAvailabilityModel;
 import io.bitsquare.trade.protocol.availability.messages.OfferAvailabilityResponse;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +47,10 @@ public class ProcessOfferAvailabilityResponse extends Task<OfferAvailabilityMode
 
             complete();
         } catch (Throwable t) {
-            model.offer.setState(Offer.State.FAULT);
+            model.offer.setErrorMessage("An error occurred.\n" +
+                    "Error message:\n"
+                    + t.getMessage());
+
             failed(t);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/SendOfferAvailabilityRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/SendOfferAvailabilityRequest.java
index 824d5888bd..cbced22e43 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/SendOfferAvailabilityRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/SendOfferAvailabilityRequest.java
@@ -19,11 +19,10 @@ package io.bitsquare.trade.protocol.availability.tasks;
 
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
+import io.bitsquare.p2p.messaging.SendMailMessageListener;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.availability.OfferAvailabilityModel;
 import io.bitsquare.trade.protocol.availability.messages.OfferAvailabilityRequest;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,26 +37,27 @@ public class SendOfferAvailabilityRequest extends Task<OfferAvailabilityModel> {
     protected void run() {
         try {
             runInterceptHook();
-            OfferAvailabilityRequest message = new OfferAvailabilityRequest(model.offer.getId(), model.getPubKeyRing());
-            model.messageService.sendEncryptedMessage(model.getPeer(),
+
+            model.p2PService.sendEncryptedMailMessage(model.getPeerAddress(),
                     model.offer.getPubKeyRing(),
-                    message,
-                    false,
-                    new SendMessageListener() {
+                    new OfferAvailabilityRequest(model.offer.getId(), model.getPubKeyRing()),
+                    new SendMailMessageListener() {
                         @Override
-                        public void handleResult() {
+                        public void onArrived() {
                             complete();
                         }
 
                         @Override
-                        public void handleFault() {
+                        public void onFault() {
                             model.offer.setState(Offer.State.OFFERER_OFFLINE);
-
-                            failed();
                         }
-                    });
+                    }
+            );
         } catch (Throwable t) {
-            model.offer.setState(Offer.State.FAULT);
+            model.offer.setErrorMessage("An error occurred.\n" +
+                    "Error message:\n"
+                    + t.getMessage());
+
             failed(t);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
index d5dbb3a6fe..647b327d10 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
@@ -22,9 +22,8 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.common.taskrunner.Model;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.offer.OfferBookService;
-
+import io.bitsquare.user.User;
 import org.bitcoinj.core.Transaction;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,17 +34,20 @@ public class PlaceOfferModel implements Model {
     public final WalletService walletService;
     public final TradeWalletService tradeWalletService;
     public final OfferBookService offerBookService;
+    public final User user;
     public boolean offerAddedToOfferBook;
     private Transaction transaction;
 
     public PlaceOfferModel(Offer offer,
                            WalletService walletService,
                            TradeWalletService tradeWalletService,
-                           OfferBookService offerBookService) {
+                           OfferBookService offerBookService,
+                           User user) {
         this.offer = offer;
         this.walletService = walletService;
         this.tradeWalletService = tradeWalletService;
         this.offerBookService = offerBookService;
+        this.user = user;
     }
 
     public void setTransaction(Transaction transaction) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
index 05e5d61f82..ab3ef81372 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
@@ -17,14 +17,12 @@
 
 package io.bitsquare.trade.protocol.placeoffer;
 
-import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.handlers.TransactionResultHandler;
 import io.bitsquare.trade.protocol.placeoffer.tasks.AddOfferToRemoteOfferBook;
 import io.bitsquare.trade.protocol.placeoffer.tasks.BroadcastCreateOfferFeeTx;
 import io.bitsquare.trade.protocol.placeoffer.tasks.CreateOfferFeeTx;
 import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,18 +31,16 @@ public class PlaceOfferProtocol {
 
     private final PlaceOfferModel model;
     private final TransactionResultHandler resultHandler;
-    private final ErrorMessageHandler errorMessageHandler;
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public PlaceOfferProtocol(PlaceOfferModel model,
-                              TransactionResultHandler resultHandler,
-                              ErrorMessageHandler errorMessageHandler) {
+                              TransactionResultHandler resultHandler) {
         this.model = model;
         this.resultHandler = resultHandler;
-        this.errorMessageHandler = errorMessageHandler;
     }
 
 
@@ -68,9 +64,9 @@ public class PlaceOfferProtocol {
                                     model.offerAddedToOfferBook = false;
                                     log.debug("Offer removed from offer book.");
                                 },
-                                (message, throwable) -> log.error(message));
+                                errorMessage2 -> log.error(errorMessage2));
                     }
-                    errorMessageHandler.handleErrorMessage(errorMessage);
+                    log.error(errorMessage);
                 }
         );
         taskRunner.addTasks(
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
index c56d66021c..6d3954bb38 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade.protocol.placeoffer.tasks;
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +28,6 @@ public class AddOfferToRemoteOfferBook extends Task<PlaceOfferModel> {
 
     public AddOfferToRemoteOfferBook(TaskRunner taskHandler, PlaceOfferModel model) {
         super(taskHandler, model);
-        appendToErrorMessage("Could not add offer to offerbook. Maybe you have connection problems. Please try later again.");
     }
 
     @Override
@@ -41,8 +39,17 @@ public class AddOfferToRemoteOfferBook extends Task<PlaceOfferModel> {
                         model.offerAddedToOfferBook = true;
                         complete();
                     },
-                    (message, throwable) -> failed(throwable));
+                    errorMessage -> {
+                        model.offer.setErrorMessage("Could not add offer to offerbook.\n" +
+                                "Please check your network connection and try again.");
+
+                        failed(errorMessage);
+                    });
         } catch (Throwable t) {
+            model.offer.setErrorMessage("An error occurred.\n" +
+                    "Error message:\n"
+                    + t.getMessage());
+
             failed(t);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
index 9a4b862dd4..b9466a7a5c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
@@ -17,19 +17,16 @@
 
 package io.bitsquare.trade.protocol.placeoffer.tasks;
 
+import com.google.common.util.concurrent.FutureCallback;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
+import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
-
-import com.google.common.util.concurrent.FutureCallback;
-
 import org.jetbrains.annotations.NotNull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,17 +38,14 @@ public class BroadcastCreateOfferFeeTx extends Task<PlaceOfferModel> {
 
     public BroadcastCreateOfferFeeTx(TaskRunner taskHandler, PlaceOfferModel model) {
         super(taskHandler, model);
-
-        appendToErrorMessage("Broadcast of offer fee payment failed because transaction = null.");
-        appendToErrorMessage("Maybe you have connection problems. Please try later again.");
     }
 
     @Override
     protected void run() {
         try {
             runInterceptHook();
-            Coin totalsNeeded = model.offer.getSecurityDeposit().add(FeePolicy.CREATE_OFFER_FEE).add(FeePolicy.TX_FEE);
-            AddressEntry addressEntry = model.walletService.getAddressEntry(model.offer.getId());
+            Coin totalsNeeded = FeePolicy.SECURITY_DEPOSIT.add(FeePolicy.CREATE_OFFER_FEE).add(FeePolicy.TX_FEE);
+            AddressEntry addressEntry = model.walletService.getAddressEntryByOfferId(model.offer.getId());
             Coin balance = model.walletService.getBalanceForAddress(addressEntry.getAddress());
             if (balance.compareTo(totalsNeeded) >= 0) {
                 model.tradeWalletService.broadcastTx(model.getTransaction(), new FutureCallback<Transaction>() {
@@ -60,47 +54,61 @@ public class BroadcastCreateOfferFeeTx extends Task<PlaceOfferModel> {
                         log.info("Broadcast of offer fee payment succeeded: transaction = " + transaction.toString());
 
                         if (model.getTransaction().getHashAsString().equals(transaction.getHashAsString())) {
+                            model.offer.setState(Offer.State.OFFER_FEE_PAID);
                             // No tx malleability happened after broadcast (still not in blockchain)
                             complete();
-                        }
-                        else {
-                            log.warn("Tx malleability happened after broadcast. We publish the changed offer to the DHT again.");
-                            // Tx malleability happened after broadcast. We publish the changed offer to the DHT again.
+                        } else {
+                            log.warn("Tx malleability happened after broadcast. We publish the changed offer to the P2P network again.");
+                            // Tx malleability happened after broadcast. We first remove the malleable offer.
+                            // Then we publish the changed offer to the P2P network again after setting the new TxId.
                             model.offerBookService.removeOffer(model.offer,
                                     () -> {
                                         log.info("We store now the changed txID to the offer and add that again.");
                                         // We store now the changed txID to the offer and add that again.
                                         model.offer.setOfferFeePaymentTxID(transaction.getHashAsString());
+                                        model.setTransaction(transaction);
+
                                         model.offerBookService.addOffer(model.offer,
                                                 BroadcastCreateOfferFeeTx.this::complete,
-                                                (message, throwable) -> {
+                                                errorMessage -> {
                                                     log.error("addOffer failed");
                                                     addOfferFailed = true;
-                                                    failed(throwable);
                                                     updateStateOnFault();
+                                                    model.offer.setErrorMessage("An error occurred when adding the offer to the P2P network.\n" +
+                                                            "Error message:\n"
+                                                            + errorMessage);
+                                                    failed(errorMessage);
                                                 });
                                     },
-                                    (message, throwable) -> {
+                                    errorMessage -> {
                                         log.error("removeOffer failed");
                                         removeOfferFailed = true;
-                                        failed(throwable);
                                         updateStateOnFault();
+                                        model.offer.setErrorMessage("An error occurred when removing the offer from the P2P network.\n" +
+                                                "Error message:\n"
+                                                + errorMessage);
+                                        failed(errorMessage);
                                     });
                         }
                     }
 
                     @Override
                     public void onFailure(@NotNull Throwable t) {
-                        failed(t);
                         updateStateOnFault();
+                        model.offer.setErrorMessage("An error occurred.\n" +
+                                "Error message:\n"
+                                + t.getMessage());
+                        failed(t);
                     }
                 });
-            }
-            else {
-                failed("Not enough balance for placing the offer.");
+            } else {
                 updateStateOnFault();
+                model.offer.setErrorMessage("You don't have enough balance in your wallet for placing the offer.");
             }
         } catch (Throwable t) {
+            model.offer.setErrorMessage("An error occurred.\n" +
+                    "Error message:\n"
+                    + t.getMessage());
             failed(t);
         }
     }
@@ -110,10 +118,7 @@ public class BroadcastCreateOfferFeeTx extends Task<PlaceOfferModel> {
             // If broadcast fails we need to remove offer from offerbook
             model.offerBookService.removeOffer(model.offer,
                     () -> log.info("Offer removed from offerbook because broadcast failed."),
-                    (message, throwable) -> {
-                        log.error("removeOffer failed");
-                        failed(throwable);
-                    });
+                    errorMessage -> log.error("removeOffer failed. " + errorMessage));
         }
     }
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
index a943fb1b97..930aa2dfc6 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
@@ -17,12 +17,14 @@
 
 package io.bitsquare.trade.protocol.placeoffer.tasks;
 
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-
+import io.bitsquare.trade.protocol.trade.ArbitrationSelectionRule;
 import org.bitcoinj.core.Transaction;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,15 +39,26 @@ public class CreateOfferFeeTx extends Task<PlaceOfferModel> {
     protected void run() {
         try {
             runInterceptHook();
-            Transaction transaction = model.tradeWalletService.createOfferFeeTx(
-                    model.walletService.getAddressEntry(model.offer.getId()));
+
+            Address selectedArbitratorAddress = ArbitrationSelectionRule.select(model.user.getAcceptedArbitratorAddresses(), model.offer);
+            log.debug("selectedArbitratorAddress " + selectedArbitratorAddress);
+            Arbitrator selectedArbitrator = model.user.getAcceptedArbitratorByAddress(selectedArbitratorAddress);
+            Transaction transaction = model.tradeWalletService.createTradingFeeTx(
+                    model.walletService.getAddressEntryByOfferId(model.offer.getId()),
+                    FeePolicy.CREATE_OFFER_FEE,
+                    selectedArbitrator.getBtcAddress());
 
             // We assume there will be no tx malleability. We add a check later in case the published offer has a different hash.
+            // As the txId is part of the offer and therefore change the hash data we need to be sure to have no
+            // tx malleability
             model.offer.setOfferFeePaymentTxID(transaction.getHashAsString());
             model.setTransaction(transaction);
 
             complete();
         } catch (Throwable t) {
+            model.offer.setErrorMessage("An error occurred.\n" +
+                    "Error message:\n"
+                    + t.getMessage());
             failed(t);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
index 410dacd4fd..fcb3f3ce16 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade.protocol.placeoffer.tasks;
 import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,6 +38,9 @@ public class ValidateOffer extends Task<PlaceOfferModel> {
 
             complete();
         } catch (Exception e) {
+            model.offer.setErrorMessage("An error occurred.\n" +
+                    "Error message:\n"
+                    + e.getMessage());
             failed(e);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsOffererProtocol.java
index 204a7ddd04..3d5723d663 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsOffererProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsOffererProtocol.java
@@ -17,33 +17,24 @@
 
 package io.bitsquare.trade.protocol.trade;
 
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 import io.bitsquare.trade.BuyerAsOffererTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
+import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.messages.FinalizePayoutTxRequest;
-import io.bitsquare.trade.protocol.trade.messages.PublishDepositTxRequest;
+import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessDepositTxInputsRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessFinalizePayoutTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendPayDepositRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendPayoutTxFinalizedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndFinalizePayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.VerifyAndSignContract;
-import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
-import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.*;
+import io.bitsquare.trade.protocol.trade.tasks.offerer.*;
 import io.bitsquare.trade.protocol.trade.tasks.shared.CommitPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.shared.InitWaitPeriodForOpenDispute;
 import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReachedListener;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static io.bitsquare.util.Validator.checkTradeId;
 
 public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtocol, OffererProtocol {
@@ -57,15 +48,13 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public BuyerAsOffererProtocol(BuyerAsOffererTrade trade) {
-        super(trade.getProcessModel());
+        super(trade);
 
         this.buyerAsOffererTrade = trade;
 
-        // If we are after the timelock state we need to setup the listener again
-        TradeState tradeState = trade.tradeStateProperty().get();
-        if (tradeState == TradeState.BuyerState.PAYOUT_TX_COMMITTED ||
-                tradeState == TradeState.BuyerState.PAYOUT_TX_SENT ||
-                tradeState == TradeState.BuyerState.PAYOUT_BROAD_CASTED) {
+        // If we are after the time lock state we need to setup the listener again
+        Trade.State tradeState = trade.getState();
+        if (tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) {
 
             TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
                     () -> {
@@ -88,16 +77,15 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
     public void doApplyMailboxMessage(Message message, Trade trade) {
         this.trade = trade;
 
-        // Find first the actual peer address, as it might have changed in the meantime
-        findPeerAddress(processModel.tradingPeer.getPubKeyRing(),
-                () -> {
-                    if (message instanceof FinalizePayoutTxRequest) {
-                        handle((FinalizePayoutTxRequest) message);
-                    }
-                },
-                (errorMessage -> {
-                    log.error(errorMessage);
-                }));
+        if (message instanceof MailboxMessage) {
+            MailboxMessage mailboxMessage = (MailboxMessage) message;
+            Address peerAddress = mailboxMessage.getSenderAddress();
+            if (message instanceof FinalizePayoutTxRequest) {
+                handle((FinalizePayoutTxRequest) message, peerAddress);
+            } else if (message instanceof DepositTxPublishedMessage) {
+                handle((DepositTxPublishedMessage) message, peerAddress);
+            }
+        }
     }
 
 
@@ -106,18 +94,25 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void handleTakeOfferRequest(TradeMessage message, Peer taker) {
+    public void handleTakeOfferRequest(TradeMessage message, Address peerAddress) {
         checkTradeId(processModel.getId(), message);
+        checkArgument(message instanceof PayDepositRequest);
         processModel.setTradeMessage(message);
-        buyerAsOffererTrade.setTradingPeer(taker);
+        processModel.setTempTradingPeerAddress(peerAddress);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(buyerAsOffererTrade,
                 () -> handleTaskRunnerSuccess("handleTakeOfferRequest"),
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
-                ProcessDepositTxInputsRequest.class,
-                CreateDepositTxInputs.class,
-                SendPayDepositRequest.class
+                ProcessPayDepositRequest.class,
+                VerifyArbitrationSelection.class,
+                VerifyTakerAccount.class,
+                LoadTakeOfferFeeTx.class,
+                CreateAndSignContract.class,
+                CreateAndSignDepositTxAsBuyer.class,
+                InitWaitPeriodForOpenDispute.class,
+                SetupDepositBalanceListener.class,
+                SendPublishDepositTxRequest.class
         );
         startTimeout();
         taskRunner.run();
@@ -128,19 +123,17 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
     // Incoming message handling
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(PublishDepositTxRequest tradeMessage) {
+    private void handle(DepositTxPublishedMessage tradeMessage, Address peerAddress) {
         stopTimeout();
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(peerAddress);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(buyerAsOffererTrade,
-                () -> handleTaskRunnerSuccess("PublishDepositTxRequest"),
+                () -> handleTaskRunnerSuccess("handle DepositTxPublishedMessage"),
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
-                ProcessPublishDepositTxRequest.class,
-                VerifyTakerAccount.class,
-                VerifyAndSignContract.class,
-                SignAndPublishDepositTx.class,
-                SendDepositTxPublishedMessage.class
+                ProcessDepositTxPublishedMessage.class,
+                AddDepositTxToWallet.class
         );
         taskRunner.run();
     }
@@ -153,7 +146,7 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
     // User clicked the "bank transfer started" button
     @Override
     public void onFiatPaymentStarted() {
-        buyerAsOffererTrade.setTradeState(TradeState.BuyerState.FIAT_PAYMENT_STARTED);
+        buyerAsOffererTrade.setState(Trade.State.FIAT_PAYMENT_STARTED);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(buyerAsOffererTrade,
                 () -> handleTaskRunnerSuccess("onFiatPaymentStarted"),
@@ -170,13 +163,14 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
     // Incoming message handling
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(FinalizePayoutTxRequest tradeMessage) {
+    private void handle(FinalizePayoutTxRequest tradeMessage, Address peerAddress) {
         log.debug("handle RequestFinalizePayoutTxMessage called");
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(peerAddress);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(buyerAsOffererTrade,
                 () -> {
-                    handleTaskRunnerSuccess("FinalizePayoutTxRequest");
+                    handleTaskRunnerSuccess("handle FinalizePayoutTxRequest");
                     processModel.onComplete();
                 },
                 this::handleTaskRunnerFault);
@@ -197,14 +191,12 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Peer sender) {
-        if (tradeMessage instanceof PublishDepositTxRequest) {
-            handle((PublishDepositTxRequest) tradeMessage);
-        }
-        else if (tradeMessage instanceof FinalizePayoutTxRequest) {
-            handle((FinalizePayoutTxRequest) tradeMessage);
-        }
-        else {
+    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Address peerAddress) {
+        if (tradeMessage instanceof DepositTxPublishedMessage) {
+            handle((DepositTxPublishedMessage) tradeMessage, peerAddress);
+        } else if (tradeMessage instanceof FinalizePayoutTxRequest) {
+            handle((FinalizePayoutTxRequest) tradeMessage, peerAddress);
+        } else {
             log.error("Incoming decrypted tradeMessage not supported. " + tradeMessage);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java
index e9f9b2bba7..3120d01b9b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java
@@ -17,32 +17,19 @@
 
 package io.bitsquare.trade.protocol.trade;
 
+
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 import io.bitsquare.trade.BuyerAsTakerTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.FinalizePayoutTxRequest;
 import io.bitsquare.trade.protocol.trade.messages.PublishDepositTxRequest;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessFinalizePayoutTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendPayDepositRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendPayoutTxFinalizedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndFinalizePayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.VerifyAndSignContract;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.*;
 import io.bitsquare.trade.protocol.trade.tasks.shared.CommitPayoutTx;
 import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReachedListener;
-import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx;
-import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
-import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
-import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOffererAccount;
-
+import io.bitsquare.trade.protocol.trade.tasks.taker.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,17 +44,15 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public BuyerAsTakerProtocol(BuyerAsTakerTrade trade) {
-        super(trade.getProcessModel());
+        super(trade);
 
         this.buyerAsTakerTrade = trade;
 
         processModel.tradingPeer.setPubKeyRing(trade.getOffer().getPubKeyRing());
 
-        // If we are after the timelock state we need to setup the listener again
-        TradeState tradeState = trade.tradeStateProperty().get();
-        if (tradeState == TradeState.BuyerState.PAYOUT_TX_COMMITTED ||
-                tradeState == TradeState.BuyerState.PAYOUT_TX_SENT ||
-                tradeState == TradeState.BuyerState.PAYOUT_BROAD_CASTED) {
+        // If we are after the timeLock state we need to setup the listener again
+        Trade.State tradeState = trade.getState();
+        if (tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) {
             TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
                     () -> {
                         handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener");
@@ -89,16 +74,8 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
     public void doApplyMailboxMessage(Message message, Trade trade) {
         this.trade = trade;
 
-        // Find first the actual peer address, as it might have changed in the meantime
-        findPeerAddress(trade.getOffer().getPubKeyRing(),
-                () -> {
-                    if (message instanceof FinalizePayoutTxRequest) {
-                        handle((FinalizePayoutTxRequest) message);
-                    }
-                },
-                (errorMessage -> {
-                    log.error(errorMessage);
-                }));
+        if (message instanceof FinalizePayoutTxRequest)
+            handle((FinalizePayoutTxRequest) message, ((MailboxMessage) message).getSenderAddress());
     }
 
 
@@ -113,9 +90,11 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
+                SelectArbitrator.class,
+                LoadCreateOfferFeeTx.class,
                 CreateTakeOfferFeeTx.class,
                 BroadcastTakeOfferFeeTx.class,
-                CreateDepositTxInputs.class,
+                CreateDepositTxInputsAsBuyer.class,
                 SendPayDepositRequest.class
         );
         startTimeout();
@@ -127,9 +106,10 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
     // Incoming message handling
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(PublishDepositTxRequest tradeMessage) {
+    private void handle(PublishDepositTxRequest tradeMessage, Address sender) {
         stopTimeout();
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(buyerAsTakerTrade,
                 () -> handleTaskRunnerSuccess("PublishDepositTxRequest"),
@@ -138,7 +118,7 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
                 ProcessPublishDepositTxRequest.class,
                 VerifyOffererAccount.class,
                 VerifyAndSignContract.class,
-                SignAndPublishDepositTx.class,
+                SignAndPublishDepositTxAsBuyer.class,
                 SendDepositTxPublishedMessage.class
         );
         taskRunner.run();
@@ -152,14 +132,13 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
     // User clicked the "bank transfer started" button
     @Override
     public void onFiatPaymentStarted() {
-        buyerAsTakerTrade.setTradeState(TradeState.BuyerState.FIAT_PAYMENT_STARTED);
+        buyerAsTakerTrade.setState(Trade.State.FIAT_PAYMENT_STARTED);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(buyerAsTakerTrade,
                 () -> handleTaskRunnerSuccess("onFiatPaymentStarted"),
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
                 VerifyOfferFeePayment.class,
-                SignPayoutTx.class,
                 SendFiatTransferStartedMessage.class
         );
         taskRunner.run();
@@ -170,8 +149,9 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
     // Incoming message handling
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(FinalizePayoutTxRequest tradeMessage) {
+    private void handle(FinalizePayoutTxRequest tradeMessage, Address sender) {
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(buyerAsTakerTrade,
                 () -> {
@@ -195,14 +175,12 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Peer sender) {
+    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Address sender) {
         if (tradeMessage instanceof PublishDepositTxRequest) {
-            handle((PublishDepositTxRequest) tradeMessage);
-        }
-        else if (tradeMessage instanceof FinalizePayoutTxRequest) {
-            handle((FinalizePayoutTxRequest) tradeMessage);
-        }
-        else {
+            handle((PublishDepositTxRequest) tradeMessage, sender);
+        } else if (tradeMessage instanceof FinalizePayoutTxRequest) {
+            handle((FinalizePayoutTxRequest) tradeMessage, sender);
+        } else {
             log.error("Incoming message not supported. " + tradeMessage);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/OffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/OffererProtocol.java
index 6f19225d5f..f643e84aca 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/OffererProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/OffererProtocol.java
@@ -17,9 +17,10 @@
 
 package io.bitsquare.trade.protocol.trade;
 
-import io.bitsquare.p2p.Peer;
+
+import io.bitsquare.p2p.Address;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
 
 public interface OffererProtocol {
-    void handleTakeOfferRequest(TradeMessage message, Peer taker);
+    void handleTakeOfferRequest(TradeMessage message, Address taker);
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java
index 45ed63ac2f..763d8bbca9 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/ProcessModel.java
@@ -18,37 +18,34 @@
 package io.bitsquare.trade.protocol.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.arbitration.ArbitrationRepository;
+import io.bitsquare.arbitration.ArbitratorManager;
 import io.bitsquare.btc.AddressEntry;
-import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
+import io.bitsquare.btc.data.RawInput;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.common.crypto.PubKeyRing;
 import io.bitsquare.common.taskrunner.Model;
-import io.bitsquare.crypto.CryptoService;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.p2p.AddressService;
-import io.bitsquare.p2p.MessageService;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.payment.PaymentAccountContractData;
+import io.bitsquare.trade.OffererTrade;
+import io.bitsquare.trade.Trade;
+import io.bitsquare.trade.TradeManager;
 import io.bitsquare.trade.offer.Offer;
+import io.bitsquare.trade.offer.OpenOfferManager;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
 import io.bitsquare.user.User;
-
 import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.TransactionOutput;
-import org.bitcoinj.crypto.DeterministicKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-
 import java.util.List;
 
-import javax.annotation.Nullable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class ProcessModel implements Model, Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
@@ -56,57 +53,64 @@ public class ProcessModel implements Model, Serializable {
     private static final Logger log = LoggerFactory.getLogger(ProcessModel.class);
 
     // Transient/Immutable
-    transient private MessageService messageService;
-    transient private AddressService addressService;
+    transient private TradeManager tradeManager;
+    transient private OpenOfferManager openOfferManager;
     transient private WalletService walletService;
     transient private TradeWalletService tradeWalletService;
-    transient private BlockChainService blockChainService;
-    transient private CryptoService cryptoService;
-    transient private ArbitrationRepository arbitrationRepository;
+    transient private ArbitratorManager arbitratorManager;
     transient private Offer offer;
     transient private User user;
     transient private KeyRing keyRing;
+    transient private P2PService p2PService;
 
     // Mutable
     public final TradingPeer tradingPeer;
     transient private TradeMessage tradeMessage;
     private String takeOfferFeeTxId;
-    private List<TransactionOutput> connectedOutputsForAllInputs;
-    // private Coin payoutAmount;
-    private Transaction preparedDepositTx;
-    private List<TransactionOutput> outputs; // used to verify amounts with change outputs
     private byte[] payoutTxSignature;
     private Transaction takeOfferFeeTx;
 
+    private List<Address> takerAcceptedArbitratorAddresses;
+
+    // that is used to store temp. the peers address when we get an incoming message before the message is verified.
+    // After successful verified we copy that over to the trade.tradingPeerAddress
+    private Address tempTradingPeerAddress;
+    private byte[] preparedDepositTx;
+    private List<RawInput> rawInputs;
+    private long changeOutputValue;
+    @Nullable
+    private String changeOutputAddress;
 
     public ProcessModel() {
         tradingPeer = new TradingPeer();
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
+        try {
+            in.defaultReadObject();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
     public void onAllServicesInitialized(Offer offer,
-                                         MessageService messageService,
-                                         AddressService addressService,
+                                         TradeManager tradeManager,
+                                         OpenOfferManager openOfferManager,
+                                         P2PService p2PService,
                                          WalletService walletService,
                                          TradeWalletService tradeWalletService,
-                                         BlockChainService blockChainService,
-                                         CryptoService cryptoService,
-                                         ArbitrationRepository arbitrationRepository,
+                                         ArbitratorManager arbitratorManager,
                                          User user,
                                          KeyRing keyRing) {
         this.offer = offer;
-        this.messageService = messageService;
-        this.addressService = addressService;
+        this.tradeManager = tradeManager;
+        this.openOfferManager = openOfferManager;
         this.walletService = walletService;
         this.tradeWalletService = tradeWalletService;
-        this.blockChainService = blockChainService;
-        this.cryptoService = cryptoService;
-        this.arbitrationRepository = arbitrationRepository;
+        this.arbitratorManager = arbitratorManager;
         this.user = user;
         this.keyRing = keyRing;
+        this.p2PService = p2PService;
     }
 
 
@@ -114,8 +118,13 @@ public class ProcessModel implements Model, Serializable {
     // Getter only
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public MessageService getMessageService() {
-        return messageService;
+
+    public TradeManager getTradeManager() {
+        return tradeManager;
+    }
+
+    public OpenOfferManager getOpenOfferManager() {
+        return openOfferManager;
     }
 
     public WalletService getWalletService() {
@@ -126,12 +135,8 @@ public class ProcessModel implements Model, Serializable {
         return tradeWalletService;
     }
 
-    public BlockChainService getBlockChainService() {
-        return blockChainService;
-    }
-
-    public byte[] getArbitratorPubKey() {
-        return arbitrationRepository.getDefaultArbitrator().getPubKey();
+    public byte[] getArbitratorPubKey(Address arbitratorAddress) {
+        return user.getAcceptedArbitratorByAddress(arbitratorAddress).getBtcPubKey();
     }
 
     public Offer getOffer() {
@@ -142,6 +147,14 @@ public class ProcessModel implements Model, Serializable {
         return offer.getId();
     }
 
+    public User getUser() {
+        return user;
+    }
+
+    public Address getMyAddress() {
+        return p2PService.getAddress();
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getter/Setter for Mutable objects
@@ -165,66 +178,25 @@ public class ProcessModel implements Model, Serializable {
         this.takeOfferFeeTx = takeOfferFeeTx;
     }
 
-    public FiatAccount getFiatAccount() {
-        return user.getFiatAccount(offer.getBankAccountId());
-    }
-
-    public DeterministicKey getRegistrationKeyPair() {
-        return walletService.getRegistrationAddressEntry().getKeyPair();
+    public PaymentAccountContractData getPaymentAccountContractData(Trade trade) {
+        if (trade instanceof OffererTrade)
+            return user.getPaymentAccount(offer.getOffererPaymentAccountId()).getContractData();
+        else
+            return user.getPaymentAccount(trade.getTakerPaymentAccountId()).getContractData();
     }
 
     public String getAccountId() {
         return user.getAccountId();
     }
 
-    public byte[] getRegistrationPubKey() {
-        return walletService.getRegistrationAddressEntry().getPubKey();
-    }
-
     public AddressEntry getAddressEntry() {
-        return walletService.getAddressEntry(offer.getId());
+        return walletService.getAddressEntryByOfferId(offer.getId());
     }
 
     public byte[] getTradeWalletPubKey() {
         return getAddressEntry().getPubKey();
     }
 
-    @Nullable
-    public List<TransactionOutput> getConnectedOutputsForAllInputs() {
-        return connectedOutputsForAllInputs;
-    }
-
-    public void setConnectedOutputsForAllInputs(List<TransactionOutput> connectedOutputsForAllInputs) {
-        this.connectedOutputsForAllInputs = connectedOutputsForAllInputs;
-    }
-
-   /* @Nullable
-    public Coin getPayoutAmount() {
-        return payoutAmount;
-    }
-
-    public void setPayoutAmount(Coin payoutAmount) {
-        this.payoutAmount = payoutAmount;
-    }*/
-
-    @Nullable
-    public Transaction getPreparedDepositTx() {
-        return preparedDepositTx;
-    }
-
-    public void setPreparedDepositTx(Transaction preparedDepositTx) {
-        this.preparedDepositTx = preparedDepositTx;
-    }
-
-    @Nullable
-    public List<TransactionOutput> getOutputs() {
-        return outputs;
-    }
-
-    public void setOutputs(List<TransactionOutput> outputs) {
-        this.outputs = outputs;
-    }
-
     @Nullable
     public byte[] getPayoutTxSignature() {
         return payoutTxSignature;
@@ -250,19 +222,68 @@ public class ProcessModel implements Model, Serializable {
     public void onComplete() {
     }
 
-    public AddressService getAddressService() {
-        return addressService;
+    public P2PService getP2PService() {
+        return p2PService;
     }
 
     public PubKeyRing getPubKeyRing() {
         return keyRing.getPubKeyRing();
     }
 
-    public CryptoService getCryptoService() {
-        return cryptoService;
+    public KeyRing getKeyRing() {
+        return keyRing;
     }
 
-    public void setCryptoService(CryptoService cryptoService) {
-        this.cryptoService = cryptoService;
+    public void setTakerAcceptedArbitratorAddresses(List<Address> takerAcceptedArbitratorAddresses) {
+        this.takerAcceptedArbitratorAddresses = takerAcceptedArbitratorAddresses;
+    }
+
+    public List<Address> getTakerAcceptedArbitratorAddresses() {
+        return takerAcceptedArbitratorAddresses;
+    }
+
+    public void setTempTradingPeerAddress(Address tempTradingPeerAddress) {
+        this.tempTradingPeerAddress = tempTradingPeerAddress;
+    }
+
+    public Address getTempTradingPeerAddress() {
+        return tempTradingPeerAddress;
+    }
+
+    public ArbitratorManager getArbitratorManager() {
+        return arbitratorManager;
+    }
+
+    public void setPreparedDepositTx(byte[] preparedDepositTx) {
+        this.preparedDepositTx = preparedDepositTx;
+    }
+
+    public byte[] getPreparedDepositTx() {
+        return preparedDepositTx;
+    }
+
+    public void setRawInputs(List<RawInput> rawInputs) {
+        this.rawInputs = rawInputs;
+    }
+
+    public List<RawInput> getRawInputs() {
+        return rawInputs;
+    }
+
+    public void setChangeOutputValue(long changeOutputValue) {
+        this.changeOutputValue = changeOutputValue;
+    }
+
+    public long getChangeOutputValue() {
+        return changeOutputValue;
+    }
+
+    public void setChangeOutputAddress(String changeOutputAddress) {
+        this.changeOutputAddress = changeOutputAddress;
+    }
+
+    @Nullable
+    public String getChangeOutputAddress() {
+        return changeOutputAddress;
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsOffererProtocol.java
index 3a40b5a0a5..5413edf25d 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsOffererProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsOffererProtocol.java
@@ -17,33 +17,28 @@
 
 package io.bitsquare.trade.protocol.trade;
 
+
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 import io.bitsquare.trade.SellerAsOffererTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.messages.PayoutTxFinalizedMessage;
-import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
-import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignContract;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.messages.*;
+import io.bitsquare.trade.protocol.trade.tasks.offerer.*;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTxAsSeller;
 import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessPayDepositRequest;
 import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessPayoutTxFinalizedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.seller.SendFinalizePayoutTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SendPublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SignPayoutTx;
 import io.bitsquare.trade.protocol.trade.tasks.shared.CommitPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.shared.InitWaitPeriodForOpenDispute;
 import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReachedListener;
-
+import io.bitsquare.trade.protocol.trade.tasks.shared.SignPayoutTx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.bitsquare.util.Validator.checkTradeId;
+
 public class SellerAsOffererProtocol extends TradeProtocol implements SellerProtocol, OffererProtocol {
     private static final Logger log = LoggerFactory.getLogger(SellerAsOffererProtocol.class);
 
@@ -55,15 +50,14 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public SellerAsOffererProtocol(SellerAsOffererTrade trade) {
-        super(trade.getProcessModel());
+        super(trade);
 
         this.sellerAsOffererTrade = trade;
 
-        // If we are after the timelock state we need to setup the listener again
-        TradeState tradeState = trade.tradeStateProperty().get();
-        if (tradeState == TradeState.SellerState.PAYOUT_TX_RECEIVED ||
-                tradeState == TradeState.SellerState.PAYOUT_TX_COMMITTED ||
-                tradeState == TradeState.SellerState.PAYOUT_BROAD_CASTED) {
+        // If we are after the time lock state we need to setup the listener again
+        //TODO not sure if that is not called already from the checkPayoutTxTimeLock at tradeProtocol
+        Trade.State tradeState = trade.getState();
+        if (tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) {
             TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
                     () -> {
                         handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener");
@@ -85,23 +79,15 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
     public void doApplyMailboxMessage(Message message, Trade trade) {
         this.trade = trade;
 
+        Address peerAddress = ((MailboxMessage) message).getSenderAddress();
         if (message instanceof PayoutTxFinalizedMessage) {
-            handle((PayoutTxFinalizedMessage) message);
-        }
-        else {
-            // Find first the actual peer address, as it might have changed in the meantime
-            findPeerAddress(processModel.tradingPeer.getPubKeyRing(),
-                    () -> {
-                        if (message instanceof FiatTransferStartedMessage) {
-                            handle((FiatTransferStartedMessage) message);
-                        }
-                        else if (message instanceof DepositTxPublishedMessage) {
-                            handle((DepositTxPublishedMessage) message);
-                        }
-                    },
-                    (errorMessage -> {
-                        log.error(errorMessage);
-                    }));
+            handle((PayoutTxFinalizedMessage) message, peerAddress);
+        } else {
+            if (message instanceof FiatTransferStartedMessage) {
+                handle((FiatTransferStartedMessage) message, peerAddress);
+            } else if (message instanceof DepositTxPublishedMessage) {
+                handle((DepositTxPublishedMessage) message, peerAddress);
+            }
         }
     }
 
@@ -111,9 +97,11 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public void handleTakeOfferRequest(TradeMessage message, Peer taker) {
+    public void handleTakeOfferRequest(TradeMessage message, Address sender) {
+        checkTradeId(processModel.getId(), message);
+        checkArgument(message instanceof PayDepositRequest);
         processModel.setTradeMessage(message);
-        sellerAsOffererTrade.setTradingPeer(taker);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsOffererTrade,
                 () -> handleTaskRunnerSuccess("handleTakeOfferRequest"),
@@ -121,9 +109,13 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
 
         taskRunner.addTasks(
                 ProcessPayDepositRequest.class,
+                VerifyArbitrationSelection.class,
                 VerifyTakerAccount.class,
+                LoadTakeOfferFeeTx.class,
+                InitWaitPeriodForOpenDispute.class,
                 CreateAndSignContract.class,
-                CreateAndSignDepositTx.class,
+                CreateAndSignDepositTxAsSeller.class,
+                SetupDepositBalanceListener.class,
                 SendPublishDepositTxRequest.class
         );
         startTimeout();
@@ -135,9 +127,10 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
     // Incoming message handling 
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(DepositTxPublishedMessage tradeMessage) {
+    private void handle(DepositTxPublishedMessage tradeMessage, Address sender) {
         stopTimeout();
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsOffererTrade,
                 () -> handleTaskRunnerSuccess("DepositTxPublishedMessage"),
@@ -145,7 +138,7 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
 
         taskRunner.addTasks(
                 ProcessDepositTxPublishedMessage.class,
-                CommitDepositTx.class
+                AddDepositTxToWallet.class
         );
         taskRunner.run();
     }
@@ -155,8 +148,9 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
     // After peer has started Fiat tx
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(FiatTransferStartedMessage tradeMessage) {
+    private void handle(FiatTransferStartedMessage tradeMessage, Address sender) {
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsOffererTrade,
                 () -> handleTaskRunnerSuccess("FiatTransferStartedMessage"),
@@ -174,7 +168,7 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
     // User clicked the "bank transfer received" button, so we release the funds for pay out
     @Override
     public void onFiatPaymentReceived() {
-        sellerAsOffererTrade.setTradeState(TradeState.SellerState.FIAT_PAYMENT_RECEIPT);
+        sellerAsOffererTrade.setState(Trade.State.FIAT_PAYMENT_RECEIPT);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsOffererTrade,
                 () -> handleTaskRunnerSuccess("onFiatPaymentReceived"),
@@ -185,13 +179,12 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
                 SignPayoutTx.class,
                 SendFinalizePayoutTxRequest.class
         );
-        startTimeout();
         taskRunner.run();
     }
 
-    private void handle(PayoutTxFinalizedMessage tradeMessage) {
-        stopTimeout();
+    private void handle(PayoutTxFinalizedMessage tradeMessage, Address sender) {
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsOffererTrade,
                 () -> {
@@ -213,17 +206,14 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Peer sender) {
+    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Address sender) {
         if (tradeMessage instanceof DepositTxPublishedMessage) {
-            handle((DepositTxPublishedMessage) tradeMessage);
-        }
-        else if (tradeMessage instanceof FiatTransferStartedMessage) {
-            handle((FiatTransferStartedMessage) tradeMessage);
-        }
-        else if (tradeMessage instanceof PayoutTxFinalizedMessage) {
-            handle((PayoutTxFinalizedMessage) tradeMessage);
-        }
-        else {
+            handle((DepositTxPublishedMessage) tradeMessage, sender);
+        } else if (tradeMessage instanceof FiatTransferStartedMessage) {
+            handle((FiatTransferStartedMessage) tradeMessage, sender);
+        } else if (tradeMessage instanceof PayoutTxFinalizedMessage) {
+            handle((PayoutTxFinalizedMessage) tradeMessage, sender);
+        } else {
             log.error("Incoming tradeMessage not supported. " + tradeMessage);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsTakerProtocol.java
index 4071ba5f12..a2393519b6 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsTakerProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsTakerProtocol.java
@@ -17,35 +17,21 @@
 
 package io.bitsquare.trade.protocol.trade;
 
+
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.Peer;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 import io.bitsquare.trade.SellerAsTakerTrade;
-import io.bitsquare.trade.SellerTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest;
 import io.bitsquare.trade.protocol.trade.messages.PayoutTxFinalizedMessage;
+import io.bitsquare.trade.protocol.trade.messages.PublishDepositTxRequest;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignContract;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessPayDepositRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessPayoutTxFinalizedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SendDepositTxInputsRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SendFinalizePayoutTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SendPublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.*;
 import io.bitsquare.trade.protocol.trade.tasks.shared.CommitPayoutTx;
 import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReachedListener;
-import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx;
-import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
-import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
-import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOffererAccount;
-
+import io.bitsquare.trade.protocol.trade.tasks.shared.SignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.taker.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,28 +46,25 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public SellerAsTakerProtocol(SellerAsTakerTrade trade) {
-        super(trade.getProcessModel());
+        super(trade);
 
         this.sellerAsTakerTrade = trade;
 
         processModel.tradingPeer.setPubKeyRing(trade.getOffer().getPubKeyRing());
 
-        // If we are after the timelock state we need to setup the listener again
-        if (trade instanceof SellerTrade) {
-            TradeState tradeState = trade.tradeStateProperty().get();
-            if (tradeState == TradeState.SellerState.PAYOUT_TX_RECEIVED ||
-                    tradeState == TradeState.SellerState.PAYOUT_TX_COMMITTED ||
-                    tradeState == TradeState.SellerState.PAYOUT_BROAD_CASTED) {
-                TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
-                        () -> {
-                            handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener");
-                            processModel.onComplete();
-                        },
-                        this::handleTaskRunnerFault);
+        // If we are after the timeLock state we need to setup the listener again
+        //TODO not sure if that is not called already from the checkPayoutTxTimeLock at tradeProtocol
+        Trade.State tradeState = trade.getState();
+        if (tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) {
+            TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
+                    () -> {
+                        handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener");
+                        processModel.onComplete();
+                    },
+                    this::handleTaskRunnerFault);
 
-                taskRunner.addTasks(SetupPayoutTxLockTimeReachedListener.class);
-                taskRunner.run();
-            }
+            taskRunner.addTasks(SetupPayoutTxLockTimeReachedListener.class);
+            taskRunner.run();
         }
     }
 
@@ -94,23 +77,13 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
     public void doApplyMailboxMessage(Message message, Trade trade) {
         this.trade = trade;
 
-        if (message instanceof PayoutTxFinalizedMessage) {
-            handle((PayoutTxFinalizedMessage) message);
-        }
-        else {
-            // Find first the actual peer address, as it might have changed in the meantime
-            findPeerAddress(trade.getOffer().getPubKeyRing(),
-                    () -> {
-                        if (message instanceof FiatTransferStartedMessage) {
-                            handle((FiatTransferStartedMessage) message);
-                        }
-                        else if (message instanceof DepositTxPublishedMessage) {
-                            handle((DepositTxPublishedMessage) message);
-                        }
-                    },
-                    (errorMessage -> {
-                        log.error(errorMessage);
-                    }));
+        if (message instanceof MailboxMessage) {
+            Address peerAddress = ((MailboxMessage) message).getSenderAddress();
+            if (message instanceof PayoutTxFinalizedMessage) {
+                handle((PayoutTxFinalizedMessage) message, peerAddress);
+            } else if (message instanceof FiatTransferStartedMessage) {
+                handle((FiatTransferStartedMessage) message, peerAddress);
+            }
         }
     }
 
@@ -126,9 +99,12 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
+                SelectArbitrator.class,
+                LoadCreateOfferFeeTx.class,
                 CreateTakeOfferFeeTx.class,
                 BroadcastTakeOfferFeeTx.class,
-                SendDepositTxInputsRequest.class
+                CreateDepositTxInputsAsSeller.class,
+                SendPayDepositRequest.class
         );
         startTimeout();
         taskRunner.run();
@@ -139,37 +115,22 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
     // Incoming message handling
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(PayDepositRequest tradeMessage) {
+    private void handle(PublishDepositTxRequest tradeMessage, Address sender) {
         log.debug("handle RequestPayDepositMessage");
         stopTimeout();
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsTakerTrade,
                 () -> handleTaskRunnerSuccess("PayDepositRequest"),
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
-                ProcessPayDepositRequest.class,
+                ProcessPublishDepositTxRequest.class,
                 VerifyOffererAccount.class,
-                CreateAndSignContract.class,
-                CreateAndSignDepositTx.class,
-                SendPublishDepositTxRequest.class
-        );
-        startTimeout();
-        taskRunner.run();
-    }
-
-    private void handle(DepositTxPublishedMessage tradeMessage) {
-        stopTimeout();
-        processModel.setTradeMessage(tradeMessage);
-
-        TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsTakerTrade,
-                () -> handleTaskRunnerSuccess("DepositTxPublishedMessage"),
-                this::handleTaskRunnerFault);
-
-        taskRunner.addTasks(
-                ProcessDepositTxPublishedMessage.class,
-                CommitDepositTx.class
+                VerifyAndSignContract.class,
+                SignAndPublishDepositTxAsSeller.class,
+                SendDepositTxPublishedMessage.class
         );
         taskRunner.run();
     }
@@ -179,8 +140,9 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
     // After peer has started Fiat tx
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void handle(FiatTransferStartedMessage tradeMessage) {
+    private void handle(FiatTransferStartedMessage tradeMessage, Address sender) {
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsTakerTrade,
                 () -> handleTaskRunnerSuccess("FiatTransferStartedMessage"),
@@ -198,7 +160,7 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
     // User clicked the "bank transfer received" button, so we release the funds for pay out
     @Override
     public void onFiatPaymentReceived() {
-        sellerAsTakerTrade.setTradeState(TradeState.SellerState.FIAT_PAYMENT_RECEIPT);
+        sellerAsTakerTrade.setState(Trade.State.FIAT_PAYMENT_RECEIPT);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsTakerTrade,
                 () -> handleTaskRunnerSuccess("onFiatPaymentReceived"),
@@ -209,13 +171,13 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
                 SignPayoutTx.class,
                 SendFinalizePayoutTxRequest.class
         );
-        startTimeout();
         taskRunner.run();
     }
 
-    private void handle(PayoutTxFinalizedMessage tradeMessage) {
+    private void handle(PayoutTxFinalizedMessage tradeMessage, Address sender) {
         stopTimeout();
         processModel.setTradeMessage(tradeMessage);
+        processModel.setTempTradingPeerAddress(sender);
 
         TradeTaskRunner taskRunner = new TradeTaskRunner(sellerAsTakerTrade,
                 () -> {
@@ -238,20 +200,14 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
-    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Peer sender) {
-        if (tradeMessage instanceof PayDepositRequest) {
-            handle((PayDepositRequest) tradeMessage);
-        }
-        else if (tradeMessage instanceof DepositTxPublishedMessage) {
-            handle((DepositTxPublishedMessage) tradeMessage);
-        }
-        else if (tradeMessage instanceof FiatTransferStartedMessage) {
-            handle((FiatTransferStartedMessage) tradeMessage);
-        }
-        else if (tradeMessage instanceof PayoutTxFinalizedMessage) {
-            handle((PayoutTxFinalizedMessage) tradeMessage);
-        }
-        else {
+    protected void doHandleDecryptedMessage(TradeMessage tradeMessage, Address sender) {
+        if (tradeMessage instanceof PublishDepositTxRequest) {
+            handle((PublishDepositTxRequest) tradeMessage, sender);
+        } else if (tradeMessage instanceof FiatTransferStartedMessage) {
+            handle((FiatTransferStartedMessage) tradeMessage, sender);
+        } else if (tradeMessage instanceof PayoutTxFinalizedMessage) {
+            handle((PayoutTxFinalizedMessage) tradeMessage, sender);
+        } else {
             log.error("Incoming message not supported. " + tradeMessage);
         }
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java
index eef0bae059..a02e5ebf31 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java
@@ -17,114 +17,99 @@
 
 package io.bitsquare.trade.protocol.trade;
 
-import io.bitsquare.common.handlers.ErrorMessageHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.crypto.MessageWithPubKey;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.p2p.DecryptedMessageHandler;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
-import io.bitsquare.p2p.Peer;
-import io.bitsquare.p2p.listener.GetPeerAddressListener;
-import io.bitsquare.trade.BuyerTrade;
-import io.bitsquare.trade.SellerTrade;
+import io.bitsquare.p2p.messaging.DecryptedMailListener;
+import io.bitsquare.p2p.messaging.DecryptedMessageWithPubKey;
+import io.bitsquare.trade.OffererTrade;
+import io.bitsquare.trade.TakerTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
 import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReachedListener;
-import io.bitsquare.util.Utilities;
-
-import java.util.Timer;
-
+import org.reactfx.util.FxTimer;
+import org.reactfx.util.Timer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.PublicKey;
+import java.time.Duration;
+import java.util.Optional;
+
 import static io.bitsquare.util.Validator.nonEmptyStringOf;
 
 public abstract class TradeProtocol {
     private static final Logger log = LoggerFactory.getLogger(TradeProtocol.class);
-    private static final long TIMEOUT = 10000;
+    private static final long TIMEOUT = 30 * 1000;
 
     protected final ProcessModel processModel;
-    private DecryptedMessageHandler decryptedMessageHandler;
-    protected Timer timeoutTimer;
+    private final DecryptedMailListener decryptedMailListener;
+    private Timer timeoutTimer;
     protected Trade trade;
 
-    public TradeProtocol(ProcessModel processModel) {
-        this.processModel = processModel;
+    public TradeProtocol(Trade trade) {
+        this.trade = trade;
+        this.processModel = trade.getProcessModel();
 
-        decryptedMessageHandler = this::handleMessageWithPubKey;
+        decryptedMailListener = (decryptedMessageWithPubKey, peerAddress) -> {
+            // We check the sig only as soon we have stored the peers pubKeyRing.
+            PubKeyRing tradingPeerPubKeyRing = processModel.tradingPeer.getPubKeyRing();
+            PublicKey signaturePubKey = decryptedMessageWithPubKey.signaturePubKey;
+            if (tradingPeerPubKeyRing != null && signaturePubKey.equals(tradingPeerPubKeyRing.getMsgSignaturePubKey())) {
+                Message message = decryptedMessageWithPubKey.message;
+                log.trace("handleNewMessage: message = " + message.getClass().getSimpleName() + " from " + peerAddress);
+                if (message instanceof TradeMessage) {
+                    TradeMessage tradeMessage = (TradeMessage) message;
+                    nonEmptyStringOf(tradeMessage.tradeId);
 
-        processModel.getMessageService().addDecryptedMessageHandler(decryptedMessageHandler);
+                    if (tradeMessage.tradeId.equals(processModel.getId())) {
+                        doHandleDecryptedMessage(tradeMessage, peerAddress);
+                    }
+                }
+            } else {
+                // it might be that we received a msg from the arbitrator, we don't handle that here but we don't want to log an error
+                Optional<Arbitrator> arbitratorOptional = processModel.getArbitratorManager().getArbitratorsObservableMap().values().stream()
+                        .filter(e -> e.getArbitratorAddress().equals(trade.getArbitratorAddress())).findFirst();
+                PubKeyRing arbitratorPubKeyRing = null;
+                if (arbitratorOptional.isPresent())
+                    arbitratorPubKeyRing = arbitratorOptional.get().getPubKeyRing();
+
+                if ((arbitratorPubKeyRing != null && !signaturePubKey.equals(arbitratorPubKeyRing.getMsgSignaturePubKey())))
+                    log.error("Signature used in seal message does not match the one stored with that trade for the trading peer or arbitrator.");
+            }
+        };
+        processModel.getP2PService().addDecryptedMailListener(decryptedMailListener);
     }
 
-    public void cleanup() {
+    public void completed() {
+        cleanup();
+    }
+
+    private void cleanup() {
         log.debug("cleanup " + this);
         stopTimeout();
-        if (decryptedMessageHandler != null)
-            processModel.getMessageService().removeDecryptedMessageHandler(decryptedMessageHandler);
+
+        processModel.getP2PService().removeDecryptedMailListener(decryptedMailListener);
+
     }
 
-    public void applyMailboxMessage(MessageWithPubKey messageWithPubKey, Trade trade) {
-        log.debug("applyMailboxMessage " + messageWithPubKey.getMessage());
-        if (messageWithPubKey.getSignaturePubKey().equals(processModel.tradingPeer.getPubKeyRing().getMsgSignaturePubKey()))
-            doApplyMailboxMessage(messageWithPubKey.getMessage(), trade);
+    public void applyMailboxMessage(DecryptedMessageWithPubKey decryptedMessageWithPubKey, Trade trade) {
+        log.debug("applyMailboxMessage " + decryptedMessageWithPubKey.message);
+        if (decryptedMessageWithPubKey.signaturePubKey.equals(processModel.tradingPeer.getPubKeyRing().getMsgSignaturePubKey()))
+            doApplyMailboxMessage(decryptedMessageWithPubKey.message, trade);
         else
             log.error("SignaturePubKey in message does not match the SignaturePubKey we have stored to that trading peer.");
     }
 
     protected abstract void doApplyMailboxMessage(Message message, Trade trade);
 
-    protected void findPeerAddress(PubKeyRing pubKeyRing, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        try {
-            processModel.getAddressService().findPeerAddress(pubKeyRing, new GetPeerAddressListener() {
-                @Override
-                public void onResult(Peer peer) {
-                    trade.setTradingPeer(peer);
-                    resultHandler.handleResult();
-                }
-
-                @Override
-                public void onFailed() {
-                    errorMessageHandler.handleErrorMessage("findPeerAddress failed");
-                }
-            });
-        } catch (Throwable t) {
-            errorMessageHandler.handleErrorMessage("findPeerAddress failed with error: " + t.getMessage());
-        }
-    }
-
-    protected void handleMessageWithPubKey(MessageWithPubKey messageWithPubKey, Peer sender) {
-        // We check the sig only as soon we have stored the peers pubKeyRing.
-        if (processModel.tradingPeer.getPubKeyRing() != null &&
-                !messageWithPubKey.getSignaturePubKey().equals(processModel.tradingPeer.getPubKeyRing().getMsgSignaturePubKey())) {
-            log.error("Signature used in seal message does not match the one stored with that trade for the trading peer.");
-        }
-        else {
-            Message message = messageWithPubKey.getMessage();
-            log.trace("handleNewMessage: message = " + message.getClass().getSimpleName() + " from " + sender);
-            if (message instanceof TradeMessage) {
-                TradeMessage tradeMessage = (TradeMessage) message;
-                nonEmptyStringOf(tradeMessage.tradeId);
-
-                if (tradeMessage.tradeId.equals(processModel.getId())) {
-                    doHandleDecryptedMessage(tradeMessage, sender);
-                }
-            }
-        }
-    }
-
-    protected abstract void doHandleDecryptedMessage(TradeMessage tradeMessage, Peer sender);
+    protected abstract void doHandleDecryptedMessage(TradeMessage tradeMessage, Address peerAddress);
 
     public void checkPayoutTxTimeLock(Trade trade) {
         this.trade = trade;
 
-        boolean needPayoutTxBroadcast = false;
-        if (trade instanceof SellerTrade)
-            needPayoutTxBroadcast = trade.tradeStateProperty().get() == TradeState.SellerState.PAYOUT_TX_COMMITTED;
-        else if (trade instanceof BuyerTrade)
-            needPayoutTxBroadcast = trade.tradeStateProperty().get() == TradeState.BuyerState.PAYOUT_TX_COMMITTED;
-
-        if (needPayoutTxBroadcast) {
+        if (trade.getState() == Trade.State.PAYOUT_TX_COMMITTED) {
             TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
                     () -> {
                         log.debug("taskRunner needPayoutTxBroadcast completed");
@@ -140,15 +125,17 @@ public abstract class TradeProtocol {
     protected void startTimeout() {
         stopTimeout();
 
-        timeoutTimer = Utilities.setTimeout(TIMEOUT, () -> {
-            log.debug("Timeout reached");
-            trade.setErrorMessage("A timeout occured.");
+        timeoutTimer = FxTimer.runLater(Duration.ofMillis(TIMEOUT), () -> {
+            log.error("Timeout reached");
+            trade.setErrorMessage("A timeout occurred.");
+            cleanupTradable();
+            cleanup();
         });
     }
 
     protected void stopTimeout() {
         if (timeoutTimer != null) {
-            timeoutTimer.cancel();
+            timeoutTimer.stop();
             timeoutTimer = null;
         }
     }
@@ -159,6 +146,25 @@ public abstract class TradeProtocol {
 
     protected void handleTaskRunnerFault(String errorMessage) {
         log.error(errorMessage);
+        cleanupTradable();
         cleanup();
     }
+
+    private void cleanupTradable() {
+        Trade.State tradeState = trade.getState();
+        log.debug("cleanupTradable tradeState=" + tradeState);
+        boolean isOffererTrade = trade instanceof OffererTrade;
+        if (isOffererTrade && (tradeState == Trade.State.DEPOSIT_PUBLISH_REQUESTED || tradeState == Trade.State.DEPOSIT_SEEN_IN_NETWORK))
+            processModel.getOpenOfferManager().closeOpenOffer(trade.getOffer());
+
+        boolean isTakerTrade = trade instanceof TakerTrade;
+
+        if (isTakerTrade) {
+            if (tradeState.getPhase() == Trade.Phase.PREPARATION) {
+                processModel.getTradeManager().removePreparedTrade(trade);
+            } else if (tradeState.getPhase() == Trade.Phase.TAKER_FEE_PAID) {
+                processModel.getTradeManager().addTradeToFailedTrades(trade);
+            }
+        }
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java
index 5bbeea17d1..39f609f7c3 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java
@@ -18,21 +18,18 @@
 package io.bitsquare.trade.protocol.trade;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.fiat.FiatAccount;
-
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.TransactionOutput;
+import io.bitsquare.btc.data.RawInput;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.payment.PaymentAccountContractData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class TradingPeer implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
@@ -41,10 +38,7 @@ public class TradingPeer implements Serializable {
 
     // Mutable
     private String accountId;
-    private FiatAccount fiatAccount;
-    private Transaction preparedDepositTx;
-    private List<TransactionOutput> connectedOutputsForAllInputs;
-    private List<TransactionOutput> outputs;
+    private PaymentAccountContractData paymentAccountContractData;
     // private Coin payoutAmount;
     private String payoutAddressString;
     // private byte[] signature;
@@ -53,6 +47,10 @@ public class TradingPeer implements Serializable {
     private byte[] signature;
     private PubKeyRing pubKeyRing;
     private byte[] tradeWalletPubKey;
+    private List<RawInput> rawInputs;
+    private long changeOutputValue;
+    @Nullable
+    private String changeOutputAddress;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -63,7 +61,11 @@ public class TradingPeer implements Serializable {
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
+        try {
+            in.defaultReadObject();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
 
@@ -87,45 +89,14 @@ public class TradingPeer implements Serializable {
         this.tradeWalletPubKey = tradeWalletPubKey;
     }
 
-    public FiatAccount getFiatAccount() {
-        return fiatAccount;
+    public PaymentAccountContractData getPaymentAccountContractData() {
+        return paymentAccountContractData;
     }
 
-    public void setFiatAccount(FiatAccount fiatAccount) {
-        this.fiatAccount = fiatAccount;
+    public void setPaymentAccountContractData(PaymentAccountContractData paymentAccountContractData) {
+        this.paymentAccountContractData = paymentAccountContractData;
     }
 
-    public Transaction getPreparedDepositTx() {
-        return preparedDepositTx;
-    }
-
-    public void setPreparedDepositTx(Transaction preparedDepositTx) {
-        this.preparedDepositTx = preparedDepositTx;
-    }
-
-    public List<TransactionOutput> getConnectedOutputsForAllInputs() {
-        return connectedOutputsForAllInputs;
-    }
-
-    public void setConnectedOutputsForAllInputs(List<TransactionOutput> connectedOutputsForAllInputs) {
-        this.connectedOutputsForAllInputs = connectedOutputsForAllInputs;
-    }
-
-    public List<TransactionOutput> getOutputs() {
-        return outputs;
-    }
-
-    public void setOutputs(List<TransactionOutput> outputs) {
-        this.outputs = outputs;
-    }
-
-   /* public Coin getPayoutAmount() {
-        return payoutAmount;
-    }
-
-    public void setPayoutAmount(Coin payoutAmount) {
-        this.payoutAmount = payoutAmount;
-    }*/
 
     public String getPayoutAddressString() {
         return payoutAddressString;
@@ -135,14 +106,6 @@ public class TradingPeer implements Serializable {
         this.payoutAddressString = payoutAddressString;
     }
 
-   /* public byte[] getSignature() {
-        return signature;
-    }
-
-    public void setSignature(byte[] signature) {
-        this.signature = signature;
-    }*/
-
     public String getContractAsJson() {
         return contractAsJson;
     }
@@ -174,4 +137,29 @@ public class TradingPeer implements Serializable {
     public void setPubKeyRing(PubKeyRing pubKeyRing) {
         this.pubKeyRing = pubKeyRing;
     }
+
+    public void setRawInputs(List<RawInput> rawInputs) {
+        this.rawInputs = rawInputs;
+    }
+
+    public List<RawInput> getRawInputs() {
+        return rawInputs;
+    }
+
+    public void setChangeOutputValue(long changeOutputValue) {
+        this.changeOutputValue = changeOutputValue;
+    }
+
+    public long getChangeOutputValue() {
+        return changeOutputValue;
+    }
+
+    public void setChangeOutputAddress(String changeOutputAddress) {
+        this.changeOutputAddress = changeOutputAddress;
+    }
+
+    @Nullable
+    public String getChangeOutputAddress() {
+        return changeOutputAddress;
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/DepositTxInputsRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/DepositTxInputsRequest.java
deleted file mode 100644
index e11cfd9806..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/DepositTxInputsRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.trade.protocol.trade.messages;
-
-import io.bitsquare.app.Version;
-import io.bitsquare.crypto.PubKeyRing;
-
-import org.bitcoinj.core.Coin;
-
-import java.io.Serializable;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-public class DepositTxInputsRequest extends TradeMessage implements Serializable {
-    // That object is sent over the wire, so we need to take care of version compatibility.
-    private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
-
-    public final Coin tradeAmount;
-    public final PubKeyRing sellerPubKeyRing;
-    public final String sellerOfferFeeTxId;
-    public final byte[] sellerTradeWalletPubKey;
-
-    public DepositTxInputsRequest(String tradeId, PubKeyRing sellerPubKeyRing, String sellerOfferFeeTxId, Coin tradeAmount, byte[]
-            sellerTradeWalletPubKey) {
-        super(tradeId);
-        this.sellerPubKeyRing = sellerPubKeyRing;
-        this.sellerOfferFeeTxId = sellerOfferFeeTxId;
-        this.tradeAmount = tradeAmount;
-        this.sellerTradeWalletPubKey = sellerTradeWalletPubKey;
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/DepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/DepositTxPublishedMessage.java
index 57fb330299..2ce022f833 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/DepositTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/DepositTxPublishedMessage.java
@@ -18,23 +18,49 @@
 package io.bitsquare.trade.protocol.trade.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.MailboxMessage;
-
-import org.bitcoinj.core.Transaction;
-
-import java.io.Serializable;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 
 import javax.annotation.concurrent.Immutable;
+import java.util.Arrays;
 
 @Immutable
-public class DepositTxPublishedMessage extends TradeMessage implements MailboxMessage, Serializable {
+public class DepositTxPublishedMessage extends TradeMessage implements MailboxMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
-    public final Transaction depositTx;
+    public final byte[] depositTx;
+    private final Address senderAddress;
 
-    public DepositTxPublishedMessage(String tradeId, Transaction depositTx) {
+    public DepositTxPublishedMessage(String tradeId, byte[] depositTx, Address senderAddress) {
         super(tradeId);
         this.depositTx = depositTx;
+        this.senderAddress = senderAddress;
+    }
+
+    @Override
+    public Address getSenderAddress() {
+        return senderAddress;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof DepositTxPublishedMessage)) return false;
+        if (!super.equals(o)) return false;
+
+        DepositTxPublishedMessage that = (DepositTxPublishedMessage) o;
+
+        if (!Arrays.equals(depositTx, that.depositTx)) return false;
+        return !(senderAddress != null ? !senderAddress.equals(that.senderAddress) : that.senderAddress != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (depositTx != null ? Arrays.hashCode(depositTx) : 0);
+        result = 31 * result + (senderAddress != null ? senderAddress.hashCode() : 0);
+        return result;
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FiatTransferStartedMessage.java
index 4b0c16fc4f..3591bd7a4c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FiatTransferStartedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FiatTransferStartedMessage.java
@@ -18,22 +18,49 @@
 package io.bitsquare.trade.protocol.trade.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.MailboxMessage;
-
-import java.io.Serializable;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
-public class FiatTransferStartedMessage extends TradeMessage implements MailboxMessage, Serializable {
+public class FiatTransferStartedMessage extends TradeMessage implements MailboxMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
     public final String buyerPayoutAddress;
+    private final Address senderAddress;
 
-    public FiatTransferStartedMessage(String tradeId,
-                                      String buyerPayoutAddress) {
+    public FiatTransferStartedMessage(String tradeId, String buyerPayoutAddress, Address senderAddress) {
         super(tradeId);
         this.buyerPayoutAddress = buyerPayoutAddress;
+        this.senderAddress = senderAddress;
+    }
+
+    @Override
+    public Address getSenderAddress() {
+        return senderAddress;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof FiatTransferStartedMessage)) return false;
+        if (!super.equals(o)) return false;
+
+        FiatTransferStartedMessage that = (FiatTransferStartedMessage) o;
+
+        if (buyerPayoutAddress != null ? !buyerPayoutAddress.equals(that.buyerPayoutAddress) : that.buyerPayoutAddress != null)
+            return false;
+        return !(senderAddress != null ? !senderAddress.equals(that.senderAddress) : that.senderAddress != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (buyerPayoutAddress != null ? buyerPayoutAddress.hashCode() : 0);
+        result = 31 * result + (senderAddress != null ? senderAddress.hashCode() : 0);
+        return result;
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FinalizePayoutTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FinalizePayoutTxRequest.java
index 32cae4121b..8553f4c386 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FinalizePayoutTxRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/FinalizePayoutTxRequest.java
@@ -18,28 +18,62 @@
 package io.bitsquare.trade.protocol.trade.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.MailboxMessage;
-
-import java.io.Serializable;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 
 import javax.annotation.concurrent.Immutable;
+import java.util.Arrays;
 
 @Immutable
-public class FinalizePayoutTxRequest extends TradeMessage implements MailboxMessage, Serializable {
+public class FinalizePayoutTxRequest extends TradeMessage implements MailboxMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
     public final byte[] sellerSignature;
     public final String sellerPayoutAddress;
     public final long lockTime;
+    private final Address senderAddress;
 
     public FinalizePayoutTxRequest(String tradeId,
                                    byte[] sellerSignature,
                                    String sellerPayoutAddress,
-                                   long lockTime) {
+                                   long lockTime,
+                                   Address senderAddress) {
         super(tradeId);
         this.sellerSignature = sellerSignature;
         this.sellerPayoutAddress = sellerPayoutAddress;
         this.lockTime = lockTime;
+        this.senderAddress = senderAddress;
+    }
+
+    @Override
+    public Address getSenderAddress() {
+        return senderAddress;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof FinalizePayoutTxRequest)) return false;
+        if (!super.equals(o)) return false;
+
+        FinalizePayoutTxRequest that = (FinalizePayoutTxRequest) o;
+
+        if (lockTime != that.lockTime) return false;
+        if (!Arrays.equals(sellerSignature, that.sellerSignature)) return false;
+        if (sellerPayoutAddress != null ? !sellerPayoutAddress.equals(that.sellerPayoutAddress) : that.sellerPayoutAddress != null)
+            return false;
+        return !(senderAddress != null ? !senderAddress.equals(that.senderAddress) : that.senderAddress != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (sellerSignature != null ? Arrays.hashCode(sellerSignature) : 0);
+        result = 31 * result + (sellerPayoutAddress != null ? sellerPayoutAddress.hashCode() : 0);
+        result = 31 * result + (int) (lockTime ^ (lockTime >>> 32));
+        result = 31 * result + (senderAddress != null ? senderAddress.hashCode() : 0);
+        return result;
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayDepositRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayDepositRequest.java
index f7177c14e6..35a00b62fa 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayDepositRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayDepositRequest.java
@@ -18,52 +18,118 @@
 package io.bitsquare.trade.protocol.trade.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.crypto.PubKeyRing;
-import io.bitsquare.fiat.FiatAccount;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.TransactionOutput;
-
-import java.io.Serializable;
-
-import java.util.List;
+import io.bitsquare.btc.data.RawInput;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.messaging.MailboxMessage;
+import io.bitsquare.payment.PaymentAccountContractData;
 
 import javax.annotation.concurrent.Immutable;
+import java.util.Arrays;
+import java.util.List;
 
 @Immutable
-public class PayDepositRequest extends TradeMessage implements Serializable {
+public class PayDepositRequest extends TradeMessage implements MailboxMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
-    public final Coin tradeAmount;
-    public final List<TransactionOutput> buyerConnectedOutputsForAllInputs;
-    public final List<TransactionOutput> buyerOutputs;
-    public final byte[] buyerTradeWalletPubKey;
-    public final boolean isInitialRequest;
-    public final PubKeyRing buyerPubKeyRing;
-    public final FiatAccount buyerFiatAccount;
-    public final String buyerAccountId;
+    public final long tradeAmount;
+    public final byte[] takerTradeWalletPubKey;
+    public final List<RawInput> rawInputs;
+    public final long changeOutputValue;
+    public final String changeOutputAddress;
+    public final String takerPayoutAddressString;
+    public final PubKeyRing takerPubKeyRing;
+    public final PaymentAccountContractData takerPaymentAccountContractData;
+    public final String takerAccountId;
     public final String takeOfferFeeTxId;
+    public final List<Address> acceptedArbitratorAddresses;
+    public final Address arbitratorAddress;
+    private final Address senderAddress;
 
-    public PayDepositRequest(String tradeId,
-                             Coin tradeAmount,
-                             boolean isInitialRequest,
-                             List<TransactionOutput> buyerConnectedOutputsForAllInputs,
-                             List<TransactionOutput> buyerOutputs,
-                             byte[] buyerTradeWalletPubKey,
-                             PubKeyRing buyerPubKeyRing,
-                             FiatAccount buyerFiatAccount,
-                             String buyerAccountId,
-                             String takeOfferFeeTxId) {
+    public PayDepositRequest(Address senderAddress,
+                             String tradeId,
+                             long tradeAmount,
+                             List<RawInput> rawInputs,
+                             long changeOutputValue,
+                             String changeOutputAddress,
+                             byte[] takerTradeWalletPubKey,
+                             String takerPayoutAddressString,
+                             PubKeyRing takerPubKeyRing,
+                             PaymentAccountContractData takerPaymentAccountContractData,
+                             String takerAccountId,
+                             String takeOfferFeeTxId,
+                             List<Address> acceptedArbitratorAddresses,
+                             Address arbitratorAddress) {
         super(tradeId);
+        this.senderAddress = senderAddress;
         this.tradeAmount = tradeAmount;
-        this.isInitialRequest = isInitialRequest;
-        this.buyerPubKeyRing = buyerPubKeyRing;
-        this.buyerConnectedOutputsForAllInputs = buyerConnectedOutputsForAllInputs;
-        this.buyerOutputs = buyerOutputs;
-        this.buyerTradeWalletPubKey = buyerTradeWalletPubKey;
-        this.buyerFiatAccount = buyerFiatAccount;
-        this.buyerAccountId = buyerAccountId;
+        this.rawInputs = rawInputs;
+        this.changeOutputValue = changeOutputValue;
+        this.changeOutputAddress = changeOutputAddress;
+        this.takerPayoutAddressString = takerPayoutAddressString;
+        this.takerPubKeyRing = takerPubKeyRing;
+        this.takerTradeWalletPubKey = takerTradeWalletPubKey;
+        this.takerPaymentAccountContractData = takerPaymentAccountContractData;
+        this.takerAccountId = takerAccountId;
         this.takeOfferFeeTxId = takeOfferFeeTxId;
+        this.acceptedArbitratorAddresses = acceptedArbitratorAddresses;
+        this.arbitratorAddress = arbitratorAddress;
+    }
+
+    @Override
+    public Address getSenderAddress() {
+        return senderAddress;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof PayDepositRequest)) return false;
+        if (!super.equals(o)) return false;
+
+        PayDepositRequest that = (PayDepositRequest) o;
+
+        if (tradeAmount != that.tradeAmount) return false;
+        if (changeOutputValue != that.changeOutputValue) return false;
+        if (!Arrays.equals(takerTradeWalletPubKey, that.takerTradeWalletPubKey)) return false;
+        if (rawInputs != null ? !rawInputs.equals(that.rawInputs) : that.rawInputs != null) return false;
+        if (changeOutputAddress != null ? !changeOutputAddress.equals(that.changeOutputAddress) : that.changeOutputAddress != null)
+            return false;
+        if (takerPayoutAddressString != null ? !takerPayoutAddressString.equals(that.takerPayoutAddressString) : that.takerPayoutAddressString != null)
+            return false;
+        if (takerPubKeyRing != null ? !takerPubKeyRing.equals(that.takerPubKeyRing) : that.takerPubKeyRing != null)
+            return false;
+        if (takerPaymentAccountContractData != null ? !takerPaymentAccountContractData.equals(that.takerPaymentAccountContractData) : that.takerPaymentAccountContractData != null)
+            return false;
+        if (takerAccountId != null ? !takerAccountId.equals(that.takerAccountId) : that.takerAccountId != null)
+            return false;
+        if (takeOfferFeeTxId != null ? !takeOfferFeeTxId.equals(that.takeOfferFeeTxId) : that.takeOfferFeeTxId != null)
+            return false;
+        if (acceptedArbitratorAddresses != null ? !acceptedArbitratorAddresses.equals(that.acceptedArbitratorAddresses) : that.acceptedArbitratorAddresses != null)
+            return false;
+        if (arbitratorAddress != null ? !arbitratorAddress.equals(that.arbitratorAddress) : that.arbitratorAddress != null)
+            return false;
+        return !(senderAddress != null ? !senderAddress.equals(that.senderAddress) : that.senderAddress != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (int) (tradeAmount ^ (tradeAmount >>> 32));
+        result = 31 * result + (takerTradeWalletPubKey != null ? Arrays.hashCode(takerTradeWalletPubKey) : 0);
+        result = 31 * result + (rawInputs != null ? rawInputs.hashCode() : 0);
+        result = 31 * result + (int) (changeOutputValue ^ (changeOutputValue >>> 32));
+        result = 31 * result + (changeOutputAddress != null ? changeOutputAddress.hashCode() : 0);
+        result = 31 * result + (takerPayoutAddressString != null ? takerPayoutAddressString.hashCode() : 0);
+        result = 31 * result + (takerPubKeyRing != null ? takerPubKeyRing.hashCode() : 0);
+        result = 31 * result + (takerPaymentAccountContractData != null ? takerPaymentAccountContractData.hashCode() : 0);
+        result = 31 * result + (takerAccountId != null ? takerAccountId.hashCode() : 0);
+        result = 31 * result + (takeOfferFeeTxId != null ? takeOfferFeeTxId.hashCode() : 0);
+        result = 31 * result + (acceptedArbitratorAddresses != null ? acceptedArbitratorAddresses.hashCode() : 0);
+        result = 31 * result + (arbitratorAddress != null ? arbitratorAddress.hashCode() : 0);
+        result = 31 * result + (senderAddress != null ? senderAddress.hashCode() : 0);
+        return result;
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayoutTxFinalizedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayoutTxFinalizedMessage.java
index f27f04829b..ced2b142d1 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayoutTxFinalizedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PayoutTxFinalizedMessage.java
@@ -18,24 +18,49 @@
 package io.bitsquare.trade.protocol.trade.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.MailboxMessage;
-
-import org.bitcoinj.core.Transaction;
-
-import java.io.Serializable;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.messaging.MailboxMessage;
 
 import javax.annotation.concurrent.Immutable;
+import java.util.Arrays;
 
 @Immutable
-public class PayoutTxFinalizedMessage extends TradeMessage implements MailboxMessage, Serializable {
+public class PayoutTxFinalizedMessage extends TradeMessage implements MailboxMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
-    public final Transaction payoutTx;
+    public final byte[] payoutTx;
+    private final Address senderAddress;
 
-    public PayoutTxFinalizedMessage(String tradeId, Transaction payoutTx) {
+    public PayoutTxFinalizedMessage(String tradeId, byte[] payoutTx, Address senderAddress) {
         super(tradeId);
         this.payoutTx = payoutTx;
+        this.senderAddress = senderAddress;
     }
 
+    @Override
+    public Address getSenderAddress() {
+        return senderAddress;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof PayoutTxFinalizedMessage)) return false;
+        if (!super.equals(o)) return false;
+
+        PayoutTxFinalizedMessage that = (PayoutTxFinalizedMessage) o;
+
+        if (!Arrays.equals(payoutTx, that.payoutTx)) return false;
+        return !(senderAddress != null ? !senderAddress.equals(that.senderAddress) : that.senderAddress != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (payoutTx != null ? Arrays.hashCode(payoutTx) : 0);
+        result = 31 * result + (senderAddress != null ? senderAddress.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PublishDepositTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PublishDepositTxRequest.java
index f240095e06..2fef2b1c61 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PublishDepositTxRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/PublishDepositTxRequest.java
@@ -18,48 +18,59 @@
 package io.bitsquare.trade.protocol.trade.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.fiat.FiatAccount;
-
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.TransactionOutput;
-
-import java.io.Serializable;
-
-import java.util.List;
+import io.bitsquare.btc.data.RawInput;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.payment.PaymentAccountContractData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.concurrent.Immutable;
+import java.util.List;
 
 @Immutable
-public class PublishDepositTxRequest extends TradeMessage implements Serializable {
+public class PublishDepositTxRequest extends TradeMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
-    public final FiatAccount sellerFiatAccount;
-    public final String sellerAccountId;
-    public final String sellerContractAsJson;
-    public final String sellerContractSignature;
-    public final String sellerPayoutAddressString;
-    public final Transaction sellersPreparedDepositTx;
-    public final List<TransactionOutput> sellerConnectedOutputsForAllInputs;
-    public final byte[] sellerTradeWalletPubKey;
+    private static final Logger log = LoggerFactory.getLogger(PublishDepositTxRequest.class);
+
+    public final PaymentAccountContractData offererPaymentAccountContractData;
+    public final String offererAccountId;
+    public final String offererContractAsJson;
+    public final String offererContractSignature;
+    public final String offererPayoutAddressString;
+    public final byte[] preparedDepositTx;
+    public final List<RawInput> offererInputs;
+    public final int openDisputeTimeAsBlockHeight;
+    public final int checkPaymentTimeAsBlockHeight;
+    public final byte[] offererTradeWalletPubKey;
 
     public PublishDepositTxRequest(String tradeId,
-                                   FiatAccount sellerFiatAccount,
-                                   String sellerAccountId,
-                                   byte[] sellerTradeWalletPubKey,
-                                   String sellerContractAsJson,
-                                   String sellerContractSignature,
-                                   String sellerPayoutAddressString,
-                                   Transaction sellersPreparedDepositTx,
-                                   List<TransactionOutput> sellerConnectedOutputsForAllInputs) {
+                                   PaymentAccountContractData offererPaymentAccountContractData,
+                                   String offererAccountId,
+                                   byte[] offererTradeWalletPubKey,
+                                   String offererContractAsJson,
+                                   String offererContractSignature,
+                                   String offererPayoutAddressString,
+                                   byte[] preparedDepositTx,
+                                   List<RawInput> offererInputs,
+                                   int openDisputeTimeAsBlockHeight,
+                                   int checkPaymentTimeAsBlockHeight) {
         super(tradeId);
-        this.sellerFiatAccount = sellerFiatAccount;
-        this.sellerAccountId = sellerAccountId;
-        this.sellerTradeWalletPubKey = sellerTradeWalletPubKey;
-        this.sellerContractAsJson = sellerContractAsJson;
-        this.sellerContractSignature = sellerContractSignature;
-        this.sellerPayoutAddressString = sellerPayoutAddressString;
-        this.sellersPreparedDepositTx = sellersPreparedDepositTx;
-        this.sellerConnectedOutputsForAllInputs = sellerConnectedOutputsForAllInputs;
+        this.offererPaymentAccountContractData = offererPaymentAccountContractData;
+        this.offererAccountId = offererAccountId;
+        this.offererTradeWalletPubKey = offererTradeWalletPubKey;
+        this.offererContractAsJson = offererContractAsJson;
+        this.offererContractSignature = offererContractSignature;
+        this.offererPayoutAddressString = offererPayoutAddressString;
+        this.preparedDepositTx = preparedDepositTx;
+        this.offererInputs = offererInputs;
+        this.openDisputeTimeAsBlockHeight = openDisputeTimeAsBlockHeight;
+        this.checkPaymentTimeAsBlockHeight = checkPaymentTimeAsBlockHeight;
+
+        log.trace("offererPaymentAccount size " + Utilities.objectToByteArray(offererPaymentAccountContractData).length);
+        log.trace("offererTradeWalletPubKey size " + offererTradeWalletPubKey.length);
+        log.trace("preparedDepositTx size " + preparedDepositTx.length);
+        log.trace("offererInputs size " + Utilities.objectToByteArray(offererInputs).length);
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java
index 3147007ad1..a7744c0df3 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/messages/TradeMessage.java
@@ -18,19 +18,33 @@
 package io.bitsquare.trade.protocol.trade.messages;
 
 import io.bitsquare.app.Version;
-import io.bitsquare.p2p.Message;
-
-import java.io.Serializable;
+import io.bitsquare.p2p.messaging.MailMessage;
 
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
-public abstract class TradeMessage implements Message, Serializable {
+public abstract class TradeMessage implements MailMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
     public final String tradeId;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof TradeMessage)) return false;
+
+        TradeMessage that = (TradeMessage) o;
+
+        return !(tradeId != null ? !tradeId.equals(that.tradeId) : that.tradeId != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return tradeId != null ? tradeId.hashCode() : 0;
+    }
+
     protected TradeMessage(String tradeId) {
         this.tradeId = tradeId;
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java
index eee1c548c5..da38a546af 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/TradeTask.java
@@ -21,7 +21,6 @@ import io.bitsquare.common.taskrunner.Task;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.ProcessModel;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +30,7 @@ public abstract class TradeTask extends Task<Trade> {
     protected final ProcessModel processModel;
     protected final Trade trade;
 
-    public TradeTask(TaskRunner taskHandler, Trade trade) {
+    protected TradeTask(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
 
         this.trade = trade;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java
deleted file mode 100644
index ece0204fa0..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.buyer;
-
-import io.bitsquare.btc.FeePolicy;
-import io.bitsquare.btc.TradeWalletService;
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.bitcoinj.core.Coin;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CreateDepositTxInputs extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(CreateDepositTxInputs.class);
-
-    public CreateDepositTxInputs(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            log.debug("trade.id" + trade.getId());
-            Coin inputAmount = trade.getSecurityDeposit().add(FeePolicy.TX_FEE);
-            TradeWalletService.Result result = processModel.getTradeWalletService().createDepositTxInputs(inputAmount,
-                    processModel.getAddressEntry());
-
-            processModel.setConnectedOutputsForAllInputs(result.getConnectedOutputsForAllInputs());
-            processModel.setOutputs(result.getOutputs());
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java
deleted file mode 100644
index 5272a6c91f..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessDepositTxInputsRequest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.buyer;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.messages.DepositTxInputsRequest;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static io.bitsquare.util.Validator.*;
-
-public class ProcessDepositTxInputsRequest extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(ProcessDepositTxInputsRequest.class);
-
-    public ProcessDepositTxInputsRequest(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            DepositTxInputsRequest message = (DepositTxInputsRequest) processModel.getTradeMessage();
-            checkTradeId(processModel.getId(), message);
-            checkNotNull(message);
-
-            processModel.tradingPeer.setPubKeyRing(checkNotNull(message.sellerPubKeyRing));
-            processModel.setTakeOfferFeeTxId(nonEmptyStringOf(message.sellerOfferFeeTxId));
-            trade.setTradeAmount(positiveCoinOf(nonZeroCoinOf(message.tradeAmount)));
-            processModel.tradingPeer.setTradeWalletPubKey(checkNotNull(message.sellerTradeWalletPubKey));
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java
index 61d72876e2..af1efb79f9 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java
@@ -19,10 +19,8 @@ package io.bitsquare.trade.protocol.trade.tasks.buyer;
 
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.FinalizePayoutTxRequest;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,15 +38,19 @@ public class ProcessFinalizePayoutTxRequest extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
+            log.debug("current trade state " + trade.getState());
             FinalizePayoutTxRequest message = (FinalizePayoutTxRequest) processModel.getTradeMessage();
             checkTradeId(processModel.getId(), message);
             checkNotNull(message);
 
             processModel.tradingPeer.setSignature(checkNotNull(message.sellerSignature));
             processModel.tradingPeer.setPayoutAddressString(nonEmptyStringOf(message.sellerPayoutAddress));
-            trade.setLockTime(nonNegativeLongOf(message.lockTime));
+            trade.setLockTimeAsBlockHeight(nonNegativeLongOf(message.lockTime));
 
-            trade.setTradeState(TradeState.BuyerState.FIAT_PAYMENT_RECEIPT_MSG_RECEIVED);
+            trade.setState(Trade.State.FIAT_PAYMENT_RECEIPT_MSG_RECEIVED);
+
+            // update to the latest peer address of our peer if the message is correct
+            trade.setTradingPeerAddress(processModel.getTempTradingPeerAddress());
 
             complete();
         } catch (Throwable t) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java
deleted file mode 100644
index 2674cabae6..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPublishDepositTxRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.buyer;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.messages.PublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.google.common.base.Preconditions.*;
-import static io.bitsquare.util.Validator.*;
-
-public class ProcessPublishDepositTxRequest extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(ProcessPublishDepositTxRequest.class);
-
-    public ProcessPublishDepositTxRequest(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            PublishDepositTxRequest message = (PublishDepositTxRequest) processModel.getTradeMessage();
-            checkTradeId(processModel.getId(), message);
-            checkNotNull(message);
-
-            processModel.tradingPeer.setFiatAccount(checkNotNull(message.sellerFiatAccount));
-            processModel.tradingPeer.setAccountId(nonEmptyStringOf(message.sellerAccountId));
-            processModel.tradingPeer.setTradeWalletPubKey(checkNotNull(message.sellerTradeWalletPubKey));
-            processModel.tradingPeer.setContractAsJson(nonEmptyStringOf(message.sellerContractAsJson));
-            processModel.tradingPeer.setContractSignature(nonEmptyStringOf(message.sellerContractSignature));
-            processModel.tradingPeer.setPayoutAddressString(nonEmptyStringOf(message.sellerPayoutAddressString));
-            processModel.tradingPeer.setPreparedDepositTx(checkNotNull(message.sellersPreparedDepositTx));
-            processModel.tradingPeer.setConnectedOutputsForAllInputs(checkNotNull(message.sellerConnectedOutputsForAllInputs));
-            checkArgument(message.sellerConnectedOutputsForAllInputs.size() > 0);
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java
deleted file mode 100644
index d8e2fe41bb..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.buyer;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SendDepositTxPublishedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SendDepositTxPublishedMessage.class);
-
-    public SendDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            DepositTxPublishedMessage tradeMessage = new DepositTxPublishedMessage(processModel.getId(), trade.getDepositTx());
-
-            processModel.getMessageService().sendEncryptedMessage(
-                    trade.getTradingPeer(),
-                    processModel.tradingPeer.getPubKeyRing(),
-                    tradeMessage,
-                    true,
-                    new SendMessageListener() {
-                        @Override
-                        public void handleResult() {
-                            log.trace("DepositTxPublishedMessage successfully arrived at peer");
-
-                            trade.setTradeState(TradeState.BuyerState.DEPOSIT_PUBLISHED_MSG_SENT);
-
-                            complete();
-                        }
-
-                        @Override
-                        public void handleFault() {
-                            appendToErrorMessage("Sending DepositTxPublishedMessage failed");
-                            failed();
-                        }
-                    });
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-
-
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java
index 3e7981b40b..df84c0e0a0 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java
@@ -18,12 +18,10 @@
 package io.bitsquare.trade.protocol.trade.tasks.buyer;
 
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
+import io.bitsquare.p2p.messaging.SendMailboxMessageListener;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,28 +36,33 @@ public class SendFiatTransferStartedMessage extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            FiatTransferStartedMessage tradeMessage = new FiatTransferStartedMessage(processModel.getId(),
-                    processModel.getAddressEntry().getAddressString()
-            );
 
-            processModel.getMessageService().sendEncryptedMessage(
-                    trade.getTradingPeer(),
+            processModel.getP2PService().sendEncryptedMailboxMessage(
+                    trade.getTradingPeerAddress(),
                     processModel.tradingPeer.getPubKeyRing(),
-                    tradeMessage,
-                    true,
-                    new SendMessageListener() {
+                    new FiatTransferStartedMessage(
+                            processModel.getId(),
+                            processModel.getAddressEntry().getAddressString(),
+                            processModel.getMyAddress()
+                    ),
+                    new SendMailboxMessageListener() {
                         @Override
-                        public void handleResult() {
-                            log.trace("Sending FiatTransferStartedMessage succeeded.");
-
-                            trade.setTradeState(TradeState.BuyerState.FIAT_PAYMENT_STARTED_MSG_SENT);
-
+                        public void onArrived() {
+                            log.trace("Message arrived at peer.");
+                            trade.setState(Trade.State.FIAT_PAYMENT_STARTED_MSG_SENT);
                             complete();
                         }
 
                         @Override
-                        public void handleFault() {
-                            appendToErrorMessage("Sending FiatTransferStartedMessage failed");
+                        public void onStoredInMailbox() {
+                            log.trace("Message stored in mailbox.");
+                            trade.setState(Trade.State.FIAT_PAYMENT_STARTED_MSG_SENT);
+                            complete();
+                        }
+
+                        @Override
+                        public void onFault() {
+                            appendToErrorMessage("FiatTransferStartedMessage sending failed");
                             failed();
                         }
                     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java
deleted file mode 100644
index 0f7d81e705..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.buyer;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
-import io.bitsquare.trade.BuyerAsTakerTrade;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SendPayDepositRequest extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SendPayDepositRequest.class);
-
-    public SendPayDepositRequest(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            boolean isInitialRequest = trade instanceof BuyerAsTakerTrade;
-            PayDepositRequest tradeMessage = new PayDepositRequest(
-                    processModel.getId(),
-                    trade.getTradeAmount(),
-                    isInitialRequest,
-                    processModel.getConnectedOutputsForAllInputs(),
-                    processModel.getOutputs(),
-                    processModel.getTradeWalletPubKey(),
-                    processModel.getPubKeyRing(),
-                    processModel.getFiatAccount(),
-                    processModel.getAccountId(),
-                    processModel.getTakeOfferFeeTxId());
-
-            processModel.getMessageService().sendEncryptedMessage(
-                    trade.getTradingPeer(),
-                    processModel.tradingPeer.getPubKeyRing(),
-                    tradeMessage,
-                    false,
-                    new SendMessageListener() {
-                        @Override
-                        public void handleResult() {
-                            log.trace("PayDepositRequest successfully arrived at peer");
-                            complete();
-                        }
-
-                        @Override
-                        public void handleFault() {
-                            appendToErrorMessage("Sending PayDepositRequest failed");
-                            failed();
-                        }
-                    });
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java
index aacab5c791..d4806529e1 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java
@@ -18,12 +18,10 @@
 package io.bitsquare.trade.protocol.trade.tasks.buyer;
 
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
+import io.bitsquare.p2p.messaging.SendMailboxMessageListener;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.PayoutTxFinalizedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,30 +36,44 @@ public class SendPayoutTxFinalizedMessage extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            PayoutTxFinalizedMessage tradeMessage = new PayoutTxFinalizedMessage(processModel.getId(), trade.getPayoutTx());
-            processModel.getMessageService().sendEncryptedMessage(
-                    trade.getTradingPeer(),
-                    processModel.tradingPeer.getPubKeyRing(),
-                    tradeMessage,
-                    true,
-                    new SendMessageListener() {
-                        @Override
-                        public void handleResult() {
-                            log.trace("PayoutTxFinalizedMessage successfully arrived at peer");
+            if (trade.getPayoutTx() != null) {
+                processModel.getP2PService().sendEncryptedMailboxMessage(
+                        trade.getTradingPeerAddress(),
+                        processModel.tradingPeer.getPubKeyRing(),
+                        new PayoutTxFinalizedMessage(
+                                processModel.getId(),
+                                trade.getPayoutTx().bitcoinSerialize(),
+                                processModel.getMyAddress()
+                        ),
+                        new SendMailboxMessageListener() {
+                            @Override
+                            public void onArrived() {
+                                log.trace("Message arrived at peer.");
+                                trade.setState(Trade.State.PAYOUT_TX_SENT);
+                                complete();
+                            }
 
-                            trade.setTradeState(TradeState.BuyerState.PAYOUT_TX_SENT);
+                            @Override
+                            public void onStoredInMailbox() {
+                                log.trace("Message stored in mailbox.");
+                                trade.setState(Trade.State.PAYOUT_TX_SENT);
+                                complete();
+                            }
 
-                            complete();
+                            @Override
+                            public void onFault() {
+                                appendToErrorMessage("PayoutTxFinalizedMessage sending failed");
+                                failed();
+                            }
                         }
-
-                        @Override
-                        public void handleFault() {
-                            appendToErrorMessage("Sending PayoutTxFinalizedMessage failed");
-                            failed();
-                        }
-                    });
+                );
+            } else {
+                log.error("trade.getPayoutTx() = " + trade.getPayoutTx());
+                failed("PayoutTx is null");
+            }
         } catch (Throwable t) {
             failed(t);
         }
+
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
index cef45a46e0..e59f1fe406 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
@@ -17,16 +17,17 @@
 
 package io.bitsquare.trade.protocol.trade.tasks.buyer;
 
+import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class SignAndFinalizePayoutTx extends TradeTask {
     private static final Logger log = LoggerFactory.getLogger(SignAndFinalizePayoutTx.class);
 
@@ -38,22 +39,21 @@ public class SignAndFinalizePayoutTx extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            assert trade.getTradeAmount() != null;
-            assert trade.getSecurityDeposit() != null;
-            Coin sellerPayoutAmount = trade.getSecurityDeposit();
+            checkNotNull(trade.getTradeAmount(), "trade.getTradeAmount() must not be null");
+            Coin sellerPayoutAmount = FeePolicy.SECURITY_DEPOSIT;
             Coin buyerPayoutAmount = sellerPayoutAmount.add(trade.getTradeAmount());
 
-            Transaction transaction = processModel.getTradeWalletService().signAndFinalizePayoutTx(
+            Transaction transaction = processModel.getTradeWalletService().buyerSignsAndFinalizesPayoutTx(
                     trade.getDepositTx(),
                     processModel.tradingPeer.getSignature(),
                     buyerPayoutAmount,
                     sellerPayoutAmount,
                     processModel.getAddressEntry(),
                     processModel.tradingPeer.getPayoutAddressString(),
-                    trade.getLockTime(),
+                    trade.getLockTimeAsBlockHeight(),
                     processModel.getTradeWalletPubKey(),
                     processModel.tradingPeer.getTradeWalletPubKey(),
-                    processModel.getArbitratorPubKey()
+                    processModel.getArbitratorPubKey(trade.getArbitratorAddress())
             );
 
             trade.setPayoutTx(transaction);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java
deleted file mode 100644
index 498a93edb4..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.buyer;
-
-import io.bitsquare.btc.FeePolicy;
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.Transaction;
-
-import com.google.common.util.concurrent.FutureCallback;
-
-import java.util.Date;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SignAndPublishDepositTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SignAndPublishDepositTx.class);
-
-    public SignAndPublishDepositTx(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            Coin inputAmount = trade.getSecurityDeposit().add(FeePolicy.TX_FEE);
-
-            processModel.getTradeWalletService().signAndPublishDepositTx(
-                    processModel.tradingPeer.getPreparedDepositTx(),
-                    processModel.getConnectedOutputsForAllInputs(),
-                    processModel.tradingPeer.getConnectedOutputsForAllInputs(),
-                    processModel.getOutputs(),
-                    inputAmount,
-                    processModel.getTradeWalletPubKey(),
-                    processModel.tradingPeer.getTradeWalletPubKey(),
-                    processModel.getArbitratorPubKey(),
-                    new FutureCallback<Transaction>() {
-                        @Override
-                        public void onSuccess(Transaction transaction) {
-                            log.trace("takerSignAndPublishTx succeeded " + transaction);
-
-                            trade.setDepositTx(transaction);
-
-                            trade.setTradeState(TradeState.BuyerState.DEPOSIT_PUBLISHED);
-                            trade.setTakeOfferDate(new Date());
-
-                            complete();
-                        }
-
-                        @Override
-                        public void onFailure(@NotNull Throwable t) {
-                            failed(t);
-                        }
-                    });
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java
deleted file mode 100644
index 2f5b48fe62..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.buyer;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Contract;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-import io.bitsquare.util.Utilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class VerifyAndSignContract extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(VerifyAndSignContract.class);
-
-    public VerifyAndSignContract(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            Contract contract = new Contract(
-                    processModel.getOffer(),
-                    trade.getTradeAmount(),
-                    processModel.getTakeOfferFeeTxId(),
-                    processModel.getAccountId(),
-                    processModel.tradingPeer.getAccountId(),
-                    processModel.getFiatAccount(),
-                    processModel.tradingPeer.getFiatAccount(),
-                    processModel.getPubKeyRing(),
-                    processModel.tradingPeer.getPubKeyRing());
-            String contractAsJson = Utilities.objectToJson(contract);
-            String signature = processModel.getCryptoService().signMessage(processModel.getRegistrationKeyPair(), contractAsJson);
-            trade.setContract(contract);
-            trade.setContractAsJson(contractAsJson);
-            trade.setBuyerContractSignature(signature);
-            trade.setBuyerContractSignature(processModel.tradingPeer.getContractSignature());
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java
index 721142a22f..4ea54fb56b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade.protocol.trade.tasks.offerer;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +35,7 @@ public class VerifyTakeOfferFeePayment extends TradeTask {
         try {
             runInterceptHook();
             //TODO mocked yet, need a confidence listeners
-            int numOfPeersSeenTx = processModel.getWalletService().getNumOfPeersSeenTx(processModel.getTakeOfferFeeTxId());
+            // int numOfPeersSeenTx = processModel.getWalletService().getNumOfPeersSeenTx(processModel.getTakeOfferFeeTxId());
        /* if (numOfPeersSeenTx > 2) {
             resultHandler.handleResult();
         }*/
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java
index a5fffae9be..72a9961b0f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade.protocol.trade.tasks.offerer;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,19 +35,14 @@ public class VerifyTakerAccount extends TradeTask {
         try {
             runInterceptHook();
             //TODO mocked yet
-            if (processModel.getBlockChainService().verifyAccountRegistration()) {
-                if (processModel.getBlockChainService().isAccountBlackListed(processModel.tradingPeer.getAccountId(),
-                        processModel.tradingPeer.getFiatAccount())) {
-                    log.error("Taker is blacklisted");
-                    failed("Taker is blacklisted");
-                }
-                else {
-                    complete();
-                }
-            }
-            else {
-                failed("Account registration validation for peer failed.");
+           /* if (processModel.getBlockChainService().isAccountBlackListed(processModel.tradingPeer.getAccountId(),
+                    processModel.tradingPeer.getPaymentAccountContractData())) {
+                log.error("Taker is blacklisted");
+                failed("Taker is blacklisted");
             }
+            else {*/
+            complete();
+            //}
         } catch (Throwable t) {
             failed(t);
         }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java
deleted file mode 100644
index bfa04a753f..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.bitcoinj.core.Transaction;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CommitDepositTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(CommitDepositTx.class);
-
-    public CommitDepositTx(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            // To access tx confidence we need to add that tx into our wallet.
-            Transaction depositTx = processModel.getTradeWalletService().commitTx(trade.getDepositTx());
-
-            trade.setDepositTx(depositTx);
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java
deleted file mode 100644
index 5390552f5c..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Contract;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-import io.bitsquare.util.Utilities;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CreateAndSignContract extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(CreateAndSignContract.class);
-
-    public CreateAndSignContract(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            assert processModel.getTakeOfferFeeTxId() != null;
-            Contract contract = new Contract(
-                    processModel.getOffer(),
-                    trade.getTradeAmount(),
-                    processModel.getTakeOfferFeeTxId(),
-                    processModel.tradingPeer.getAccountId(),
-                    processModel.getAccountId(),
-                    processModel.tradingPeer.getFiatAccount(),
-                    processModel.getFiatAccount(),
-                    processModel.tradingPeer.getPubKeyRing(),
-                    processModel.getPubKeyRing());
-            String contractAsJson = Utilities.objectToJson(contract);
-            String signature = processModel.getCryptoService().signMessage(processModel.getRegistrationKeyPair(), contractAsJson);
-
-            trade.setContract(contract);
-            trade.setContractAsJson(contractAsJson);
-            trade.setSellerContractSignature(signature);
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java
deleted file mode 100644
index 2e0d8623d6..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.btc.FeePolicy;
-import io.bitsquare.btc.TradeWalletService;
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.bitcoinj.core.Coin;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CreateAndSignDepositTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(CreateAndSignDepositTx.class);
-
-    public CreateAndSignDepositTx(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            assert trade.getTradeAmount() != null;
-            Coin inputAmount = trade.getSecurityDeposit().add(FeePolicy.TX_FEE).add(trade.getTradeAmount());
-            Coin msOutputAmount = inputAmount.add(trade.getSecurityDeposit());
-
-            TradeWalletService.Result result = processModel.getTradeWalletService().createAndSignDepositTx(
-                    inputAmount,
-                    msOutputAmount,
-                    processModel.tradingPeer.getConnectedOutputsForAllInputs(),
-                    processModel.tradingPeer.getOutputs(),
-                    processModel.getAddressEntry(),
-                    processModel.tradingPeer.getTradeWalletPubKey(),
-                    processModel.getTradeWalletPubKey(),
-                    processModel.getArbitratorPubKey());
-
-
-            processModel.setConnectedOutputsForAllInputs(result.getConnectedOutputsForAllInputs());
-            processModel.setPreparedDepositTx(result.getDepositTx());
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java
deleted file mode 100644
index 219ec7ad8b..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static io.bitsquare.util.Validator.checkTradeId;
-
-public class ProcessDepositTxPublishedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(ProcessDepositTxPublishedMessage.class);
-
-    public ProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            DepositTxPublishedMessage message = (DepositTxPublishedMessage) processModel.getTradeMessage();
-            checkTradeId(processModel.getId(), message);
-            checkNotNull(message);
-
-            trade.setDepositTx(checkNotNull(message.depositTx));
-
-            trade.setTradeState(TradeState.SellerState.DEPOSIT_PUBLISHED_MSG_RECEIVED);
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java
index a895168130..3d7a28ff7f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java
@@ -19,15 +19,14 @@ package io.bitsquare.trade.protocol.trade.tasks.seller;
 
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.bitsquare.util.Validator.*;
+import static io.bitsquare.util.Validator.checkTradeId;
+import static io.bitsquare.util.Validator.nonEmptyStringOf;
 
 public class ProcessFiatTransferStartedMessage extends TradeTask {
     private static final Logger log = LoggerFactory.getLogger(ProcessFiatTransferStartedMessage.class);
@@ -40,13 +39,17 @@ public class ProcessFiatTransferStartedMessage extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
+            log.debug("current trade state " + trade.getState());
             FiatTransferStartedMessage message = (FiatTransferStartedMessage) processModel.getTradeMessage();
             checkTradeId(processModel.getId(), message);
             checkNotNull(message);
 
             processModel.tradingPeer.setPayoutAddressString(nonEmptyStringOf(message.buyerPayoutAddress));
 
-            trade.setTradeState(TradeState.SellerState.FIAT_PAYMENT_STARTED_MSG_RECEIVED);
+            trade.setState(Trade.State.FIAT_PAYMENT_STARTED_MSG_RECEIVED);
+
+            // update to the latest peer address of our peer if the message is correct
+            trade.setTradingPeerAddress(processModel.getTempTradingPeerAddress());
 
             complete();
         } catch (Throwable t) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java
deleted file mode 100644
index 96d01342a5..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayDepositRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.google.common.base.Preconditions.*;
-import static io.bitsquare.util.Validator.*;
-
-public class ProcessPayDepositRequest extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(ProcessPayDepositRequest.class);
-
-    public ProcessPayDepositRequest(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            PayDepositRequest message = (PayDepositRequest) processModel.getTradeMessage();
-            checkTradeId(processModel.getId(), message);
-            checkNotNull(message);
-
-            processModel.tradingPeer.setConnectedOutputsForAllInputs(checkNotNull(message.buyerConnectedOutputsForAllInputs));
-            checkArgument(message.buyerConnectedOutputsForAllInputs.size() > 0);
-            processModel.tradingPeer.setOutputs(checkNotNull(message.buyerOutputs));
-            processModel.tradingPeer.setTradeWalletPubKey(checkNotNull(message.buyerTradeWalletPubKey));
-            processModel.tradingPeer.setPubKeyRing(checkNotNull(message.buyerPubKeyRing));
-            processModel.tradingPeer.setFiatAccount(checkNotNull(message.buyerFiatAccount));
-            processModel.tradingPeer.setAccountId(nonEmptyStringOf(message.buyerAccountId));
-            processModel.setTakeOfferFeeTxId(nonEmptyStringOf(message.takeOfferFeeTxId));
-            trade.setTradeAmount(positiveCoinOf(nonZeroCoinOf(message.tradeAmount)));
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java
index 2c22ed8f97..25796f14c7 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java
@@ -19,13 +19,12 @@ package io.bitsquare.trade.protocol.trade.tasks.seller;
 
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.PayoutTxFinalizedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.bitsquare.util.Validator.checkTradeId;
 
@@ -40,13 +39,17 @@ public class ProcessPayoutTxFinalizedMessage extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
+            log.debug("current trade state " + trade.getState());
             PayoutTxFinalizedMessage message = (PayoutTxFinalizedMessage) processModel.getTradeMessage();
             checkTradeId(processModel.getId(), message);
             checkNotNull(message);
+            checkArgument(message.payoutTx != null);
+            trade.setPayoutTx(processModel.getWalletService().getTransactionFromSerializedTx(message.payoutTx));
 
-            trade.setPayoutTx(checkNotNull(message.payoutTx));
+            trade.setState(Trade.State.PAYOUT_TX_RECEIVED);
 
-            trade.setTradeState(TradeState.SellerState.PAYOUT_TX_RECEIVED);
+            // update to the latest peer address of our peer if the message is correct
+            trade.setTradingPeerAddress(processModel.getTempTradingPeerAddress());
 
             complete();
         } catch (Throwable t) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java
deleted file mode 100644
index 59ae6ce2b8..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.messages.DepositTxInputsRequest;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.bitcoinj.utils.Threading;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SendDepositTxInputsRequest extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SendDepositTxInputsRequest.class);
-
-    public SendDepositTxInputsRequest(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    private int retryCounter = 0;
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            assert processModel.getTakeOfferFeeTx() != null;
-            DepositTxInputsRequest message = new DepositTxInputsRequest(
-                    processModel.getId(),
-                    processModel.getPubKeyRing(),
-                    processModel.getTakeOfferFeeTx().getHashAsString(),
-                    trade.getTradeAmount(),
-                    processModel.getTradeWalletPubKey());
-
-            processModel.getMessageService().sendEncryptedMessage(
-                    trade.getTradingPeer(),
-                    processModel.tradingPeer.getPubKeyRing(),
-                    message,
-                    false,
-                    new SendMessageListener() {
-                        @Override
-                        public void handleResult() {
-                            log.trace("Sending TakeOfferFeePayedMessage succeeded.");
-                            complete();
-                        }
-
-                        @Override
-                        public void handleFault() {
-                            log.warn("Sending TakeOfferFeePayedMessage failed. We try a second time.");
-                            // Take offer fee is already paid, so we need to try to get that trade to succeed.
-                            // We try to repeat once and if that fails as well we persist the state for a later retry.
-                            if (retryCounter == 0) {
-                                retryCounter++;
-                                Threading.USER_THREAD.execute(SendDepositTxInputsRequest.this::run);
-                            }
-                            else {
-                                appendToErrorMessage("Sending TakeOfferFeePayedMessage to offerer failed. Maybe the network connection was " +
-                                        "lost or the offerer lost his connection. We persisted the state of the trade, please try again later " +
-                                        "or cancel that trade.");
-
-                                failed();
-                            }
-                        }
-                    });
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java
index 9176940033..43da1db19c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java
@@ -18,12 +18,10 @@
 package io.bitsquare.trade.protocol.trade.tasks.seller;
 
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
+import io.bitsquare.p2p.messaging.SendMailboxMessageListener;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.messages.FinalizePayoutTxRequest;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,34 +36,45 @@ public class SendFinalizePayoutTxRequest extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            FinalizePayoutTxRequest message = new FinalizePayoutTxRequest(
-                    processModel.getId(),
-                    processModel.getPayoutTxSignature(),
-                    processModel.getAddressEntry().getAddressString(),
-                    trade.getLockTime()
-            );
+            if (trade.getTradingPeerAddress() != null) {
+                FinalizePayoutTxRequest message = new FinalizePayoutTxRequest(
+                        processModel.getId(),
+                        processModel.getPayoutTxSignature(),
+                        processModel.getAddressEntry().getAddressString(),
+                        trade.getLockTimeAsBlockHeight(),
+                        processModel.getMyAddress()
+                );
 
-            processModel.getMessageService().sendEncryptedMessage(
-                    trade.getTradingPeer(),
-                    processModel.tradingPeer.getPubKeyRing(),
-                    message,
-                    true,
-                    new SendMessageListener() {
-                        @Override
-                        public void handleResult() {
-                            log.trace("FinalizePayoutTxRequest successfully arrived at peer");
+                processModel.getP2PService().sendEncryptedMailboxMessage(
+                        trade.getTradingPeerAddress(),
+                        processModel.tradingPeer.getPubKeyRing(),
+                        message,
+                        new SendMailboxMessageListener() {
+                            @Override
+                            public void onArrived() {
+                                log.trace("Message arrived at peer.");
+                                trade.setState(Trade.State.FIAT_PAYMENT_RECEIPT_MSG_SENT);
+                                complete();
+                            }
 
-                            trade.setTradeState(TradeState.SellerState.FIAT_PAYMENT_RECEIPT_MSG_SENT);
+                            @Override
+                            public void onStoredInMailbox() {
+                                log.trace("Message stored in mailbox.");
+                                trade.setState(Trade.State.FIAT_PAYMENT_RECEIPT_MSG_SENT);
+                                complete();
+                            }
 
-                            complete();
+                            @Override
+                            public void onFault() {
+                                appendToErrorMessage("FinalizePayoutTxRequest sending failed");
+                                failed();
+                            }
                         }
-
-                        @Override
-                        public void handleFault() {
-                            appendToErrorMessage("Sending FinalizePayoutTxRequest failed");
-                            failed();
-                        }
-                    });
+                );
+            } else {
+                log.error("trade.getTradingPeerAddress() = " + trade.getTradingPeerAddress());
+                failed("A needed dependency is null");
+            }
         } catch (Throwable t) {
             failed(t);
         }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java
deleted file mode 100644
index 860fb26210..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.p2p.listener.SendMessageListener;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.messages.PublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SendPublishDepositTxRequest extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SendPublishDepositTxRequest.class);
-
-    public SendPublishDepositTxRequest(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            PublishDepositTxRequest tradeMessage = new PublishDepositTxRequest(
-                    processModel.getId(),
-                    processModel.getFiatAccount(),
-                    processModel.getAccountId(),
-                    processModel.getTradeWalletPubKey(),
-                    trade.getContractAsJson(),
-                    trade.getSellerContractSignature(),
-                    processModel.getAddressEntry().getAddressString(),
-                    processModel.getPreparedDepositTx(),
-                    processModel.getConnectedOutputsForAllInputs()
-            );
-
-            processModel.getMessageService().sendEncryptedMessage(
-                    trade.getTradingPeer(),
-                    processModel.tradingPeer.getPubKeyRing(),
-                    tradeMessage,
-                    false,
-                    new SendMessageListener() {
-                        @Override
-                        public void handleResult() {
-                            complete();
-                        }
-
-                        @Override
-                        public void handleFault() {
-                            appendToErrorMessage("Sending PublishDepositTxRequest failed");
-                            failed();
-                        }
-                    });
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
deleted file mode 100644
index 640f0b0fbd..0000000000
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.trade.protocol.trade.tasks.seller;
-
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.bitcoinj.core.Coin;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SignPayoutTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SignPayoutTx.class);
-
-    public SignPayoutTx(TaskRunner taskHandler, Trade trade) {
-        super(taskHandler, trade);
-    }
-
-    @Override
-    protected void run() {
-        try {
-            runInterceptHook();
-            assert trade.getTradeAmount() != null;
-            assert trade.getSecurityDeposit() != null;
-            Coin sellerPayoutAmount = trade.getSecurityDeposit();
-            Coin buyerPayoutAmount = sellerPayoutAmount.add(trade.getTradeAmount());
-
-            long lockTime = processModel.getTradeWalletService().getLastBlockSeenHeight() + trade.getOffer().getFiatAccountType().lockTimeDelta;
-            log.debug("lockTime getLastBlockSeenHeight " + processModel.getTradeWalletService().getLastBlockSeenHeight());
-            trade.setLockTime(lockTime);
-
-            byte[] payoutTxSignature = processModel.getTradeWalletService().signPayoutTx(
-                    trade.getDepositTx(),
-                    buyerPayoutAmount,
-                    sellerPayoutAmount,
-                    processModel.tradingPeer.getPayoutAddressString(),
-                    processModel.getAddressEntry(),
-                    lockTime,
-                    processModel.tradingPeer.getTradeWalletPubKey(),
-                    processModel.getTradeWalletPubKey(),
-                    processModel.getArbitratorPubKey());
-
-            processModel.setPayoutTxSignature(payoutTxSignature);
-
-            complete();
-        } catch (Throwable t) {
-            failed(t);
-        }
-    }
-}
-
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java
index 4d4c119739..e98736ee58 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/CommitPayoutTx.java
@@ -18,14 +18,9 @@
 package io.bitsquare.trade.protocol.trade.tasks.shared;
 
 import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.BuyerTrade;
-import io.bitsquare.trade.SellerTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.bitcoinj.core.Transaction;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,14 +35,9 @@ public class CommitPayoutTx extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            Transaction transaction = processModel.getTradeWalletService().commitTx(trade.getPayoutTx());
-
+            Transaction transaction = processModel.getTradeWalletService().addTransactionToWallet(trade.getPayoutTx());
             trade.setPayoutTx(transaction);
-
-            if (trade instanceof BuyerTrade)
-                trade.setTradeState(TradeState.BuyerState.PAYOUT_TX_COMMITTED);
-            else if (trade instanceof SellerTrade)
-                trade.setTradeState(TradeState.SellerState.PAYOUT_TX_COMMITTED);
+            trade.setState(Trade.State.PAYOUT_TX_COMMITTED);
 
             complete();
         } catch (Throwable t) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java
index 681b99ec0c..42c0f390aa 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/SetupPayoutTxLockTimeReachedListener.java
@@ -17,27 +17,20 @@
 
 package io.bitsquare.trade.protocol.trade.tasks.shared;
 
-import io.bitsquare.common.taskrunner.TaskRunner;
-import io.bitsquare.trade.BuyerTrade;
-import io.bitsquare.trade.SellerTrade;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
-import org.bitcoinj.core.StoredBlock;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.utils.Threading;
-
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
-
-import java.util.concurrent.ExecutionException;
-
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.taskrunner.TaskRunner;
+import io.bitsquare.trade.Trade;
+import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
+import org.bitcoinj.core.StoredBlock;
+import org.bitcoinj.core.Transaction;
 import org.jetbrains.annotations.NotNull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.ExecutionException;
+
 public class SetupPayoutTxLockTimeReachedListener extends TradeTask {
     private static final Logger log = LoggerFactory.getLogger(SetupPayoutTxLockTimeReachedListener.class);
 
@@ -49,11 +42,10 @@ public class SetupPayoutTxLockTimeReachedListener extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            log.debug("ChainHeight/LockTime: {} / {}", processModel.getTradeWalletService().getBestChainHeight(), trade.getLockTime());
-            if (processModel.getTradeWalletService().getBestChainHeight() >= trade.getLockTime()) {
+            log.debug("ChainHeight/LockTime: {} / {}", processModel.getTradeWalletService().getBestChainHeight(), trade.getLockTimeAsBlockHeight());
+            if (processModel.getTradeWalletService().getBestChainHeight() >= trade.getLockTimeAsBlockHeight()) {
                 broadcastTx();
-            }
-            else {
+            } else {
                 ListenableFuture<StoredBlock> blockHeightFuture = processModel.getTradeWalletService().getBlockHeightFuture(trade.getPayoutTx());
                 blockHeightFuture.addListener(
                         () -> {
@@ -61,27 +53,23 @@ public class SetupPayoutTxLockTimeReachedListener extends TradeTask {
                                 log.debug("Block height reached " + blockHeightFuture.get().getHeight());
                             } catch (InterruptedException | ExecutionException e) {
                                 e.printStackTrace();
+                                Thread.currentThread().interrupt();
                             }
                             broadcastTx();
                         },
-                        Threading.USER_THREAD::execute);
+                        UserThread::execute);
             }
         } catch (Throwable t) {
             failed(t);
         }
     }
 
-    protected void broadcastTx() {
+    private void broadcastTx() {
         processModel.getTradeWalletService().broadcastTx(trade.getPayoutTx(), new FutureCallback<Transaction>() {
             @Override
             public void onSuccess(Transaction transaction) {
                 log.debug("BroadcastTx succeeded. Transaction:" + transaction);
-
-                if (trade instanceof BuyerTrade)
-                    trade.setTradeState(TradeState.BuyerState.PAYOUT_BROAD_CASTED);
-                else if (trade instanceof SellerTrade)
-                    trade.setTradeState(TradeState.SellerState.PAYOUT_BROAD_CASTED);
-
+                trade.setState(Trade.State.PAYOUT_BROAD_CASTED);
                 complete();
             }
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/BroadcastTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/BroadcastTakeOfferFeeTx.java
index ad6d06048a..7abd1d54d6 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/BroadcastTakeOfferFeeTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/BroadcastTakeOfferFeeTx.java
@@ -17,16 +17,12 @@
 
 package io.bitsquare.trade.protocol.trade.tasks.taker;
 
+import com.google.common.util.concurrent.FutureCallback;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.bitcoinj.core.Transaction;
-
-import com.google.common.util.concurrent.FutureCallback;
-
 import org.jetbrains.annotations.NotNull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,6 +43,7 @@ public class BroadcastTakeOfferFeeTx extends TradeTask {
                         public void onSuccess(Transaction transaction) {
                             log.debug("Take offer fee published successfully. Transaction ID = " + transaction.getHashAsString());
 
+                            trade.setState(Trade.State.TAKER_FEE_PAID);
                             complete();
                         }
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/CreateTakeOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/CreateTakeOfferFeeTx.java
index 95e4d117b0..7f59399202 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/CreateTakeOfferFeeTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/CreateTakeOfferFeeTx.java
@@ -17,12 +17,15 @@
 
 package io.bitsquare.trade.protocol.trade.tasks.taker;
 
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.common.taskrunner.TaskRunner;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.trade.Trade;
+import io.bitsquare.trade.protocol.trade.ArbitrationSelectionRule;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
+import io.bitsquare.user.User;
 import org.bitcoinj.core.Transaction;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,9 +40,19 @@ public class CreateTakeOfferFeeTx extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            Transaction createTakeOfferFeeTx = processModel.getTradeWalletService().createTakeOfferFeeTx(processModel.getAddressEntry());
+
+            User user = processModel.getUser();
+            Address selectedArbitratorAddress = ArbitrationSelectionRule.select(user.getAcceptedArbitratorAddresses(), processModel.getOffer());
+            log.debug("selectedArbitratorAddress " + selectedArbitratorAddress);
+            Arbitrator selectedArbitrator = user.getAcceptedArbitratorByAddress(selectedArbitratorAddress);
+            Transaction createTakeOfferFeeTx = processModel.getTradeWalletService().createTradingFeeTx(
+                    processModel.getAddressEntry(),
+                    FeePolicy.TAKE_OFFER_FEE,
+                    selectedArbitrator.getBtcAddress());
 
             processModel.setTakeOfferFeeTx(createTakeOfferFeeTx);
+
+            // TODO check if needed as we have stored tx already at setTakeOfferFeeTx
             processModel.setTakeOfferFeeTxId(createTakeOfferFeeTx.getHashAsString());
 
             complete();
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java
index b0f19471b9..6af5409d2e 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade.protocol.trade.tasks.taker;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +35,7 @@ public class VerifyOfferFeePayment extends TradeTask {
         try {
             runInterceptHook();
             //TODO impl. missing
-            int numOfPeersSeenTx = processModel.getWalletService().getNumOfPeersSeenTx(processModel.getTakeOfferFeeTx().getHashAsString());
+            // int numOfPeersSeenTx = processModel.getWalletService().getNumOfPeersSeenTx(processModel.getTakeOfferFeeTx().getHashAsString());
        /* if (numOfPeersSeenTx > 2) {
             resultHandler.handleResult();
         }*/
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java
index 9a3cf6ebe4..59874faf03 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java
@@ -20,7 +20,6 @@ package io.bitsquare.trade.protocol.trade.tasks.taker;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.tasks.TradeTask;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,18 +34,13 @@ public class VerifyOffererAccount extends TradeTask {
     protected void run() {
         try {
             runInterceptHook();
-            if (processModel.getBlockChainService().verifyAccountRegistration()) {
-                if (processModel.getBlockChainService().isAccountBlackListed(processModel.tradingPeer.getAccountId(),
-                        processModel.tradingPeer.getFiatAccount())) {
-                    failed("Taker is blacklisted.");
-                }
-                else {
-                    complete();
-                }
-            }
-            else {
-                failed("Account registration validation for peer faultHandler.onFault.");
+           /* if (processModel.getBlockChainService().isAccountBlackListed(processModel.tradingPeer.getAccountId(),
+                    processModel.tradingPeer.getPaymentAccountContractData())) {
+                failed("Taker is blacklisted.");
             }
+            else {*/
+            complete();
+            //  }
         } catch (Throwable t) {
             failed(t);
         }
diff --git a/core/src/main/java/io/bitsquare/user/AccountSettings.java b/core/src/main/java/io/bitsquare/user/AccountSettings.java
deleted file mode 100644
index 260224adbc..0000000000
--- a/core/src/main/java/io/bitsquare/user/AccountSettings.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.user;
-
-import io.bitsquare.app.Version;
-import io.bitsquare.arbitration.ArbitrationRepository;
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.CountryUtil;
-import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.storage.Storage;
-
-import org.bitcoinj.core.Coin;
-
-import java.io.Serializable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.OptionalLong;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
-public class AccountSettings implements Serializable {
-    // That object is saved to disc. We need to take care of changes to not break deserialization.
-    private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
-
-    final transient private Storage<AccountSettings> storage;
-
-    // Persisted fields
-    private List<String> acceptedLanguageLocaleCodes = new ArrayList<>();
-    private List<Country> acceptedCountryLocales = new ArrayList<>();
-    private List<Arbitrator> acceptedArbitrators = new ArrayList<>();
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public AccountSettings(Storage<AccountSettings> storage, ArbitrationRepository arbitrationRepository) {
-        this.storage = storage;
-
-        AccountSettings persisted = storage.initAndGetPersisted(this);
-        if (persisted != null) {
-            acceptedLanguageLocaleCodes = persisted.getAcceptedLanguageLocaleCodes();
-            acceptedCountryLocales = persisted.getAcceptedCountries();
-            acceptedArbitrators = persisted.getAcceptedArbitrators();
-        }
-        else {
-            acceptedLanguageLocaleCodes = Arrays.asList(LanguageUtil.getDefaultLanguageLocaleAsCode(), LanguageUtil.getEnglishLanguageLocaleCode());
-            acceptedCountryLocales = Arrays.asList(CountryUtil.getDefaultCountry());
-            acceptedArbitrators = Arrays.asList(arbitrationRepository.getDefaultArbitrator());
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Public API
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-
-    public void addAcceptedLanguageLocale(String localeCode) {
-        if (!acceptedLanguageLocaleCodes.contains(localeCode)) {
-            acceptedLanguageLocaleCodes.add(localeCode);
-            storage.queueUpForSave();
-        }
-    }
-
-    public void removeAcceptedLanguageLocale(String item) {
-        acceptedLanguageLocaleCodes.remove(item);
-    }
-
-    public void addAcceptedCountry(Country locale) {
-        if (!acceptedCountryLocales.contains(locale)) {
-            acceptedCountryLocales.add(locale);
-            storage.queueUpForSave();
-        }
-    }
-
-    public void removeAcceptedCountry(Country item) {
-        acceptedCountryLocales.remove(item);
-    }
-
-    public void addAcceptedArbitrator(Arbitrator arbitrator) {
-        if (!acceptedArbitrators.contains(arbitrator)) {
-            acceptedArbitrators.add(arbitrator);
-            storage.queueUpForSave();
-        }
-    }
-
-    public void removeAcceptedArbitrator(Arbitrator item) {
-        acceptedArbitrators.remove(item);
-        storage.queueUpForSave();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Getters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public List<Arbitrator> getAcceptedArbitrators() {
-        return acceptedArbitrators;
-    }
-
-    public List<String> getAcceptedArbitratorIds() {
-        return acceptedArbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
-    }
-
-    public List<String> getAcceptedLanguageLocaleCodes() {
-        return acceptedLanguageLocaleCodes;
-    }
-
-    public List<Country> getAcceptedCountries() {
-        return acceptedCountryLocales;
-    }
-
-    public Coin getSecurityDeposit() {
-        OptionalLong result = acceptedArbitrators.stream().mapToLong(e -> e.getFee().getValue()).max();
-        return result.isPresent() ? Coin.valueOf(result.getAsLong()) : Coin.ZERO;
-    }
-
-}
diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java
index 0f9a4c8dfe..a7e72797a0 100644
--- a/core/src/main/java/io/bitsquare/user/Preferences.java
+++ b/core/src/main/java/io/bitsquare/user/Preferences.java
@@ -20,25 +20,24 @@ package io.bitsquare.user;
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.app.Version;
 import io.bitsquare.btc.BitcoinNetwork;
+import io.bitsquare.locale.CurrencyUtil;
+import io.bitsquare.locale.TradeCurrency;
 import io.bitsquare.storage.Storage;
-
-import org.bitcoinj.utils.MonetaryFormat;
-
-import java.io.Serializable;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.inject.Inject;
-
+import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import org.bitcoinj.utils.MonetaryFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import java.io.Serializable;
+import java.util.*;
+
 public class Preferences implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
@@ -47,27 +46,58 @@ public class Preferences implements Serializable {
 
     // Deactivate mBit for now as most screens are not supporting it yet
     transient private static final List<String> BTC_DENOMINATIONS = Arrays.asList(MonetaryFormat.CODE_BTC/*, MonetaryFormat.CODE_MBTC*/);
+    transient static final private ArrayList<BlockChainExplorer> blockChainExplorersTestNet = new ArrayList<>(Arrays.asList(
+            new BlockChainExplorer("Blocktrail", "https://www.blocktrail.com/tBTC/tx/", "https://www.blocktrail.com/tBTC/address/"),
+            new BlockChainExplorer("Blockr.io", "https://tbtc.blockr.io/tx/info/", "https://tbtc.blockr.io/address/info/"),
+            new BlockChainExplorer("Web BTC", "http://test.webbtc.com/tx/", "http://test.webbtc.com/address/"),
+            new BlockChainExplorer("Blockexplorer", "https://blockexplorer.com/testnet/tx/", "https://blockexplorer.com/testnet/address/"),
+            new BlockChainExplorer("Biteasy", "https://www.biteasy.com/testnet/transactions/", "https://www.biteasy.com/testnet/addresses/")
+    ));
+
+    transient static final private ArrayList<BlockChainExplorer> blockChainExplorersMainNet = new ArrayList<>(Arrays.asList(
+            new BlockChainExplorer("Blockchain.info", "https://blockchain.info/tx/", "https://blockchain.info/address/"),
+            new BlockChainExplorer("Blocktrail", "https://www.blocktrail.com/BTC/tx/", "https://www.blocktrail.com/BTC/address/"),
+            new BlockChainExplorer("Blockr.io", "https://btc.blockr.io/tx/info/", "https://btc.blockr.io/address/info/"),
+            new BlockChainExplorer("Web BTC", "http://webbtc.com/tx/", "http://webbtc.com/address/"),
+            new BlockChainExplorer("Blockexplorer", "https://blockexplorer.com/tx/", "https://blockexplorer.com/address/"),
+            new BlockChainExplorer("Biteasy", "https://www.biteasy.com/transactions/", "https://www.biteasy.com/addresses/")
+    ));
 
     public static List<String> getBtcDenominations() {
         return BTC_DENOMINATIONS;
     }
 
+    public static Locale getDefaultLocale() {
+        //return new Locale("EN", "US");
+        return Locale.getDefault();
+    }
+
     transient private final Storage<Preferences> storage;
     transient private final BitsquareEnvironment bitsquareEnvironment;
 
+    transient private BitcoinNetwork bitcoinNetwork;
+
     // Persisted fields
     private String btcDenomination = MonetaryFormat.CODE_BTC;
-
     private boolean useAnimations = true;
     private boolean useEffects = true;
     private boolean displaySecurityDepositInfo = true;
     private boolean useUPnP = true;
-    transient private BitcoinNetwork bitcoinNetwork;
+    private ArrayList<TradeCurrency> tradeCurrencies;
+    private BlockChainExplorer blockChainExplorerMainNet;
+    private BlockChainExplorer blockChainExplorerTestNet;
+    private boolean showPlaceOfferConfirmation;
+    private boolean showTakeOfferConfirmation;
+    private String backupDirectory;
+    private boolean autoSelectArbitrators = true;
+    private Map<String, Boolean> showAgainMap;
+    private boolean tacAccepted;
 
     // Observable wrappers
     transient private final StringProperty btcDenominationProperty = new SimpleStringProperty(btcDenomination);
     transient private final BooleanProperty useAnimationsProperty = new SimpleBooleanProperty(useAnimations);
     transient private final BooleanProperty useEffectsProperty = new SimpleBooleanProperty(useEffects);
+    transient private final ObservableList<TradeCurrency> tradeCurrenciesAsObservable = FXCollections.observableArrayList();
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -76,6 +106,7 @@ public class Preferences implements Serializable {
 
     @Inject
     public Preferences(Storage<Preferences> storage, BitsquareEnvironment bitsquareEnvironment) {
+        log.debug("Preferences " + this);
         this.storage = storage;
         this.bitsquareEnvironment = bitsquareEnvironment;
 
@@ -85,9 +116,40 @@ public class Preferences implements Serializable {
             setUseAnimations(persisted.useAnimations);
             setUseEffects(persisted.useEffects);
             setUseUPnP(persisted.useUPnP);
+            setTradeCurrencies(persisted.tradeCurrencies);
+            tradeCurrencies = new ArrayList<>(tradeCurrenciesAsObservable);
             displaySecurityDepositInfo = persisted.getDisplaySecurityDepositInfo();
+
+            setBlockChainExplorerTestNet(persisted.getBlockChainExplorerTestNet());
+            setBlockChainExplorerMainNet(persisted.getBlockChainExplorerMainNet());
+            // In case of an older version without that data we set it to defaults
+            if (blockChainExplorerTestNet == null)
+                setBlockChainExplorerTestNet(blockChainExplorersTestNet.get(0));
+            if (blockChainExplorerMainNet == null)
+                setBlockChainExplorerTestNet(blockChainExplorersMainNet.get(0));
+
+            showPlaceOfferConfirmation = persisted.getShowPlaceOfferConfirmation();
+            showTakeOfferConfirmation = persisted.getShowTakeOfferConfirmation();
+            backupDirectory = persisted.getBackupDirectory();
+            autoSelectArbitrators = persisted.getAutoSelectArbitrators();
+            showAgainMap = persisted.getShowAgainMap();
+            tacAccepted = persisted.getTacAccepted();
+        } else {
+            setTradeCurrencies(CurrencyUtil.getAllSortedCurrencies());
+            tradeCurrencies = new ArrayList<>(tradeCurrenciesAsObservable);
+            setBlockChainExplorerTestNet(blockChainExplorersTestNet.get(0));
+            setBlockChainExplorerMainNet(blockChainExplorersMainNet.get(0));
+            showPlaceOfferConfirmation = true;
+            showTakeOfferConfirmation = true;
+
+            showAgainMap = new HashMap<>();
+            showAgainMap.put(PopupId.SEC_DEPOSIT, true);
+            showAgainMap.put(PopupId.TRADE_WALLET, true);
+
+            storage.queueUpForSave();
         }
 
+
         this.bitcoinNetwork = bitsquareEnvironment.getBitcoinNetwork();
 
         // Use that to guarantee update of the serializable field and to make a storage update in case of a change
@@ -103,6 +165,16 @@ public class Preferences implements Serializable {
             useEffects = useEffectsProperty.get();
             storage.queueUpForSave();
         });
+        tradeCurrenciesAsObservable.addListener((Observable ov) -> {
+            tradeCurrencies.clear();
+            tradeCurrencies.addAll(tradeCurrenciesAsObservable);
+            storage.queueUpForSave();
+        });
+    }
+
+    public void dontShowAgain(String id) {
+        showAgainMap.put(id, false);
+        storage.queueUpForSave();
     }
 
 
@@ -137,8 +209,44 @@ public class Preferences implements Serializable {
             bitsquareEnvironment.saveBitcoinNetwork(bitcoinNetwork);
 
         this.bitcoinNetwork = bitcoinNetwork;
+        storage.queueUpForSave();
     }
 
+    private void setTradeCurrencies(List<TradeCurrency> tradeCurrencies) {
+        tradeCurrenciesAsObservable.setAll(tradeCurrencies);
+    }
+
+    private void setBlockChainExplorerTestNet(BlockChainExplorer blockChainExplorerTestNet) {
+        this.blockChainExplorerTestNet = blockChainExplorerTestNet;
+        storage.queueUpForSave();
+    }
+
+    private void setBlockChainExplorerMainNet(BlockChainExplorer blockChainExplorerMainNet) {
+        this.blockChainExplorerMainNet = blockChainExplorerMainNet;
+        storage.queueUpForSave();
+    }
+
+    public void setBlockChainExplorer(BlockChainExplorer blockChainExplorer) {
+        if (bitcoinNetwork == BitcoinNetwork.MAINNET)
+            setBlockChainExplorerMainNet(blockChainExplorer);
+        else
+            setBlockChainExplorerTestNet(blockChainExplorer);
+    }
+
+    public void setShowPlaceOfferConfirmation(boolean showPlaceOfferConfirmation) {
+        this.showPlaceOfferConfirmation = showPlaceOfferConfirmation;
+        storage.queueUpForSave();
+    }
+
+    public void setShowTakeOfferConfirmation(boolean showTakeOfferConfirmation) {
+        this.showTakeOfferConfirmation = showTakeOfferConfirmation;
+        storage.queueUpForSave();
+    }
+
+    public void setTacAccepted(boolean tacAccepted) {
+        this.tacAccepted = tacAccepted;
+        storage.queueUpForSave();
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getter
@@ -179,4 +287,65 @@ public class Preferences implements Serializable {
     public BitcoinNetwork getBitcoinNetwork() {
         return bitcoinNetwork;
     }
+
+    public ObservableList<TradeCurrency> getTradeCurrenciesAsObservable() {
+        return tradeCurrenciesAsObservable;
+    }
+
+    private BlockChainExplorer getBlockChainExplorerTestNet() {
+        return blockChainExplorerTestNet;
+    }
+
+    private BlockChainExplorer getBlockChainExplorerMainNet() {
+        return blockChainExplorerMainNet;
+    }
+
+    public BlockChainExplorer getBlockChainExplorer() {
+        if (bitcoinNetwork == BitcoinNetwork.MAINNET)
+            return blockChainExplorerMainNet;
+        else
+            return blockChainExplorerTestNet;
+    }
+
+    public ArrayList<BlockChainExplorer> getBlockChainExplorers() {
+        if (bitcoinNetwork == BitcoinNetwork.MAINNET)
+            return blockChainExplorersMainNet;
+        else
+            return blockChainExplorersTestNet;
+    }
+
+    public boolean getShowPlaceOfferConfirmation() {
+        return showPlaceOfferConfirmation;
+    }
+
+
+    public boolean getShowTakeOfferConfirmation() {
+        return showTakeOfferConfirmation;
+    }
+
+    public String getBackupDirectory() {
+        return backupDirectory;
+    }
+
+    public void setBackupDirectory(String backupDirectory) {
+        this.backupDirectory = backupDirectory;
+        storage.queueUpForSave();
+    }
+
+    public void setAutoSelectArbitrators(boolean autoSelectArbitrators) {
+        this.autoSelectArbitrators = autoSelectArbitrators;
+        storage.queueUpForSave();
+    }
+
+    public boolean getAutoSelectArbitrators() {
+        return autoSelectArbitrators;
+    }
+
+    public Map<String, Boolean> getShowAgainMap() {
+        return showAgainMap;
+    }
+
+    public boolean getTacAccepted() {
+        return tacAccepted;
+    }
 }
diff --git a/core/src/main/java/io/bitsquare/user/User.java b/core/src/main/java/io/bitsquare/user/User.java
index 29a3dd9c3a..9197c6fbb5 100644
--- a/core/src/main/java/io/bitsquare/user/User.java
+++ b/core/src/main/java/io/bitsquare/user/User.java
@@ -17,32 +17,33 @@
 
 package io.bitsquare.user;
 
+import io.bitsquare.alert.Alert;
 import io.bitsquare.app.Version;
-import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.locale.LanguageUtil;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.payment.PaymentAccount;
 import io.bitsquare.storage.Storage;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import java.security.NoSuchAlgorithmException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import javax.inject.Inject;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-
+import javafx.collections.ObservableSet;
+import javafx.collections.SetChangeListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
 /**
  * The User is persisted locally.
  * It must never be transmitted over the wire (messageKeyPair contains private key!).
@@ -55,41 +56,71 @@ public class User implements Serializable {
 
     // Transient immutable fields
     transient final private Storage<User> storage;
+    transient private Set<TradeCurrency> tradeCurrenciesInPaymentAccounts;
 
     // Persisted fields
     private String accountID;
-    private List<FiatAccount> fiatAccounts = new ArrayList<>();
+    private Set<PaymentAccount> paymentAccounts = new HashSet<>();
+    private PaymentAccount currentPaymentAccount;
+    private List<String> acceptedLanguageLocaleCodes = new ArrayList<>();
+    private Alert developersAlert;
+    private Alert displayedAlert;
 
-    private FiatAccount currentFiatAccount;
+
+    @Nullable
+    private List<Arbitrator> acceptedArbitrators = new ArrayList<>();
+    @Nullable
+    private Arbitrator registeredArbitrator;
 
     // Observable wrappers
-    transient final private ObservableList<FiatAccount> fiatAccountsObservableList = FXCollections.observableArrayList(fiatAccounts);
-    transient final private ObjectProperty<FiatAccount> currentFiatAccountProperty = new SimpleObjectProperty<>(currentFiatAccount);
+    transient final private ObservableSet<PaymentAccount> paymentAccountsAsObservable = FXCollections.observableSet(paymentAccounts);
+    transient final private ObjectProperty<PaymentAccount> currentPaymentAccountProperty = new SimpleObjectProperty<>(currentPaymentAccount);
+
 
     @Inject
-    public User(Storage<User> storage) throws NoSuchAlgorithmException {
+    public User(Storage<User> storage, KeyRing keyRing) throws NoSuchAlgorithmException {
         this.storage = storage;
 
         User persisted = storage.initAndGetPersisted(this);
         if (persisted != null) {
             accountID = persisted.getAccountId();
 
-            fiatAccounts = new ArrayList<>(persisted.getFiatAccounts());
-            fiatAccountsObservableList.setAll(fiatAccounts);
+            // The check is only needed to not break old versions where paymentAccounts was not included and is null,
+            // Can be removed later
+            if (persisted.getPaymentAccounts() != null)
+                paymentAccounts = new HashSet<>(persisted.getPaymentAccounts());
 
-            currentFiatAccount = persisted.getCurrentFiatAccount();
-            currentFiatAccountProperty.set(currentFiatAccount);
+            paymentAccountsAsObservable.addAll(paymentAccounts);
+
+            currentPaymentAccount = persisted.getCurrentPaymentAccount();
+            currentPaymentAccountProperty.set(currentPaymentAccount);
+
+            acceptedLanguageLocaleCodes = persisted.getAcceptedLanguageLocaleCodes();
+            acceptedArbitrators = persisted.getAcceptedArbitrators();
+            registeredArbitrator = persisted.getRegisteredArbitrator();
+            developersAlert = persisted.getDevelopersAlert();
+            displayedAlert = persisted.getDisplayedAlert();
+        } else {
+            accountID = String.valueOf(Math.abs(keyRing.getPubKeyRing().hashCode()));
+
+            acceptedLanguageLocaleCodes = new ArrayList<>(Arrays.asList(LanguageUtil.getDefaultLanguageLocaleAsCode(),
+                    LanguageUtil.getEnglishLanguageLocaleCode()));
+            acceptedArbitrators = new ArrayList<>();
         }
         storage.queueUpForSave();
+
         // Use that to guarantee update of the serializable field and to make a storage update in case of a change
-        fiatAccountsObservableList.addListener((ListChangeListener<FiatAccount>) change -> {
-            fiatAccounts = new ArrayList<>(fiatAccountsObservableList);
+        paymentAccountsAsObservable.addListener((SetChangeListener<PaymentAccount>) change -> {
+            paymentAccounts = new HashSet<>(paymentAccountsAsObservable);
+            tradeCurrenciesInPaymentAccounts = paymentAccounts.stream().flatMap(e -> e.getTradeCurrencies().stream()).collect(Collectors.toSet());
             storage.queueUpForSave();
         });
-        currentFiatAccountProperty.addListener((ov) -> {
-            currentFiatAccount = currentFiatAccountProperty.get();
+        currentPaymentAccountProperty.addListener((ov) -> {
+            currentPaymentAccount = currentPaymentAccountProperty.get();
             storage.queueUpForSave();
         });
+
+        tradeCurrenciesInPaymentAccounts = paymentAccounts.stream().flatMap(e -> e.getTradeCurrencies().stream()).collect(Collectors.toSet());
     }
 
     // for unit tests
@@ -99,8 +130,11 @@ public class User implements Serializable {
 
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-        log.trace("Created from serialized form.");
+        try {
+            in.defaultReadObject();
+        } catch (Throwable t) {
+            log.trace("Cannot be deserialized." + t.getMessage());
+        }
     }
 
 
@@ -108,45 +142,56 @@ public class User implements Serializable {
     // Public Methods
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    /**
-     * @param fiatAccount
-     * @return If a Fiat Account with the same name already exists we return false. We use the account title as hashCode.
-     */
-    public boolean addFiatAccount(FiatAccount fiatAccount) {
-        if (fiatAccountsObservableList.contains(fiatAccount))
-            return false;
-
-        fiatAccountsObservableList.add(fiatAccount);
-        setCurrentFiatAccountProperty(fiatAccount);
-        return true;
+    public void addPaymentAccount(PaymentAccount paymentAccount) {
+        paymentAccountsAsObservable.add(paymentAccount);
+        setCurrentPaymentAccount(paymentAccount);
     }
 
-    // In case we edit an existing we remove the existing first
-    public void removeFiatAccount(FiatAccount fiatAccount) {
-        fiatAccountsObservableList.remove(fiatAccount);
+    public void removePaymentAccount(PaymentAccount paymentAccount) {
+        paymentAccountsAsObservable.remove(paymentAccount);
+    }
 
-        if (currentFiatAccount.equals(fiatAccount)) {
-            if (fiatAccountsObservableList.isEmpty())
-                setCurrentFiatAccountProperty(null);
-            else
-                setCurrentFiatAccountProperty(fiatAccountsObservableList.get(0));
+    public void setCurrentPaymentAccount(PaymentAccount paymentAccount) {
+        currentPaymentAccountProperty.set(paymentAccount);
+    }
+
+    public boolean addAcceptedLanguageLocale(String localeCode) {
+        if (!acceptedLanguageLocaleCodes.contains(localeCode)) {
+            boolean changed = acceptedLanguageLocaleCodes.add(localeCode);
+            if (changed)
+                storage.queueUpForSave();
+            return changed;
+        } else {
+            return false;
         }
     }
 
+    public boolean removeAcceptedLanguageLocale(String languageLocaleCode) {
+        boolean changed = acceptedLanguageLocaleCodes.remove(languageLocaleCode);
+        if (changed)
+            storage.queueUpForSave();
+        return changed;
+    }
 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
+    public void addAcceptedArbitrator(Arbitrator arbitrator) {
+        if (!acceptedArbitrators.contains(arbitrator) && !isMyOwnRegisteredArbitrator(arbitrator)) {
+            acceptedArbitrators.add(arbitrator);
+            storage.queueUpForSave();
+        }
+    }
 
-    // Will be written after registration.
-    // Public key from the input for the registration payment tx (or address) will be used
-    public void setAccountID(String accountID) {
-        this.accountID = accountID;
+    public boolean isMyOwnRegisteredArbitrator(Arbitrator arbitrator) {
+        return arbitrator.equals(registeredArbitrator);
+    }
+
+    public void removeAcceptedArbitrator(Arbitrator arbitrator) {
+        acceptedArbitrators.remove(arbitrator);
         storage.queueUpForSave();
     }
 
-    public void setCurrentFiatAccountProperty(@Nullable FiatAccount fiatAccount) {
-        currentFiatAccountProperty.set(fiatAccount);
+    public void setRegisteredArbitrator(Arbitrator arbitrator) {
+        this.registeredArbitrator = arbitrator;
+        storage.queueUpForSave();
     }
 
 
@@ -156,49 +201,132 @@ public class User implements Serializable {
 
     // TODO just a first attempt, refine when working on the embedded data for the reg. tx
     public String getStringifiedBankAccounts() {
-        String bankAccountUIDs = "";
-        for (int i = 0; i < fiatAccountsObservableList.size(); i++) {
-            FiatAccount fiatAccount = fiatAccountsObservableList.get(i);
-            bankAccountUIDs += fiatAccount.toString();
-
-            if (i < fiatAccountsObservableList.size() - 1) {
-                bankAccountUIDs += ", ";
-            }
-        }
-        return bankAccountUIDs;
+        return paymentAccounts.stream()
+                .map(PaymentAccount::getId)
+                .collect(Collectors.joining(", "));
     }
 
 
-    public FiatAccount getFiatAccount(String fiatAccountId) {
-        for (FiatAccount fiatAccount : fiatAccountsObservableList) {
-            if (fiatAccount.id.equals(fiatAccountId)) {
-                return fiatAccount;
-            }
-        }
-        return null;
+    public PaymentAccount getPaymentAccount(String paymentAccountId) {
+        Optional<PaymentAccount> optional = paymentAccounts.stream().filter(e -> e.getId().equals(paymentAccountId)).findAny();
+        if (optional.isPresent())
+            return optional.get();
+        else
+            return null;
     }
 
     public String getAccountId() {
         return accountID;
     }
 
-    public boolean isRegistered() {
+   /* public boolean isRegistered() {
         return getAccountId() != null;
+    }*/
+
+    private PaymentAccount getCurrentPaymentAccount() {
+        return currentPaymentAccount;
     }
 
-    private List<FiatAccount> getFiatAccounts() {
-        return fiatAccounts;
+    public ObjectProperty<PaymentAccount> currentPaymentAccountProperty() {
+        return currentPaymentAccountProperty;
     }
 
-    private FiatAccount getCurrentFiatAccount() {
-        return currentFiatAccount;
+    public Set<PaymentAccount> getPaymentAccounts() {
+        return paymentAccounts;
     }
 
-    public ObjectProperty<FiatAccount> currentFiatAccountProperty() {
-        return currentFiatAccountProperty;
+    public ObservableSet<PaymentAccount> getPaymentAccountsAsObservable() {
+        return paymentAccountsAsObservable;
     }
 
-    public ObservableList<FiatAccount> fiatAccountsObservableList() {
-        return fiatAccountsObservableList;
+    @Nullable
+    public Arbitrator getRegisteredArbitrator() {
+        return registeredArbitrator;
     }
+
+    @Nullable
+    public List<Arbitrator> getAcceptedArbitrators() {
+        return acceptedArbitrators;
+    }
+
+    public List<Address> getAcceptedArbitratorAddresses() {
+        return acceptedArbitrators.stream().map(Arbitrator::getArbitratorAddress).collect(Collectors.toList());
+    }
+
+    public List<String> getAcceptedLanguageLocaleCodes() {
+        return acceptedLanguageLocaleCodes;
+    }
+
+ /*   public List<String> getArbitratorAddresses(List<String> idList) {
+        List<String> receiverAddresses = new ArrayList<>();
+        for (Arbitrator arbitrator : getAcceptedArbitrators()) {
+            for (String id : idList) {
+                if (id.equals(arbitrator.getId()))
+                    receiverAddresses.add(arbitrator.getBtcAddress());
+            }
+        }
+        return receiverAddresses;
+    }*/
+
+    public Arbitrator getAcceptedArbitratorByAddress(Address address) {
+        return acceptedArbitrators.stream().filter(e -> e.getArbitratorAddress().equals(address)).findFirst().get();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Utils
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+  /*  public Optional<TradeCurrency> getPaymentAccountForCurrency(TradeCurrency tradeCurrency) {
+        return getPaymentAccounts().stream()
+                .flatMap(e -> e.getTradeCurrencies().stream())
+                .filter(e -> e.equals(tradeCurrency))
+                .findFirst();
+    }*/
+
+    @Nullable
+    public PaymentAccount findFirstPaymentAccountWithCurrency(TradeCurrency tradeCurrency) {
+        for (PaymentAccount paymentAccount : paymentAccounts) {
+            for (TradeCurrency tradeCurrency1 : paymentAccount.getTradeCurrencies()) {
+                if (tradeCurrency1.equals(tradeCurrency))
+                    return paymentAccount;
+            }
+        }
+        return null;
+    }
+
+    public boolean hasMatchingLanguage(Arbitrator arbitrator) {
+        if (arbitrator != null) {
+            for (String acceptedCode : acceptedLanguageLocaleCodes) {
+                for (String itemCode : arbitrator.getLanguageCodes()) {
+                    if (acceptedCode.equals(itemCode))
+                        return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public boolean hasPaymentAccountForCurrency(TradeCurrency tradeCurrency) {
+        return findFirstPaymentAccountWithCurrency(tradeCurrency) != null;
+    }
+
+    public void setDevelopersAlert(Alert developersAlert) {
+        this.developersAlert = developersAlert;
+        storage.queueUpForSave();
+    }
+
+    public Alert getDevelopersAlert() {
+        return developersAlert;
+    }
+
+    public void setDisplayedAlert(Alert displayedAlert) {
+        this.displayedAlert = displayedAlert;
+        storage.queueUpForSave();
+    }
+
+    public Alert getDisplayedAlert() {
+        return displayedAlert;
+    }
+
 }
diff --git a/core/src/main/java/io/bitsquare/util/Validator.java b/core/src/main/java/io/bitsquare/util/Validator.java
index f061afbe09..af24aa455f 100644
--- a/core/src/main/java/io/bitsquare/util/Validator.java
+++ b/core/src/main/java/io/bitsquare/util/Validator.java
@@ -18,10 +18,10 @@
 package io.bitsquare.util;
 
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-
 import org.bitcoinj.core.Coin;
 
-import static com.google.common.base.Preconditions.*;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Utility class for validating domain data.
diff --git a/core/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java b/core/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java
index 847e734d5b..a5b2e4b398 100644
--- a/core/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java
+++ b/core/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java
@@ -20,11 +20,10 @@ package io.bitsquare.util.joptsimple;
 import com.google.common.base.Enums;
 import com.google.common.base.Optional;
 import com.google.common.collect.Sets;
+import joptsimple.ValueConverter;
 
 import java.util.Set;
 
-import joptsimple.ValueConverter;
-
 import static org.springframework.util.StringUtils.collectionToDelimitedString;
 
 /**
diff --git a/core/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java b/core/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java
index af4437bffe..8a8d5a0218 100644
--- a/core/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java
+++ b/core/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java
@@ -17,12 +17,12 @@
 
 package io.bitsquare.util.spring;
 
+import joptsimple.OptionSet;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import joptsimple.OptionSet;
-
 /**
  * Customizes {@link io.bitsquare.util.spring.JOptCommandLinePropertySource#getOptionValues(String)}
  * to allow for proper use of {@link joptsimple.ArgumentAcceptingOptionSpec#ofType(Class)}.
diff --git a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java
index 7c07479bfa..1a03d8ca9c 100644
--- a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java
+++ b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/CpuUsageGauge.java
@@ -1,16 +1,16 @@
 /**
  * Copyright (C) 2014 Open WhisperSystems
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -18,6 +18,7 @@ package org.whispersystems.textsecuregcm.metrics;
 
 import com.codahale.metrics.Gauge;
 import com.sun.management.OperatingSystemMXBean;
+
 import java.lang.management.ManagementFactory;
 
 public class CpuUsageGauge implements Gauge<Integer> {
diff --git a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java
index f9fa5bcda5..a77246afce 100644
--- a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java
+++ b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/FreeMemoryGauge.java
@@ -1,16 +1,16 @@
 /**
  * Copyright (C) 2014 Open WhisperSystems
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -19,6 +19,7 @@ package org.whispersystems.textsecuregcm.metrics;
 
 import com.codahale.metrics.Gauge;
 import com.sun.management.OperatingSystemMXBean;
+
 import java.lang.management.ManagementFactory;
 
 public class FreeMemoryGauge implements Gauge<Long> {
diff --git a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkGauge.java b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkGauge.java
index 6538083eec..e2bb788f14 100644
--- a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkGauge.java
+++ b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkGauge.java
@@ -1,16 +1,16 @@
 /**
  * Copyright (C) 2014 Open WhisperSystems
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -18,14 +18,14 @@
 package org.whispersystems.textsecuregcm.metrics;
 
 
+import com.codahale.metrics.Gauge;
+import org.whispersystems.textsecuregcm.util.Pair;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 
-import com.codahale.metrics.Gauge;
-import org.whispersystems.textsecuregcm.util.Pair;
-
 public abstract class NetworkGauge implements Gauge<Long> {
 
     protected Pair<Long, Long> getSentReceived() throws IOException {
diff --git a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkReceivedGauge.java b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkReceivedGauge.java
index 84298c18ce..bc7d474689 100644
--- a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkReceivedGauge.java
+++ b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkReceivedGauge.java
@@ -1,29 +1,28 @@
 /**
  * Copyright (C) 2014 Open WhisperSystems
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.whispersystems.textsecuregcm.metrics;
 
 
-import java.io.IOException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.whispersystems.textsecuregcm.util.Pair;
 
+import java.io.IOException;
+
 
 public class NetworkReceivedGauge extends NetworkGauge {
 
diff --git a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkSentGauge.java b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkSentGauge.java
index 7c80e0b4c7..9f4e0823e9 100644
--- a/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkSentGauge.java
+++ b/core/src/main/java/org/whispersystems/textsecuregcm/metrics/NetworkSentGauge.java
@@ -1,29 +1,28 @@
 /**
  * Copyright (C) 2014 Open WhisperSystems
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.whispersystems.textsecuregcm.metrics;
 
 
-import java.io.IOException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.whispersystems.textsecuregcm.util.Pair;
 
+import java.io.IOException;
+
 
 public class NetworkSentGauge extends NetworkGauge {
 
diff --git a/core/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java b/core/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java
index 47971f4224..77dbbd326b 100644
--- a/core/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java
+++ b/core/src/main/java/org/whispersystems/textsecuregcm/util/Pair.java
@@ -1,16 +1,16 @@
 /**
  * Copyright (C) 2014 Open WhisperSystems
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * This program 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.
- * <p/>
+ * <p>
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
diff --git a/core/src/test/java/io/bitsquare/btc/RestrictionsTest.java b/core/src/test/java/io/bitsquare/btc/RestrictionsTest.java
index e08c7b3540..1ebfb62889 100644
--- a/core/src/test/java/io/bitsquare/btc/RestrictionsTest.java
+++ b/core/src/test/java/io/bitsquare/btc/RestrictionsTest.java
@@ -19,10 +19,10 @@ package io.bitsquare.btc;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
-
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class RestrictionsTest {
     @Test
diff --git a/core/src/test/java/io/bitsquare/p2p/NodeTests.java b/core/src/test/java/io/bitsquare/p2p/NodeTests.java
deleted file mode 100644
index 806d92e5ac..0000000000
--- a/core/src/test/java/io/bitsquare/p2p/NodeTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.p2p;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
-public class NodeTests {
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Node node1a = Node.rawNodeAt("bitsquare1.example.com", "203.0.113.1");
-        Node node1b = Node.rawNodeAt("bitsquare1.example.com", "203.0.113.1");
-
-        assertThat(node1a, equalTo(node1a));
-
-        assertThat(node1a, equalTo(node1b));
-        assertThat(node1b, equalTo(node1a));
-
-        assertThat(node1a, not((Object) equalTo(null)));
-        assertThat(node1a, not((Object) equalTo("not a node")));
-
-        assertThat(node1a, not(equalTo(Node.rawNodeAt("bitsquare2.example.com", node1a.getIp()))));
-        assertThat(node1a, not(equalTo(Node.rawNodeAt(node1a.getName(), "203.0.113.2"))));
-
-        Node node2 = Node.rawNodeAt("bitsquare2.example.com", "203.0.113.2");
-        assertThat(node1a.hashCode(), equalTo(node1b.hashCode()));
-        assertThat(node1a.hashCode(), not(equalTo(node2.hashCode())));
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/io/bitsquare/p2p/TomP2PTests.java b/core/src/test/java/io/bitsquare/p2p/TomP2PTests.java
deleted file mode 100644
index e69f284a16..0000000000
--- a/core/src/test/java/io/bitsquare/p2p/TomP2PTests.java
+++ /dev/null
@@ -1,766 +0,0 @@
-/*
- * 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.p2p;
-
-import io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder;
-import io.bitsquare.util.Repeat;
-import io.bitsquare.util.RepeatRule;
-
-import java.io.IOException;
-
-import java.net.UnknownHostException;
-
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import net.tomp2p.connection.Bindings;
-import net.tomp2p.connection.StandardProtocolFamily;
-import net.tomp2p.dht.FutureGet;
-import net.tomp2p.dht.FuturePut;
-import net.tomp2p.dht.FutureRemove;
-import net.tomp2p.dht.PeerBuilderDHT;
-import net.tomp2p.dht.PeerDHT;
-import net.tomp2p.futures.BaseFuture;
-import net.tomp2p.futures.BaseFutureListener;
-import net.tomp2p.futures.FutureBootstrap;
-import net.tomp2p.futures.FutureDirect;
-import net.tomp2p.futures.FutureDiscover;
-import net.tomp2p.futures.FuturePeerConnection;
-import net.tomp2p.nat.FutureNAT;
-import net.tomp2p.nat.FutureRelayNAT;
-import net.tomp2p.nat.PeerBuilderNAT;
-import net.tomp2p.nat.PeerNAT;
-import net.tomp2p.p2p.Peer;
-import net.tomp2p.p2p.PeerBuilder;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.PeerAddress;
-import net.tomp2p.peers.PeerMap;
-import net.tomp2p.peers.PeerMapConfiguration;
-import net.tomp2p.relay.tcp.TCPRelayClientConfig;
-import net.tomp2p.storage.Data;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.*;
-
-/**
- * Test bootstrapping, DHT operations like put/get/add/remove and sendDirect in both LAN and WAN environment
- * Test scenarios in direct connection, auto port forwarding or relay mode.
- * <p>
- * To start a bootstrap node use the {@link io.bitsquare.app.bootstrap.BootstrapNode} class.
- * <p>
- * To configure your test environment edit the static fields for id, IP and port.
- * In the configure method and the connectionType you can define your test scenario.
- */
-@Ignore
-public class TomP2PTests {
-    private static final Logger log = LoggerFactory.getLogger(TomP2PTests.class);
-
-    // If you want to test in one specific connection mode define it directly, otherwise use UNKNOWN
-    private static final BootstrappedPeerBuilder.ConnectionType FORCED_CONNECTION_TYPE = BootstrappedPeerBuilder.ConnectionType.RELAY;
-
-    // Typically you run the bootstrap node in localhost to test direct connection.
-    // If you have a setup where you are not behind a router you can also use a WAN bootstrap node.
-    private static final Node BOOTSTRAP_NODE;
-
-    private static final PeerAddress BOOTSTRAP_NODE_ADDRESS;
-
-    private static final BootstrapNodes bootstrapNodes;
-
-    static {
-        int p2pId = 1;
-        bootstrapNodes = new BootstrapNodes();
-        if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.DIRECT) {
-            bootstrapNodes.initWithNetworkId(p2pId);
-            BOOTSTRAP_NODE = bootstrapNodes.getLocalhostNode();
-        }
-        else {
-            BOOTSTRAP_NODE = Node.at("digitalocean1.dev.bitsquare.io", "188.226.179.109", p2pId, 7367);
-        }
-
-        try {
-            BOOTSTRAP_NODE_ADDRESS = new PeerAddress(
-                    Number160.createHash(BOOTSTRAP_NODE.getName()),
-                    BOOTSTRAP_NODE.getIp(), BOOTSTRAP_NODE.getPort(), BOOTSTRAP_NODE.getPort());
-        } catch (UnknownHostException ex) {
-            throw new RuntimeException(BOOTSTRAP_NODE.toString(), ex);
-        }
-    }
-
-    // Use to stress tests by repeating them
-    private static final int STRESS_TEST_COUNT = 1;
-
-    private Peer peer;
-    private PeerDHT peer1DHT;
-    private PeerDHT peer2DHT;
-    private int client1Port;
-    private int client2Port;
-    private BootstrappedPeerBuilder.ConnectionType resolvedConnectionType;
-    public @Rule RepeatRule repeatRule = new RepeatRule();
-
-    @Before
-    public void setUp() {
-        client1Port = 7367;
-        client2Port = 7368;
-    }
-
-    @After
-    public void tearDown() {
-        if (peer1DHT != null)
-            peer1DHT.shutdown().awaitUninterruptibly().awaitListenersUninterruptibly();
-
-        if (peer2DHT != null)
-            peer2DHT.shutdown().awaitUninterruptibly().awaitListenersUninterruptibly();
-
-        if (peer != null)
-            peer.shutdown().awaitUninterruptibly().awaitListenersUninterruptibly();
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void bootstrapInUnknownMode() throws Exception {
-        if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.UNDEFINED) {
-            peer = bootstrapInUnknownMode(client1Port);
-            assertNotNull(peer);
-        }
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testBootstrapDirectConnection() throws Exception {
-        if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.DIRECT) {
-            peer = bootstrapDirectConnection(client1Port);
-            assertNotNull(peer);
-        }
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testBootstrapWithPortForwarding() throws Exception {
-        if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.AUTO_PORT_FORWARDING ||
-                FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.MANUAL_PORT_FORWARDING) {
-            peer = bootstrapWithPortForwarding(client2Port);
-            assertNotNull(peer);
-        }
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testBootstrapInRelayMode() throws Exception {
-        if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.RELAY) {
-            peer = bootstrapInRelayMode(client1Port);
-            assertNotNull(peer);
-        }
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testPut() throws Exception {
-        peer1DHT = getDHTPeer(client1Port);
-        FuturePut futurePut = peer1DHT.put(Number160.createHash("key")).data(new Data("hallo")).start();
-        futurePut.awaitUninterruptibly();
-        assertTrue(futurePut.isSuccess());
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testPutGet() throws Exception {
-        peer1DHT = getDHTPeer(client1Port);
-        FuturePut futurePut = peer1DHT.put(Number160.createHash("key")).data(new Data("hallo")).start();
-        futurePut.awaitUninterruptibly();
-        assertTrue(futurePut.isSuccess());
-
-        peer2DHT = getDHTPeer(client2Port);
-        FutureGet futureGet = peer2DHT.get(Number160.createHash("key")).start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-        assertEquals("hallo", futureGet.data().object());
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testAdd() throws Exception {
-        peer1DHT = getDHTPeer(client1Port);
-        FuturePut futurePut1 = peer1DHT.add(Number160.createHash("locationKey")).data(new Data("hallo1")).start();
-        futurePut1.awaitUninterruptibly();
-        assertTrue(futurePut1.isSuccess());
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testAddGet() throws Exception {
-        peer1DHT = getDHTPeer(client1Port);
-        FuturePut futurePut1 = peer1DHT.add(Number160.createHash("locationKey")).data(new Data("hallo1"))
-                .start();
-        futurePut1.awaitUninterruptibly();
-        assertTrue(futurePut1.isSuccess());
-
-        FuturePut futurePut2 = peer1DHT.add(Number160.createHash("locationKey")).data(new Data("hallo2"))
-                .start();
-        futurePut2.awaitUninterruptibly();
-        assertTrue(futurePut2.isSuccess());
-
-
-        peer2DHT = getDHTPeer(client2Port);
-        FutureGet futureGet = peer2DHT.get(Number160.createHash("locationKey")).all().start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo1")));
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo2")));
-        assertTrue(futureGet.dataMap().values().size() == 2);
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testAddGetWithReconnect() throws Exception {
-        peer1DHT = getDHTPeer(client1Port);
-        FuturePut futurePut1 = peer1DHT.add(Number160.createHash("locationKey")).data(new Data("hallo1")).start();
-        futurePut1.awaitUninterruptibly();
-        assertTrue(futurePut1.isSuccess());
-        FuturePut futurePut2 = peer1DHT.add(Number160.createHash("locationKey")).data(new Data("hallo2")).start();
-        futurePut2.awaitUninterruptibly();
-        assertTrue(futurePut2.isSuccess());
-
-        peer2DHT = getDHTPeer(client2Port);
-        FutureGet futureGet = peer2DHT.get(Number160.createHash("locationKey")).all().start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo1")));
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo2")));
-        assertTrue(futureGet.dataMap().values().size() == 2);
-
-        // shut down peer2
-        BaseFuture future = peer2DHT.shutdown();
-        future.awaitUninterruptibly();
-        future.awaitListenersUninterruptibly();
-        // start up peer2
-        peer2DHT = getDHTPeer(client2Port);
-        futureGet = peer2DHT.get(Number160.createHash("locationKey")).all().start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo1")));
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo2")));
-        assertTrue(futureGet.dataMap().values().size() == 2);
-
-        futureGet = peer1DHT.get(Number160.createHash("locationKey")).all().start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo1")));
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo2")));
-        assertTrue(futureGet.dataMap().values().size() == 2);
-
-        // shut down both
-        future = peer2DHT.shutdown();
-        future.awaitUninterruptibly();
-        future.awaitListenersUninterruptibly();
-        future = peer1DHT.shutdown();
-        future.awaitUninterruptibly();
-        future.awaitListenersUninterruptibly();
-
-        // start up both
-        peer1DHT = getDHTPeer(client1Port);
-        futureGet = peer1DHT.get(Number160.createHash("locationKey")).all().start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo1")));
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo2")));
-        assertTrue(futureGet.dataMap().values().size() == 2);
-
-        peer2DHT = getDHTPeer(client2Port);
-        futureGet = peer2DHT.get(Number160.createHash("locationKey")).all().start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo1")));
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo2")));
-        assertTrue(futureGet.dataMap().values().size() == 2);
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testParallelStartupWithPutGet() throws IOException, ClassNotFoundException, InterruptedException {
-        PeerMapConfiguration pmc1 = new PeerMapConfiguration(Number160.createHash("peer1")).peerNoVerification();
-        PeerMap pm1 = new PeerMap(pmc1);
-
-        PeerDHT peer1 = new PeerBuilderDHT(new PeerBuilder(Number160.createHash("peer1")).ports(3006).peerMap(pm1).start()).start();
-
-        PeerMapConfiguration pmc2 = new PeerMapConfiguration(Number160.createHash("peer2")).peerNoVerification();
-        PeerMap pm2 = new PeerMap(pmc2);
-
-        PeerDHT peer2 = new PeerBuilderDHT(new PeerBuilder(Number160.createHash("peer2")).ports(3007).peerMap(pm2).start()).start();
-
-      /*  PeerAddress masterPeerAddress = new PeerAddress(Number160.createHash(BOOTSTRAP_NODE_ID),
-                BOOTSTRAP_NODE_IP, BOOTSTRAP_NODE_PORT,
-                BOOTSTRAP_NODE_PORT);
-        
-        PeerDHT peer1 = new PeerBuilderDHT(new PeerBuilder(Number160.createHash("peer1")).ports(3006).start()).start();
-        PeerDHT peer2 = new PeerBuilderDHT(new PeerBuilder(Number160.createHash("peer2")).ports(3007).start()).start();
-*/
-        PeerAddress masterPeerAddress = bootstrapNodes.getLocalhostNode().toPeerAddress();
-
-        // start both at the same time
-        BaseFuture fb1 = peer1.peer().bootstrap().peerAddress(masterPeerAddress).start();
-        BaseFuture fb2 = peer2.peer().bootstrap().peerAddress(masterPeerAddress).start();
-
-        final AtomicBoolean peer1Done = new AtomicBoolean();
-        final AtomicBoolean peer2Done = new AtomicBoolean();
-
-        fb1.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                peer1Done.set(true);
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-                log.error(t.toString());
-            }
-        });
-
-        fb2.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                peer2Done.set(true);
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-                log.error(t.toString());
-            }
-        });
-
-        while (!peer1Done.get() && !peer2Done.get())
-            Thread.sleep(100);
-
-        // both are started up
-        Assert.assertTrue(fb1.isSuccess());
-        Assert.assertTrue(fb2.isSuccess());
-
-        // peer1 put data
-        FuturePut fp = peer1.put(Number160.ONE).object("test").start().awaitUninterruptibly();
-        Assert.assertTrue(fp.isSuccess());
-
-        // both get data
-        FutureGet fg1 = peer1.get(Number160.ONE).start().awaitUninterruptibly();
-        Assert.assertTrue(fg1.isSuccess());
-        Assert.assertEquals("test", fg1.data().object());
-        FutureGet fg2 = peer2.get(Number160.ONE).start().awaitUninterruptibly();
-        Assert.assertTrue(fg2.isSuccess());
-        Assert.assertEquals("test", fg2.data().object());
-
-        // shutdown both
-        peer1.shutdown().awaitUninterruptibly().awaitListenersUninterruptibly();
-        peer2.shutdown().awaitUninterruptibly().awaitListenersUninterruptibly();
-
-        // start both again at the same time
-        peer1 = new PeerBuilderDHT(new PeerBuilder(Number160.createHash("peer1")).ports(3005).start()).start();
-        peer2 = new PeerBuilderDHT(new PeerBuilder(Number160.createHash("peer2")).ports(3006).start()).start();
-
-        fb1 = peer1.peer().bootstrap().peerAddress(masterPeerAddress).start();
-        fb2 = peer2.peer().bootstrap().peerAddress(masterPeerAddress).start();
-
-        peer1Done.set(false);
-        peer2Done.set(false);
-
-        final PeerDHT _peer1 = peer1;
-        fb1.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                peer1Done.set(true);
-
-                // when peer1 is ready it gets the data
-                FutureGet fg = _peer1.get(Number160.ONE).start();
-                fg.addListener(new BaseFutureListener<BaseFuture>() {
-                    @Override
-                    public void operationComplete(BaseFuture future) throws Exception {
-                        Assert.assertTrue(fg.isSuccess());
-                        Assert.assertEquals("test", fg.data().object());
-                    }
-
-                    @Override
-                    public void exceptionCaught(Throwable t) throws Exception {
-                    }
-                });
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-            }
-        });
-
-        final PeerDHT _peer2 = peer2;
-        fb2.addListener(new BaseFutureListener<BaseFuture>() {
-            @Override
-            public void operationComplete(BaseFuture future) throws Exception {
-                peer2Done.set(true);
-
-                // when peer2 is ready it gets the data
-                FutureGet fg = _peer2.get(Number160.ONE).start();
-                fg.addListener(new BaseFutureListener<BaseFuture>() {
-                    @Override
-                    public void operationComplete(BaseFuture future) throws Exception {
-                        Assert.assertTrue(fg.isSuccess());
-                        Assert.assertEquals("test", fg.data().object());
-                    }
-
-                    @Override
-                    public void exceptionCaught(Throwable t) throws Exception {
-                    }
-                });
-            }
-
-            @Override
-            public void exceptionCaught(Throwable t) throws Exception {
-            }
-        });
-
-        while (!peer1Done.get() && !peer2Done.get())
-            Thread.sleep(100);
-
-        // both are started up
-        Assert.assertTrue(fb1.isSuccess());
-        Assert.assertTrue(fb2.isSuccess());
-
-        // get data again for both
-        fg1 = peer1.get(Number160.ONE).start().awaitUninterruptibly();
-        Assert.assertTrue(fg1.isSuccess());
-        Assert.assertEquals("test", fg1.data().object());
-
-        fg2 = peer2.get(Number160.ONE).start().awaitUninterruptibly();
-        Assert.assertTrue(fg2.isSuccess());
-        Assert.assertEquals("test", fg2.data().object());
-
-        peer1.shutdown().awaitUninterruptibly().awaitListenersUninterruptibly();
-        peer2.shutdown().awaitUninterruptibly().awaitListenersUninterruptibly();
-    }
-
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testAddRemove() throws Exception {
-        peer1DHT = getDHTPeer(client1Port);
-        FuturePut futurePut1 = peer1DHT.add(Number160.createHash("locationKey")).data(new Data("hallo1")).start();
-        futurePut1.awaitUninterruptibly();
-        futurePut1.awaitListenersUninterruptibly();
-        assertTrue(futurePut1.isSuccess());
-
-        FuturePut futurePut2 = peer1DHT.add(Number160.createHash("locationKey")).data(new Data("hallo2")).start();
-        futurePut2.awaitUninterruptibly();
-        futurePut2.awaitListenersUninterruptibly();
-        assertTrue(futurePut2.isSuccess());
-
-
-        peer2DHT = getDHTPeer(client2Port);
-        Number160 contentKey = new Data("hallo1").hash();
-        FutureRemove futureRemove = peer2DHT.remove(Number160.createHash("locationKey")).contentKey(contentKey).start();
-        futureRemove.awaitUninterruptibly();
-        futureRemove.awaitListenersUninterruptibly();
-
-        // We don't test futureRemove.isSuccess() as this API does not fit well to that operation,
-        // it might change in future to something like foundAndRemoved and notFound
-        // See discussion at: https://github.com/tomp2p/TomP2P/issues/57#issuecomment-62069840
-
-        assertTrue(futureRemove.isSuccess());
-
-        FutureGet futureGet = peer2DHT.get(Number160.createHash("locationKey")).all().start();
-        futureGet.awaitUninterruptibly();
-        assertTrue(futureGet.isSuccess());
-        if (!futureGet.dataMap().values().contains(new Data("hallo2"))) {
-            log.error("raw data has the value, the evaluated not!");
-        }
-
-        assertTrue(futureGet.dataMap().values().contains(new Data("hallo2")));
-        assertTrue(futureGet.dataMap().values().size() == 1);
-    }
-
-
-    // The sendDirect operation fails in port forwarding mode because most routers does not support NAT reflections.
-    // So if both clients are behind NAT they cannot send direct message to each other.
-    // Seems that in relay mode that is also not working
-    // That will probably be fixed in a future version of TomP2P
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testSendDirectBetweenLocalPeers() throws Exception {
-        if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.DIRECT || resolvedConnectionType == BootstrappedPeerBuilder.ConnectionType
-                .DIRECT) {
-            peer1DHT = getDHTPeer(client1Port);
-            peer2DHT = getDHTPeer(client2Port);
-
-            final CountDownLatch countDownLatch = new CountDownLatch(1);
-
-            final StringBuilder result = new StringBuilder();
-            peer2DHT.peer().objectDataReply((sender, request) -> {
-                countDownLatch.countDown();
-                result.append(String.valueOf(request));
-                return "pong";
-            });
-            FuturePeerConnection futurePeerConnection = peer1DHT.peer().createPeerConnection(peer2DHT.peer()
-                    .peerAddress(), 500);
-            FutureDirect futureDirect = peer1DHT.peer().sendDirect(futurePeerConnection).object("hallo").start();
-            futureDirect.awaitUninterruptibly();
-
-
-            countDownLatch.await(3, TimeUnit.SECONDS);
-            if (countDownLatch.getCount() > 0)
-                Assert.fail("The test method did not complete successfully!");
-
-            assertEquals("hallo", result.toString());
-            assertTrue(futureDirect.isSuccess());
-            log.debug(futureDirect.object().toString());
-            assertEquals("pong", futureDirect.object());
-        }
-    }
-
-    // This test should always succeed as we use the bootstrap node as receiver.
-    // A node can send a message to another peer which is not in the same LAN.
-    @Test
-    @Repeat(STRESS_TEST_COUNT)
-    public void testSendDirectToSeedNode() throws Exception {
-        peer1DHT = getDHTPeer(client1Port);
-        FuturePeerConnection futurePeerConnection =
-                peer1DHT.peer().createPeerConnection(BOOTSTRAP_NODE_ADDRESS, 500);
-        FutureDirect futureDirect = peer1DHT.peer().sendDirect(futurePeerConnection).object("hallo").start();
-        futureDirect.awaitUninterruptibly();
-        assertTrue(futureDirect.isSuccess());
-
-        // server node does not reply
-        // assertEquals("pong", futureDirect.object());
-    }
-
-    private Peer bootstrapDirectConnection(int clientPort) {
-        Peer peer = null;
-        try {
-          /*  Number160 peerId = Number160.createHash(UUID.randomUUID().toString());
-            PeerMapConfiguration pmc = new PeerMapConfiguration(peerId).peerNoVerification();
-            PeerMap pm = new PeerMap(pmc);
-            ChannelClientConfiguration cc = PeerBuilder.createDefaultChannelClientConfiguration();
-            cc.maxPermitsTCP(100);
-            cc.maxPermitsUDP(100);
-            peer = new PeerBuilder(peerId).bindings(getBindings()).channelClientConfiguration(cc).peerMap(pm)
-                    .ports(clientPort).start();*/
-
-            Number160 peerId = Number160.createHash(UUID.randomUUID().toString());
-            peer = new PeerBuilder(peerId).bindings(getBindings())
-                    .ports(clientPort).start();
-
-            FutureDiscover futureDiscover = peer.discover().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
-            futureDiscover.awaitUninterruptibly();
-            if (futureDiscover.isSuccess()) {
-                log.info("Discover with direct connection successful. Address = " + futureDiscover.peerAddress());
-
-                FutureBootstrap futureBootstrap = peer.bootstrap().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
-                futureBootstrap.awaitUninterruptibly();
-                if (futureBootstrap.isSuccess()) {
-                    return peer;
-                }
-                else {
-                    log.warn("Bootstrap failed. Reason = " + futureBootstrap.failedReason());
-                    peer.shutdown().awaitUninterruptibly();
-                    return null;
-                }
-            }
-            else {
-                log.warn("Discover with direct connection failed. Reason = " + futureDiscover.failedReason());
-                peer.shutdown().awaitUninterruptibly();
-                return null;
-            }
-        } catch (IOException e) {
-            log.warn("Discover with direct connection failed. Exception = " + e.getMessage());
-            if (peer != null)
-                peer.shutdown().awaitUninterruptibly();
-
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private Peer bootstrapWithPortForwarding(int clientPort) {
-        Number160 peerId = Number160.createHash(UUID.randomUUID().toString());
-        Peer peer = null;
-        try {
-            if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.MANUAL_PORT_FORWARDING ||
-                    resolvedConnectionType == BootstrappedPeerBuilder.ConnectionType.MANUAL_PORT_FORWARDING) {
-                peer = new PeerBuilder(peerId).bindings(getBindings())
-                        .behindFirewall()
-                        .tcpPortForwarding(clientPort)
-                        .udpPortForwarding(clientPort)
-                        .ports(clientPort)
-                        .start();
-            }
-            else {
-                peer = new PeerBuilder(peerId).bindings(getBindings())
-                        .behindFirewall()
-                        .ports(clientPort)
-                        .start();
-            }
-
-            PeerNAT peerNAT = new PeerBuilderNAT(peer).start();
-            FutureDiscover futureDiscover = peer.discover().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
-            FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover);
-            futureNAT.awaitUninterruptibly();
-            if (futureNAT.isSuccess()) {
-                log.info("Automatic port forwarding is setup. Now we do a futureDiscover again. Address = " +
-                        futureNAT.peerAddress());
-                futureDiscover = peer.discover().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
-                futureDiscover.awaitUninterruptibly();
-                if (futureDiscover.isSuccess()) {
-                    log.info("Discover with automatic port forwarding was successful. Address = " + futureDiscover
-                            .peerAddress());
-
-                    FutureBootstrap futureBootstrap = peer.bootstrap().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
-                    futureBootstrap.awaitUninterruptibly();
-                    if (futureBootstrap.isSuccess()) {
-                        return peer;
-                    }
-                    else {
-                        log.warn("Bootstrap failed. Reason = " + futureBootstrap.failedReason());
-                        peer.shutdown().awaitUninterruptibly();
-                        return null;
-                    }
-                }
-                else {
-                    log.warn("Discover with automatic port forwarding failed. Reason = " + futureDiscover
-                            .failedReason());
-                    peer.shutdown().awaitUninterruptibly();
-                    return null;
-                }
-            }
-            else {
-                log.warn("StartSetupPortforwarding failed. Reason = " + futureNAT
-                        .failedReason());
-                peer.shutdown().awaitUninterruptibly();
-                return null;
-            }
-        } catch (IOException e) {
-            log.warn("Discover with automatic port forwarding failed. Exception = " + e.getMessage());
-            if (peer != null)
-                peer.shutdown().awaitUninterruptibly();
-
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private Peer bootstrapInRelayMode(int clientPort) {
-        Number160 peerId = Number160.createHash(UUID.randomUUID().toString());
-        Peer peer = null;
-        try {
-            peer = new PeerBuilder(peerId).bindings(getBindings()).behindFirewall()
-                    .ports(clientPort).start();
-
-            PeerNAT peerNAT = new PeerBuilderNAT(peer).start();
-            FutureDiscover futureDiscover = peer.discover().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
-            FutureNAT futureNAT = peerNAT.startSetupPortforwarding(futureDiscover);
-            FutureRelayNAT futureRelayNAT = peerNAT.startRelay(new TCPRelayClientConfig(), futureDiscover, futureNAT);
-            futureRelayNAT.awaitUninterruptibly();
-            if (futureRelayNAT.isSuccess()) {
-                log.info("Bootstrap using relay was successful. Address = " + peer.peerAddress());
-
-                FutureBootstrap futureBootstrap = peer.bootstrap().peerAddress(BOOTSTRAP_NODE_ADDRESS).start();
-                futureBootstrap.awaitUninterruptibly();
-                if (futureBootstrap.isSuccess()) {
-                    return peer;
-                }
-                else {
-                    log.warn("Bootstrap failed. Reason = " + futureBootstrap.failedReason());
-                    peer.shutdown().awaitUninterruptibly();
-                    return null;
-                }
-            }
-            else {
-                log.error("Bootstrap using relay failed " + futureRelayNAT.failedReason());
-                futureRelayNAT.shutdown();
-                peer.shutdown().awaitUninterruptibly();
-                return null;
-            }
-        } catch (IOException e) {
-            log.error("Bootstrap using relay failed. Exception " + e.getMessage());
-            if (peer != null)
-                peer.shutdown().awaitUninterruptibly();
-
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private Peer bootstrapInUnknownMode(int clientPort) {
-        resolvedConnectionType = BootstrappedPeerBuilder.ConnectionType.DIRECT;
-        Peer peer = bootstrapDirectConnection(clientPort);
-        if (peer != null)
-            return peer;
-
-        resolvedConnectionType = BootstrappedPeerBuilder.ConnectionType.MANUAL_PORT_FORWARDING;
-        peer = bootstrapWithPortForwarding(clientPort);
-        if (peer != null)
-            return peer;
-
-        resolvedConnectionType = BootstrappedPeerBuilder.ConnectionType.AUTO_PORT_FORWARDING;
-        peer = bootstrapWithPortForwarding(clientPort);
-        if (peer != null)
-            return peer;
-
-        resolvedConnectionType = BootstrappedPeerBuilder.ConnectionType.RELAY;
-        peer = bootstrapInRelayMode(clientPort);
-        if (peer != null)
-            return peer;
-        else
-            log.error("Bootstrapping in all modes failed. Is bootstrap node " + BOOTSTRAP_NODE + "running?");
-
-        resolvedConnectionType = null;
-        return peer;
-    }
-
-    private PeerDHT getDHTPeer(int clientPort) {
-        Peer peer;
-        if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.DIRECT) {
-            peer = bootstrapDirectConnection(clientPort);
-        }
-        else if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.AUTO_PORT_FORWARDING) {
-            peer = bootstrapWithPortForwarding(clientPort);
-        }
-        else if (FORCED_CONNECTION_TYPE == BootstrappedPeerBuilder.ConnectionType.RELAY) {
-            peer = bootstrapInRelayMode(clientPort);
-        }
-        else {
-            peer = bootstrapInUnknownMode(clientPort);
-        }
-
-        if (peer == null)
-            Assert.fail("Bootstrapping failed." +
-                    " forcedConnectionType= " + FORCED_CONNECTION_TYPE +
-                    " resolvedConnectionType= " + resolvedConnectionType + "." +
-                    " Is bootstrap node " + BOOTSTRAP_NODE + "running?");
-
-        return new PeerBuilderDHT(peer).start();
-    }
-
-    private Bindings getBindings() {
-        Bindings bindings = new Bindings();
-        bindings.addProtocol(StandardProtocolFamily.INET);
-        return bindings;
-    }
-}
diff --git a/core/src/test/java/io/bitsquare/p2p/tomp2p/TomP2PPeerTest.java b/core/src/test/java/io/bitsquare/p2p/tomp2p/TomP2PPeerTest.java
deleted file mode 100644
index 5cd53a817f..0000000000
--- a/core/src/test/java/io/bitsquare/p2p/tomp2p/TomP2PPeerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.p2p.tomp2p;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.*;
-
-public class TomP2PPeerTest {
-
-    @Test
-    public void testToString() {
-        TomP2PPeer peer = new TomP2PPeer(null);
-        assertThat(peer.toString(), equalTo("TomP2PPeer{peerAddress=null}"));
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
deleted file mode 100644
index aa75fe8da4..0000000000
--- a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * 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.trade.protocol.placeoffer;
-
-import io.bitsquare.btc.WalletService;
-import io.bitsquare.p2p.MessageService;
-import io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder;
-import io.bitsquare.p2p.tomp2p.TomP2PNode;
-import io.bitsquare.trade.offer.OfferBookService;
-
-import org.bitcoinj.core.Address;
-
-import java.io.File;
-
-import org.junit.Ignore;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * That test is ignored for automated testing as it needs custom setup.
- * <p/>
- * It uses RegTest mode of Bitcoin network and localhost TomP2P network.
- * <p/>
- * 1. Need a first run to get the wallet receiving address.
- * 2. Fund that from regtest Bitcoin Core client.
- * 3. Create a block on regtest Bitcoin Core (setgenerate true) to get the balance.
- * 4. Start BootstrapNodeMain at localhost with program args: --node.name localhost
- */
-@Ignore
-public class PlaceOfferProtocolTest {
-    private static final Logger log = LoggerFactory.getLogger(PlaceOfferProtocolTest.class);
-
-    private WalletService walletService;
-    private MessageService messageService;
-    private OfferBookService offerBookService;
-    private final File dir = new File("./temp");
-    private final static String OFFER_ID = "offerID";
-    private Address address;
-    private TomP2PNode tomP2PNode;
-    private BootstrappedPeerBuilder bootstrappedPeerBuilder;
-
-   /* @Before
-    public void setup() throws InterruptedException {
-        CountDownLatch countDownLatch = new CountDownLatch(1);
-        dir.mkdirs();
-
-        // messageService
-        Node bootstrapNode = Node.at("localhost", "127.0.0.1");
-        User user = new User();
-      *//*  try {
-            user.initPersistedObject();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        }*//*
-        bootstrappedPeerBuilder = new BootstrappedPeerBuilder(Node.DEFAULT_PORT, false, bootstrapNode, "<unspecified>");
-        tomP2PNode = new TomP2PNode(bootstrappedPeerBuilder);
-        messageService = new TomP2PMessageService(tomP2PNode, null, null, null);
-
-        Observable<BootstrapState> messageObservable = tomP2PNode.bootstrap(user.getP2pSigKeyPair());
-        messageObservable.publish();
-        messageObservable.subscribe(
-                state -> log.trace("state changed: " + state),
-                error -> {
-                    log.error(error.toString());
-                },
-                () -> {
-                    log.trace("message completed");
-
-                    offerBookService = new TomP2POfferBookService(tomP2PNode, user);
-                    offerBookService.setExecutor(Threading.SAME_THREAD);
-                }
-        );
-        bootstrappedPeerBuilder.start();
-
-        // WalletService
-        walletService = new WalletService(BitcoinNetwork.REGTEST,
-                new FeePolicy(BitcoinNetwork.REGTEST),
-                null,
-                persistence,
-                null,
-                new UserAgent("", ""),
-                dir,
-                "Tests"
-        );
-
-        Observable<Object> walletServiceObservable = walletService.initialize(Threading.SAME_THREAD);
-        walletServiceObservable.subscribe(
-                next -> {
-                    // log.trace("wallet next");
-                },
-                error -> {
-                    log.trace("wallet error");
-                },
-                () -> {
-                    log.trace("wallet complete");
-                });
-
-        Observable<?> allTasks = Observable.merge(messageObservable, walletServiceObservable);
-        allTasks.subscribe(
-                next -> {
-                    //log.trace("next");
-                },
-                error -> log.error(error.toString()),
-                () -> {
-                    log.trace("wallet completed");
-                    // 1. Use that address for funding the trading wallet
-                    address = walletService.getAddressEntry(OFFER_ID).getAddress();
-                    log.info("address for funding wallet = " + address.toString());//muoTvFHJmQwPKYoA8Fr7t87UCSfZM4fciG
-                    log.info("Balance = " + walletService.getBalanceForAddress(address));
-                    countDownLatch.countDown();
-                });
-
-        countDownLatch.await();
-    }
-
-    @After
-    public void shutDown() throws IOException, InterruptedException {
-        walletService.shutDown();
-        bootstrappedPeerBuilder.shutDown();
-    }*/
-
-/*    @Test
-    public void validateOfferTest() throws InterruptedException {
-        try {
-            Offer offer = getOffer();
-            getCreateOfferCoordinator(offer).validateOffer();
-            assertTrue(true);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void createOfferFeeTxTest() throws InterruptedException {
-        try {
-            Offer offer = getOffer();
-            Transaction transaction = getCreateOfferCoordinator(offer).createOfferFeeTx();
-            assertNotNull(transaction);
-        } catch (Exception e) {
-            log.info("address for funding wallet = " + address.toString());
-            log.info("Balance = " + walletService.getBalanceForAddress(address));
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void broadcastCreateOfferFeeTxTest() throws InterruptedException {
-        try {
-            log.info("Balance pre = " + walletService.getBalanceForAddress(address));
-            Offer offer = getOffer();
-            TransactionResultHandler resultHandler = transaction -> assertNotNull(transaction);
-            FaultHandler faultHandler = (message, throwable) -> {
-                log.error(message);
-                throwable.printStackTrace();
-                fail(throwable.getMessage());
-            };
-            PlaceOfferProtocol placeOfferProtocol = getCreateOfferCoordinator(offer);
-            Transaction transaction = placeOfferProtocol.createOfferFeeTx();
-            placeOfferProtocol.broadcastCreateOfferFeeTx(transaction, resultHandler, faultHandler);
-            log.info("Balance post = " + walletService.getBalanceForAddress(address));
-
-        } catch (Exception e) {
-            log.info("address for funding wallet = " + address.toString());
-            log.info("Balance = " + walletService.getBalanceForAddress(address));
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-    }
-
-    @Test
-    public void addOfferTest() throws InterruptedException {
-        CountDownLatch countDownLatch = new CountDownLatch(2);
-        try {
-            Offer offer = getOffer();
-            offerBookService.addListener(new OfferBookService.Listener() {
-                @Override
-                public void onOfferAdded(Offer offer1) {
-                    assertEquals("Offer matching", offer.getId(), offer1.getId());
-                    countDownLatch.countDown();
-                }
-
-                @Override
-                public void onOffersReceived(List<Offer> offers) {
-                }
-
-                @Override
-                public void onOfferRemoved(Offer offer) {
-                }
-            });
-
-            TransactionResultHandler resultHandler = transaction -> {
-                assertNotNull(transaction);
-                countDownLatch.countDown();
-            };
-            FaultHandler faultHandler = (message, throwable) -> {
-                log.error(message);
-                throwable.printStackTrace();
-                fail(throwable.getMessage());
-                countDownLatch.countDown();
-                countDownLatch.countDown();
-            };
-            PlaceOfferProtocol placeOfferProtocol = getPlaceOfferProtocol(offer, resultHandler, faultHandler);
-            Transaction transaction = placeOfferProtocol.createOfferFeeTx();
-            placeOfferProtocol.addOffer(transaction);
-            countDownLatch.await();
-            log.info("Finished");
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail(e.getMessage());
-            countDownLatch.countDown();
-            countDownLatch.countDown();
-        }
-    }
-    
-    @Test
-    public void placeOfferTest() throws InterruptedException {
-        CountDownLatch countDownLatch = new CountDownLatch(1);
-        TransactionResultHandler resultHandler = transaction -> {
-            assertNotNull(transaction);
-            countDownLatch.countDown();
-        };
-        FaultHandler faultHandler = (message, throwable) -> {
-            log.error(message);
-            throwable.printStackTrace();
-            fail(throwable.getMessage());
-            countDownLatch.countDown();
-            countDownLatch.countDown();
-        };
-        PlaceOfferProtocol placeOfferProtocol = getPlaceOfferProtocol(getOffer(), resultHandler, faultHandler);
-        placeOfferProtocol.placeOffer();
-        countDownLatch.await();
-    }
-
-
-    private PlaceOfferProtocol getCreateOfferCoordinator(Offer offer) throws InterruptedException {
-        TransactionResultHandler resultHandler = transaction -> log.debug("result transaction=" + transaction.toString());
-        FaultHandler faultHandler = (message, throwable) -> {
-            log.error(message);
-            throwable.printStackTrace();
-            log.info("Balance = " + walletService.getBalanceForAddress(walletService.getAddressEntryByTradeID(OFFER_ID).getAddress()));
-        };
-        return getPlaceOfferProtocol(offer, resultHandler, faultHandler);
-    }
-
-    private PlaceOfferProtocol getPlaceOfferProtocol(Offer offer, TransactionResultHandler resultHandler, FaultHandler faultHandler) throws
-            InterruptedException {
-        return new PlaceOfferProtocol(offer,
-                walletService,
-                offerBookService,
-                resultHandler,
-                faultHandler);
-    }*/
-
-/*    private Offer getOffer() throws NoSuchAlgorithmException {
-        return new Offer(OFFER_ID,
-                new EncryptionService().getGeneratedDSAKeyPair().getPublic(),
-                Direction.BUY,
-                100L,
-                Coin.CENT,
-                Coin.CENT,
-                FiatAccountType.INTERNATIONAL,
-                Currency.getInstance("EUR"),
-                CountryUtil.getDefaultCountry(),
-                "bankAccountUID",
-                Arrays.asList(new Arbitrator()),
-                Coin.CENT,
-                Arrays.asList(CountryUtil.getDefaultCountry()),
-                Arrays.asList(LanguageUtil.getDefaultLanguageLocale())
-        );
-    }*/
-}
diff --git a/core/src/test/java/io/bitsquare/util/Repeat.java b/core/src/test/java/io/bitsquare/util/Repeat.java
deleted file mode 100644
index 2e8501d892..0000000000
--- a/core/src/test/java/io/bitsquare/util/Repeat.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Method-level annotation to be used in connection with {@link RepeatRule} to cause a
- * given {@link org.junit.Test} method to be repeated a specified number of times.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Repeat {
-
-    /**
-     * Specifies the number of times to repeat the annotated {@link org.junit.Test}.
-     */
-    int value();
-}
\ No newline at end of file
diff --git a/core/src/test/java/io/bitsquare/util/RepeatRule.java b/core/src/test/java/io/bitsquare/util/RepeatRule.java
deleted file mode 100644
index 6505952950..0000000000
--- a/core/src/test/java/io/bitsquare/util/RepeatRule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.util;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-/**
- * @see {@link Repeat}
- */
-public class RepeatRule implements TestRule {
-
-    private static class RepeatStatement extends Statement {
-
-        private final int times;
-        private final Statement statement;
-
-        private RepeatStatement(int times, Statement statement) {
-            this.times = times;
-            this.statement = statement;
-        }
-
-        @Override
-        public void evaluate() throws Throwable {
-            for (int i = 0; i < times; i++) {
-                statement.evaluate();
-            }
-        }
-    }
-
-    @Override
-    public Statement apply(Statement statement, Description description) {
-        Statement result = statement;
-        Repeat repeat = description.getAnnotation(Repeat.class);
-        if (repeat != null) {
-            int times = repeat.value();
-            result = new RepeatStatement(times, statement);
-        }
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/io/bitsquare/util/RepeatRuleTests.java b/core/src/test/java/io/bitsquare/util/RepeatRuleTests.java
deleted file mode 100644
index f9278d3c32..0000000000
--- a/core/src/test/java/io/bitsquare/util/RepeatRuleTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.util;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.*;
-
-public class RepeatRuleTests {
-
-    private static final int EXPECTED_COUNT = 10;
-    private static int ACTUAL_BEFORE_COUNT;
-    private static int ACTUAL_TEST_COUNT;
-    private static int ACTUAL_AFTER_COUNT;
-
-    public @Rule RepeatRule repeatRule = new RepeatRule();
-
-    @BeforeClass
-    public static void beforeTests() {
-        ACTUAL_BEFORE_COUNT = 0;
-        ACTUAL_TEST_COUNT = 0;
-        ACTUAL_AFTER_COUNT = 0;
-    }
-
-    @Before
-    public void setUp() {
-        ACTUAL_BEFORE_COUNT++;
-    }
-
-    @Test
-    @Repeat(EXPECTED_COUNT)
-    public void shouldBeRepeated() {
-        ACTUAL_TEST_COUNT++;
-    }
-
-    @After
-    public void tearDown() {
-        ACTUAL_AFTER_COUNT++;
-    }
-
-    @AfterClass
-    public static void afterTests() {
-        assertThat(ACTUAL_BEFORE_COUNT, equalTo(EXPECTED_COUNT));
-        assertThat(ACTUAL_TEST_COUNT, equalTo(EXPECTED_COUNT));
-        assertThat(ACTUAL_AFTER_COUNT, equalTo(EXPECTED_COUNT));
-    }
-}
diff --git a/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java b/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java
deleted file mode 100644
index 2b2ed02069..0000000000
--- a/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Copyright 2012 Thomas Bocek
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package net.tomp2p.dht;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NavigableSet;
-import java.util.Random;
-import java.util.TreeSet;
-
-import net.tomp2p.connection.Bindings;
-import net.tomp2p.futures.FutureBootstrap;
-import net.tomp2p.futures.FutureDiscover;
-import net.tomp2p.message.Message;
-import net.tomp2p.message.Message.Type;
-import net.tomp2p.p2p.AutomaticFuture;
-import net.tomp2p.p2p.Peer;
-import net.tomp2p.p2p.PeerBuilder;
-import net.tomp2p.peers.Number160;
-import net.tomp2p.peers.PeerAddress;
-import net.tomp2p.peers.PeerMap;
-import net.tomp2p.peers.PeerMapConfiguration;
-import net.tomp2p.peers.PeerSocketAddress;
-
-public class UtilsDHT2 {
-    /**
-     * Used to make the testcases predictable. Used as an input for {@link Random}.
-     */
-    public static final long THE_ANSWER = 42L;
-
-    /**
-     * Having two peers in a network, the seed needs to be different, otherwise we create a peer with the same id twice.
-     */
-    public static final long THE_ANSWER2 = 43L;
-
-    public static Message createDummyMessage() throws UnknownHostException {
-        return createDummyMessage(false, false);
-    }
-
-    public static Message createDummyMessage(boolean firewallUDP, boolean firewallTCP)
-            throws UnknownHostException {
-        return createDummyMessage(new Number160("0x4321"), "127.0.0.1", 8001, 8002, new Number160("0x1234"),
-                "127.0.0.1", 8003, 8004, (byte) 0, Type.REQUEST_1, firewallUDP, firewallTCP);
-    }
-
-    public static PeerAddress createAddress(Number160 id) throws UnknownHostException {
-        return createAddress(id, "127.0.0.1", 8005, 8006, false, false);
-    }
-
-    public static PeerAddress createAddress() throws UnknownHostException {
-        return createAddress(new Number160("0x5678"), "127.0.0.1", 8005, 8006, false, false);
-    }
-
-    public static PeerAddress createAddress(int id) throws UnknownHostException {
-        return createAddress(new Number160(id), "127.0.0.1", 8005, 8006, false, false);
-    }
-
-    public static PeerAddress createAddress(String id) throws UnknownHostException {
-        return createAddress(new Number160(id), "127.0.0.1", 8005, 8006, false, false);
-    }
-
-    public static PeerAddress createAddress(Number160 idSender, String inetSender, int tcpPortSender,
-                                            int udpPortSender, boolean firewallUDP, boolean firewallTCP) throws UnknownHostException {
-        InetAddress inetSend = InetAddress.getByName(inetSender);
-        PeerSocketAddress peerSocketAddress = new PeerSocketAddress(inetSend, tcpPortSender, udpPortSender);
-        PeerAddress n1 = new PeerAddress(idSender, peerSocketAddress, firewallTCP, firewallUDP, false, false, false,
-                PeerAddress.EMPTY_PEER_SOCKET_ADDRESSES);
-        return n1;
-    }
-
-    public static Message createDummyMessage(Number160 idSender, String inetSender, int tcpPortSendor,
-                                             int udpPortSender, Number160 idRecipien, String inetRecipient, int tcpPortRecipient,
-                                             int udpPortRecipient, byte command, Type type, boolean firewallUDP, boolean firewallTCP)
-            throws UnknownHostException {
-        Message message = new Message();
-        PeerAddress n1 = createAddress(idSender, inetSender, tcpPortSendor, udpPortSender, firewallUDP,
-                firewallTCP);
-        message.sender(n1);
-        //
-        PeerAddress n2 = createAddress(idRecipien, inetRecipient, tcpPortRecipient, udpPortRecipient,
-                firewallUDP, firewallTCP);
-        message.recipient(n2);
-        message.type(type);
-        message.command(command);
-        return message;
-    }
-
-    public static PeerDHT[] createNodes(int nrOfPeers, Random rnd, int port) throws Exception {
-        return createNodes(nrOfPeers, rnd, port, null);
-    }
-
-    public static PeerDHT[] createNodes(int nrOfPeers, Random rnd, int port, AutomaticFuture automaticFuture)
-            throws Exception {
-        return createNodes(nrOfPeers, rnd, port, automaticFuture, false);
-    }
-
-    /**
-     * Creates peers for testing. The first peer (peer[0]) will be used as the master. This means that shutting down
-     * peer[0] will shut down all other peers
-     *
-     * @param nrOfPeers The number of peers to create including the master
-     * @param rnd       The random object to create random peer IDs
-     * @param port      The port where the master peer will listen to
-     * @return All the peers, with the master peer at position 0 -> peer[0]
-     * @throws Exception If the creation of nodes fail.
-     */
-    public static PeerDHT[] createNodes(int nrOfPeers, Random rnd, int port, AutomaticFuture automaticFuture,
-                                        boolean maintenance) throws Exception {
-        if (nrOfPeers < 1) {
-            throw new IllegalArgumentException("Cannot create less than 1 peer");
-        }
-        Bindings bindings = new Bindings();
-        PeerDHT[] peers = new PeerDHT[nrOfPeers];
-        final Peer master;
-        if (automaticFuture != null) {
-            Number160 peerId = new Number160(rnd);
-            PeerMap peerMap = new PeerMap(new PeerMapConfiguration(peerId));
-            master = new PeerBuilder(peerId)
-                    .ports(port).enableMaintenance(maintenance)
-                    .bindings(bindings).peerMap(peerMap).start().addAutomaticFuture(automaticFuture);
-            peers[0] = new PeerBuilderDHT(master).start();
-
-        }
-        else {
-            Number160 peerId = new Number160(rnd);
-            PeerMap peerMap = new PeerMap(new PeerMapConfiguration(peerId));
-            master = new PeerBuilder(peerId).enableMaintenance(maintenance).bindings(bindings)
-                    .peerMap(peerMap).ports(port).start();
-            peers[0] = new PeerBuilderDHT(master).start();
-        }
-
-        for (int i = 1; i < nrOfPeers; i++) {
-            if (automaticFuture != null) {
-                Number160 peerId = new Number160(rnd);
-                PeerMap peerMap = new PeerMap(new PeerMapConfiguration(peerId));
-                Peer peer = new PeerBuilder(peerId)
-                        .masterPeer(master)
-                        .enableMaintenance(maintenance).enableMaintenance(maintenance).peerMap(peerMap).bindings(bindings).start().addAutomaticFuture
-                                (automaticFuture);
-                peers[i] = new PeerBuilderDHT(peer).start();
-            }
-            else {
-                Number160 peerId = new Number160(rnd);
-                PeerMap peerMap = new PeerMap(new PeerMapConfiguration(peerId).peerNoVerification());
-                Peer peer = new PeerBuilder(peerId).enableMaintenance(maintenance)
-                        .bindings(bindings).peerMap(peerMap).masterPeer(master)
-                        .start();
-                peers[i] = new PeerBuilderDHT(peer).start();
-            }
-        }
-        System.err.println("peers created.");
-        return peers;
-    }
-
-    public static Peer[] createRealNodes(int nrOfPeers, Random rnd, int startPort,
-                                         AutomaticFuture automaticFuture) throws Exception {
-        if (nrOfPeers < 1) {
-            throw new IllegalArgumentException("Cannot create less than 1 peer");
-        }
-        Peer[] peers = new Peer[nrOfPeers];
-        for (int i = 0; i < nrOfPeers; i++) {
-            peers[i] = new PeerBuilder(new Number160(rnd))
-                    .ports(startPort + i).start().addAutomaticFuture(automaticFuture);
-        }
-        System.err.println("real peers created.");
-        return peers;
-    }
-
-    public static Peer[] createNonMaintenanceNodes(int nrOfPeers, Random rnd, int port) throws IOException {
-        if (nrOfPeers < 1) {
-            throw new IllegalArgumentException("Cannot create less than 1 peer");
-        }
-        Peer[] peers = new Peer[nrOfPeers];
-        peers[0] = new PeerBuilder(new Number160(rnd)).enableMaintenance(false).ports(port).start();
-        for (int i = 1; i < nrOfPeers; i++) {
-            peers[i] = new PeerBuilder(new Number160(rnd)).enableMaintenance(false).masterPeer(peers[0])
-                    .start();
-        }
-        System.err.println("non-maintenance peers created.");
-        return peers;
-    }
-
-    /**
-     * Perfect routing, where each neighbor has contacted each other. This means that for small number of peers, every
-     * peer knows every other peer.
-     *
-     * @param peers The peers taking part in the p2p network.
-     */
-    public static void perfectRouting(PeerDHT... peers) {
-        for (int i = 0; i < peers.length; i++) {
-            for (int j = 0; j < peers.length; j++)
-                peers[i].peer().peerBean().peerMap().peerFound(peers[j].peer().peerAddress(), null, null, null);
-        }
-        System.err.println("perfect routing done.");
-    }
-
-    public static void perfectRoutingIndirect(PeerDHT... peers) {
-        for (int i = 0; i < peers.length; i++) {
-            for (int j = 0; j < peers.length; j++)
-                peers[i].peerBean().peerMap().peerFound(peers[j].peerAddress(), peers[j].peerAddress(), null, null);
-        }
-        System.err.println("perfect routing done.");
-    }
-
-    public static void main(String[] args) throws IOException {
-        createTempDirectory();
-    }
-
-    private static final int TEMP_DIR_ATTEMPTS = 10000;
-
-    public static File createTempDirectory() throws IOException {
-        File baseDir = new File(System.getProperty("java.io.tmpdir"));
-        String baseName = System.currentTimeMillis() + "-";
-
-        for (int counter = 0; counter < TEMP_DIR_ATTEMPTS; counter++) {
-            File tempDir = new File(baseDir, baseName + counter);
-            if (tempDir.mkdir()) {
-                return tempDir;
-            }
-        }
-        throw new IllegalStateException("Failed to create directory within " + TEMP_DIR_ATTEMPTS
-                + " attempts (tried " + baseName + "0 to " + baseName + (TEMP_DIR_ATTEMPTS - 1) + ')');
-    }
-
-    public static Peer[] createAndAttachNodes(int nr, int port, Random rnd) throws Exception {
-        Peer[] peers = new Peer[nr];
-        for (int i = 0; i < nr; i++) {
-            if (i == 0) {
-                peers[0] = new PeerBuilder(new Number160(rnd)).ports(port).start();
-            }
-            else {
-                peers[i] = new PeerBuilder(new Number160(rnd)).masterPeer(peers[0]).start();
-            }
-        }
-        return peers;
-    }
-
-    public static void bootstrap(Peer[] peers) {
-        List<FutureBootstrap> futures1 = new ArrayList<FutureBootstrap>();
-        List<FutureDiscover> futures2 = new ArrayList<FutureDiscover>();
-        for (int i = 1; i < peers.length; i++) {
-            FutureDiscover tmp = peers[i].discover().peerAddress(peers[0].peerAddress()).start();
-            futures2.add(tmp);
-        }
-        for (FutureDiscover future : futures2) {
-            future.awaitUninterruptibly();
-        }
-        for (int i = 1; i < peers.length; i++) {
-            FutureBootstrap tmp = peers[i].bootstrap().peerAddress(peers[0].peerAddress()).start();
-            futures1.add(tmp);
-        }
-        for (int i = 1; i < peers.length; i++) {
-            FutureBootstrap tmp = peers[0].bootstrap().peerAddress(peers[i].peerAddress()).start();
-            futures1.add(tmp);
-        }
-        for (FutureBootstrap future : futures1)
-            future.awaitUninterruptibly();
-    }
-
-    public static void routing(Number160 key, Peer[] peers, int start) {
-        System.out.println("routing: searching for key " + key);
-        NavigableSet<PeerAddress> pa1 = new TreeSet<PeerAddress>(PeerMap.createXORAddressComparator(key));
-        NavigableSet<PeerAddress> queried = new TreeSet<PeerAddress>(PeerMap.createXORAddressComparator(key));
-        Number160 result = Number160.ZERO;
-        Number160 resultPeer = new Number160("0xd75d1a3d57841fbc9e2a3d175d6a35dc2e15b9f");
-        int round = 0;
-        while (!resultPeer.equals(result)) {
-            System.out.println("round " + round);
-            round++;
-            pa1.addAll(peers[start].peerBean().peerMap().all());
-            queried.add(peers[start].peerAddress());
-            System.out.println("closest so far: " + queried.first());
-            PeerAddress next = pa1.pollFirst();
-            while (queried.contains(next)) {
-                next = pa1.pollFirst();
-            }
-            result = next.peerId();
-            start = findNr(next.peerId().toString(), peers);
-        }
-    }
-
-    public static void findInMap(PeerAddress key, Peer[] peers) {
-        for (int i = 0; i < peers.length; i++) {
-            if (peers[i].peerBean().peerMap().contains(key)) {
-                System.out.println("Peer " + i + " with the id " + peers[i].peerID() + " knows the peer "
-                        + key);
-            }
-        }
-    }
-
-    public static int findNr(String string, Peer[] peers) {
-        for (int i = 0; i < peers.length; i++) {
-            if (peers[i].peerID().equals(new Number160(string))) {
-                System.out.println("we found the number " + i + " for peer with id " + string);
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    public static Peer find(String string, Peer[] peers) {
-        for (int i = 0; i < peers.length; i++) {
-            if (peers[i].peerID().equals(new Number160(string))) {
-                System.out.println("!!we found the number " + i + " for peer with id " + string);
-                return peers[i];
-            }
-        }
-        return null;
-    }
-
-    public static void exec(String cmd) throws Exception {
-        Process p = Runtime.getRuntime().exec(cmd);
-        p.waitFor();
-
-        BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
-        String line = null;
-        while ((line = br.readLine()) != null) {
-            System.out.println(line);
-        }
-        br.close();
-    }
-
-    public static PeerAddress createAddressIP(String inet) throws UnknownHostException {
-        return createAddress(Number160.createHash(inet), inet, 8005, 8006, false, false);
-    }
-
-    public static PeerAddress[] createDummyAddress(int size, int portTCP, int portUDP) throws UnknownHostException {
-        PeerAddress[] pa = new PeerAddress[size];
-        for (int i = 0; i < size; i++) {
-            pa[i] = createAddress(i + 1, portTCP, portUDP);
-        }
-        return pa;
-    }
-
-    public static PeerAddress createAddress(int iid, int portTCP, int portUDP) throws UnknownHostException {
-        Number160 id = new Number160(iid);
-        InetAddress address = InetAddress.getByName("127.0.0.1");
-        return new PeerAddress(id, address, portTCP, portUDP);
-    }
-
-}
diff --git a/doc/screenshots/actual_design/create_offer_1.png b/doc/screenshots/actual_design/create_offer_1.png
deleted file mode 100644
index e1601b33bf..0000000000
Binary files a/doc/screenshots/actual_design/create_offer_1.png and /dev/null differ
diff --git a/doc/screenshots/actual_design/create_offer_2.png b/doc/screenshots/actual_design/create_offer_2.png
deleted file mode 100644
index 68c0673b14..0000000000
Binary files a/doc/screenshots/actual_design/create_offer_2.png and /dev/null differ
diff --git a/doc/screenshots/actual_design/create_offer_3.png b/doc/screenshots/actual_design/create_offer_3.png
deleted file mode 100644
index 445a0b716c..0000000000
Binary files a/doc/screenshots/actual_design/create_offer_3.png and /dev/null differ
diff --git a/doc/screenshots/actual_design/create_offer_4.png b/doc/screenshots/actual_design/create_offer_4.png
deleted file mode 100644
index 6550e972c8..0000000000
Binary files a/doc/screenshots/actual_design/create_offer_4.png and /dev/null differ
diff --git a/doc/screenshots/actual_design/create_offer_5.png b/doc/screenshots/actual_design/create_offer_5.png
deleted file mode 100644
index f2473a1ee2..0000000000
Binary files a/doc/screenshots/actual_design/create_offer_5.png and /dev/null differ
diff --git a/doc/screenshots/actual_design/setup_1.png b/doc/screenshots/actual_design/setup_1.png
deleted file mode 100644
index fb712cfd79..0000000000
Binary files a/doc/screenshots/actual_design/setup_1.png and /dev/null differ
diff --git a/doc/screenshots/actual_design/setup_2.png b/doc/screenshots/actual_design/setup_2.png
deleted file mode 100644
index 3ad4f890e7..0000000000
Binary files a/doc/screenshots/actual_design/setup_2.png and /dev/null differ
diff --git a/doc/screenshots/actual_design/setup_3.png b/doc/screenshots/actual_design/setup_3.png
deleted file mode 100644
index 336a782408..0000000000
Binary files a/doc/screenshots/actual_design/setup_3.png and /dev/null differ
diff --git a/doc/screenshots/bank_tx_inited.png b/doc/screenshots/bank_tx_inited.png
deleted file mode 100644
index 7eaa3dec83..0000000000
Binary files a/doc/screenshots/bank_tx_inited.png and /dev/null differ
diff --git a/doc/screenshots/deposit.png b/doc/screenshots/deposit.png
deleted file mode 100644
index 0a9004345b..0000000000
Binary files a/doc/screenshots/deposit.png and /dev/null differ
diff --git a/doc/screenshots/deposit_conf.png b/doc/screenshots/deposit_conf.png
deleted file mode 100644
index eff6ff3c41..0000000000
Binary files a/doc/screenshots/deposit_conf.png and /dev/null differ
diff --git a/doc/screenshots/funds_deposit.png b/doc/screenshots/funds_deposit.png
deleted file mode 100644
index 88e0566572..0000000000
Binary files a/doc/screenshots/funds_deposit.png and /dev/null differ
diff --git a/doc/screenshots/funds_tx.png b/doc/screenshots/funds_tx.png
deleted file mode 100644
index fcf39d894c..0000000000
Binary files a/doc/screenshots/funds_tx.png and /dev/null differ
diff --git a/doc/screenshots/funds_withdrawal.png b/doc/screenshots/funds_withdrawal.png
deleted file mode 100644
index 0ed39c6f9c..0000000000
Binary files a/doc/screenshots/funds_withdrawal.png and /dev/null differ
diff --git a/doc/screenshots/offerer_remove_offer.png b/doc/screenshots/offerer_remove_offer.png
deleted file mode 100644
index 14f8a789fa..0000000000
Binary files a/doc/screenshots/offerer_remove_offer.png and /dev/null differ
diff --git a/doc/screenshots/orderbook1.png b/doc/screenshots/orderbook1.png
deleted file mode 100644
index 9f96d54b96..0000000000
Binary files a/doc/screenshots/orderbook1.png and /dev/null differ
diff --git a/doc/screenshots/orderbook2.png b/doc/screenshots/orderbook2.png
deleted file mode 100644
index c54100fa6b..0000000000
Binary files a/doc/screenshots/orderbook2.png and /dev/null differ
diff --git a/doc/screenshots/take_offer.png b/doc/screenshots/take_offer.png
deleted file mode 100644
index b6495fcbdc..0000000000
Binary files a/doc/screenshots/take_offer.png and /dev/null differ
diff --git a/doc/screenshots/taker_see_offer.png b/doc/screenshots/taker_see_offer.png
deleted file mode 100644
index 70eb498099..0000000000
Binary files a/doc/screenshots/taker_see_offer.png and /dev/null differ
diff --git a/doc/screenshots/trade_complete.png b/doc/screenshots/trade_complete.png
deleted file mode 100644
index 9a0ba36732..0000000000
Binary files a/doc/screenshots/trade_complete.png and /dev/null differ
diff --git a/gui/pom.xml b/gui/pom.xml
index a0c0991a8b..1337f84255 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -57,7 +57,8 @@
                     <!-- broken with Java 8 (MSHADE-174), using ProGuard instead. -->
                     <minimizeJar>false</minimizeJar>
                     <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             <mainClass>io.bitsquare.app.BitsquareAppMain</mainClass>
                         </transformer>
                     </transformers>
@@ -130,12 +131,6 @@
             </exclusions>
         </dependency>
 
-        <!-- <dependency>
-             <groupId>com.vinumeris</groupId>
-             <artifactId>crashfx-client</artifactId>
-             <version>1.1</version>
-         </dependency>-->
-
         <dependency>
             <groupId>org.controlsfx</groupId>
             <artifactId>controlsfx</artifactId>
diff --git a/gui/src/main/java/eu/hansolo/enzo/notification/Notification.java b/gui/src/main/java/eu/hansolo/enzo/notification/Notification.java
index 46d10c5165..64ab1b7556 100755
--- a/gui/src/main/java/eu/hansolo/enzo/notification/Notification.java
+++ b/gui/src/main/java/eu/hansolo/enzo/notification/Notification.java
@@ -16,12 +16,10 @@
 
 package eu.hansolo.enzo.notification;
 
-import java.util.stream.IntStream;
-
+import io.bitsquare.common.UserThread;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
-import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.collections.FXCollections;
@@ -30,18 +28,21 @@ import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.event.WeakEventHandler;
 import javafx.geometry.Pos;
-import javafx.scene.*;
-import javafx.scene.control.*;
-import javafx.scene.image.*;
-import javafx.scene.input.*;
-import javafx.scene.layout.*;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Duration;
-
 import org.controlsfx.control.PopOver;
 
+import java.util.stream.IntStream;
+
 
 /**
  * A copy of the original {@link eu.hansolo.enzo.notification.Notification} class at revision eb1d321, containing
@@ -50,13 +51,13 @@ import org.controlsfx.control.PopOver;
  * {@code eu.hansolo.enzo.*} types are loaded from the enzo jar (see build.gradle for details).
  */
 public class Notification {
-    public static final Image INFO_ICON = new Image(Notifier.class.getResourceAsStream("info.png"));
-    public static final Image WARNING_ICON = new Image(Notifier.class.getResourceAsStream("warning.png"));
-    public static final Image SUCCESS_ICON = new Image(Notifier.class.getResourceAsStream("success.png"));
-    public static final Image ERROR_ICON = new Image(Notifier.class.getResourceAsStream("error.png"));
-    public final String TITLE;
-    public final String MESSAGE;
-    public final Image IMAGE;
+    private static final Image INFO_ICON = new Image(Notifier.class.getResourceAsStream("info.png"));
+    private static final Image WARNING_ICON = new Image(Notifier.class.getResourceAsStream("warning.png"));
+    private static final Image SUCCESS_ICON = new Image(Notifier.class.getResourceAsStream("success.png"));
+    private static final Image ERROR_ICON = new Image(Notifier.class.getResourceAsStream("error.png"));
+    private final String TITLE;
+    private final String MESSAGE;
+    private final Image IMAGE;
 
 
     // ******************** Constructors **************************************
@@ -68,7 +69,7 @@ public class Notification {
         this("", MESSAGE, IMAGE);
     }
 
-    public Notification(final String TITLE, final String MESSAGE, final Image IMAGE) {
+    private Notification(final String TITLE, final String MESSAGE, final Image IMAGE) {
         this.TITLE = TITLE;
         this.MESSAGE = MESSAGE;
         this.IMAGE = IMAGE;
@@ -313,7 +314,7 @@ public class Notification {
         private void preOrder() {
             if (popups.isEmpty()) return;
             IntStream.range(0, popups.size()).parallel().forEachOrdered(
-                    i -> Platform.runLater(() -> {
+                    i -> UserThread.execute(() -> {
                         switch (popupLocation) {
                             case TOP_LEFT:
                             case TOP_CENTER:
@@ -377,7 +378,7 @@ public class Notification {
 
             Timeline timeline = new Timeline(kfBegin, kfEnd);
             timeline.setDelay(popupLifetime);
-            timeline.setOnFinished(actionEvent -> Platform.runLater(() -> {
+            timeline.setOnFinished(actionEvent -> UserThread.execute(() -> {
                 popOver.hide();
                 popups.remove(popOver);
                 fireNotificationEvent(new NotificationEvent(NOTIFICATION, Notifier.this, popOver,
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
index 14206edbee..301126b569 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -17,6 +17,15 @@
 
 package io.bitsquare.app;
 
+import ch.qos.logback.classic.Logger;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.vinumeris.updatefx.UpdateFX;
+import io.bitsquare.alert.AlertManager;
+import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.SystemTray;
 import io.bitsquare.gui.common.view.CachingViewLoader;
 import io.bitsquare.gui.common.view.View;
@@ -24,54 +33,57 @@ import io.bitsquare.gui.common.view.ViewLoader;
 import io.bitsquare.gui.common.view.guice.InjectorViewFactory;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.debug.DebugView;
+import io.bitsquare.gui.popups.EmptyWalletPopup;
+import io.bitsquare.gui.popups.SendAlertMessagePopup;
 import io.bitsquare.gui.util.ImageUtil;
+import io.bitsquare.p2p.P2PService;
 import io.bitsquare.storage.Storage;
-import io.bitsquare.util.Utilities;
-
-import org.bitcoinj.utils.Threading;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-import java.io.IOException;
-
-import java.nio.file.Paths;
-
-import java.util.ArrayList;
-import java.util.List;
-
+import io.bitsquare.trade.offer.OpenOfferManager;
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.scene.*;
-import javafx.scene.image.*;
-import javafx.scene.input.*;
-import javafx.scene.layout.*;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.input.KeyCombination;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-
 import org.controlsfx.dialog.Dialogs;
-
+import org.reactfx.EventStreams;
+import org.reactfx.util.FxTimer;
 import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Logger;
-import com.vinumeris.updatefx.UpdateFX;
 import org.springframework.core.env.Environment;
 
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
 import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
 
 public class BitsquareApp extends Application {
     private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class);
 
-    public static final boolean DEV_MODE = false;
+    public static final boolean DEV_MODE = true;
 
     private static Environment env;
 
     private BitsquareAppModule bitsquareAppModule;
     private Injector injector;
-    private Stage primaryStage;
+
+    public static Stage getPrimaryStage() {
+        return primaryStage;
+    }
+
+    private static Stage primaryStage;
     private Scene scene;
-    private List<String> corruptedDatabaseFiles = new ArrayList<>();
+    private final List<String> corruptedDatabaseFiles = new ArrayList<>();
     private MainView mainView;
 
     public static Runnable shutDownHandler;
@@ -83,27 +95,24 @@ public class BitsquareApp extends Application {
 
     @Override
     public void start(Stage primaryStage) throws IOException {
-        this.primaryStage = primaryStage;
+        BitsquareApp.primaryStage = primaryStage;
 
         Logging.setup(Paths.get(env.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY), "bitsquare").toString());
 
+        UserThread.setExecutor(Platform::runLater);
+
         shutDownHandler = this::stop;
         restartDownHandler = this::restart;
 
         // setup UncaughtExceptionHandler
         Thread.UncaughtExceptionHandler handler = (thread, throwable) -> {
             // Might come from another thread 
-            Platform.runLater(() -> showErrorPopup(throwable, true));
+            UserThread.execute(() -> showErrorPopup(throwable, false));
         };
         Thread.setDefaultUncaughtExceptionHandler(handler);
         Thread.currentThread().setUncaughtExceptionHandler(handler);
 
         try {
-            log.trace("BitsquareApp.start");
-
-            // Set user thread for callbacks from backend threads
-            Threading.USER_THREAD = Platform::runLater;
-
             // Use CrashFX for report crash logs
             /*CrashFX.setup("Bitsquare/" + Version.VERSION,
                     Paths.get(env.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY), "crashes"),
@@ -126,7 +135,7 @@ public class BitsquareApp extends Application {
                     mainView.setPersistedFilesCorrupted(corruptedDatabaseFiles);
             });
 
-            scene = new Scene(mainView.getRoot(), 1000, 650);
+            scene = new Scene(mainView.getRoot(), 1000, 740);
             scene.getStylesheets().setAll(
                     "/io/bitsquare/gui/bitsquare.css",
                     "/io/bitsquare/gui/images.css");
@@ -147,8 +156,15 @@ public class BitsquareApp extends Application {
                 else if (new KeyCodeCombination(KeyCode.D, KeyCombination.SHORTCUT_DOWN).match(keyEvent))
                     //if (BitsquareApp.DEV_MODE)
                     showDebugWindow();
+                else if (new KeyCodeCombination(KeyCode.F, KeyCombination.SHORTCUT_DOWN).match(keyEvent))
+                    showFPSWindow();
+                else if (new KeyCodeCombination(KeyCode.E, KeyCombination.SHORTCUT_DOWN).match(keyEvent))
+                    showEmptyWalletPopup();
+                else if (new KeyCodeCombination(KeyCode.A, KeyCombination.SHORTCUT_DOWN).match(keyEvent))
+                    showSendAlertMessagePopup();
             });
 
+
             // configure the primary stage
             primaryStage.setTitle(env.getRequiredProperty(APP_NAME_KEY));
             primaryStage.setScene(scene);
@@ -172,10 +188,22 @@ public class BitsquareApp extends Application {
 
             //showDebugWindow();
         } catch (Throwable throwable) {
-            showErrorPopup(throwable, true);
+            showErrorPopup(throwable, false);
         }
     }
 
+    private void showSendAlertMessagePopup() {
+        AlertManager alertManager = injector.getInstance(AlertManager.class);
+        new SendAlertMessagePopup()
+                .onAddAlertMessage((alertMessage, privKeyString) -> alertManager.addAlertMessageIfKeyIsValid(alertMessage, privKeyString))
+                .onRemoveAlertMessage(privKeyString -> alertManager.removeAlertMessageIfKeyIsValid(privKeyString))
+                .show();
+    }
+
+    private void showEmptyWalletPopup() {
+        injector.getInstance(EmptyWalletPopup.class).show();
+    }
+
     private void showErrorPopup(Throwable throwable, boolean doShutDown) {
         if (scene == null) {
             scene = new Scene(new StackPane(), 1000, 650);
@@ -184,11 +212,16 @@ public class BitsquareApp extends Application {
         }
         try {
             throwable.printStackTrace();
-            Dialogs.create()
-                    .owner(primaryStage)
-                    .title("Error")
-                    .message("A fatal exception occurred at startup.")
-                    .showException(throwable);
+            try {
+                Dialogs.create()
+                        .owner(primaryStage)
+                        .title("Error")
+                        .message("A fatal exception occurred at startup.")
+                        .showException(throwable);
+            } catch (Throwable throwable3) {
+                log.error("Error at displaying Throwable.");
+                throwable3.printStackTrace();
+            }
             if (doShutDown)
                 stop();
         } catch (Throwable throwable2) {
@@ -220,19 +253,71 @@ public class BitsquareApp extends Application {
         stage.show();
     }
 
-    @Override
-    public void stop() {
-        bitsquareAppModule.close(injector);
-        System.exit(0);
+
+    private void showFPSWindow() {
+        Label label = new Label();
+        EventStreams.animationTicks()
+                .latestN(100)
+                .map(ticks -> {
+                    int n = ticks.size() - 1;
+                    return n * 1_000_000_000.0 / (ticks.get(n) - ticks.get(0));
+                })
+                .map(d -> String.format("FPS: %.3f", d))
+                .feedTo(label.textProperty());
+
+        Pane root = new StackPane();
+        root.getChildren().add(label);
+        Stage stage = new Stage();
+        stage.setScene(new Scene(root));
+        stage.setTitle("FPS");
+        stage.initModality(Modality.NONE);
+        stage.initStyle(StageStyle.UTILITY);
+        stage.initOwner(scene.getWindow());
+        stage.setX(primaryStage.getX() + primaryStage.getWidth() + 10);
+        stage.setY(primaryStage.getY());
+        stage.setWidth(200);
+        stage.setHeight(100);
+        stage.show();
+
     }
 
-    public void restart() {
+    @Override
+    public void stop() {
+        gracefulShutDown(() -> {
+            log.info("App shutdown complete");
+            System.exit(0);
+        });
+    }
+
+    private void gracefulShutDown(ResultHandler resultHandler) {
+        log.debug("gracefulShutDown");
         try {
-            bitsquareAppModule.close(injector);
-            UpdateFX.restartApp();
+            if (injector != null) {
+                OpenOfferManager openOfferManager = injector.getInstance(OpenOfferManager.class);
+                openOfferManager.shutDown(() -> {
+                    P2PService p2PService = injector.getInstance(P2PService.class);
+                    p2PService.shutDown(() -> {
+                        WalletService walletService = injector.getInstance(WalletService.class);
+                        walletService.shutDownDone.addListener((observable, oldValue, newValue) -> {
+                            bitsquareAppModule.close(injector);
+                            resultHandler.handleResult();
+                        });
+                        injector.getInstance(WalletService.class).shutDown();
+                    });
+                });
+                // we wait max 5 sec.
+                FxTimer.runLater(Duration.ofMillis(5000), resultHandler::handleResult);
+            } else {
+                FxTimer.runLater(Duration.ofMillis(500), resultHandler::handleResult);
+            }
         } catch (Throwable t) {
-            // in dev mode restart does not work
-            stop();
+            log.info("App shutdown failed with exception");
+            t.printStackTrace();
+            System.exit(1);
         }
     }
+
+    private void restart() {
+        gracefulShutDown(UpdateFX::restartApp);
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java b/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java
index ba730f461c..d07bdebc5e 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareAppMain.java
@@ -17,31 +17,25 @@
 
 package io.bitsquare.app;
 
+import com.vinumeris.updatefx.UpdateFX;
 import io.bitsquare.BitsquareException;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.btc.RegTestHost;
-import io.bitsquare.p2p.BootstrapNodes;
-import io.bitsquare.p2p.Node;
+import io.bitsquare.p2p.Utils;
 import io.bitsquare.util.joptsimple.EnumValueConverter;
+import joptsimple.OptionException;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.vinumeris.updatefx.UpdateFX;
-import joptsimple.OptionException;
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-
 import static io.bitsquare.app.BitsquareEnvironment.*;
-import static io.bitsquare.p2p.Node.*;
-import static io.bitsquare.p2p.tomp2p.TomP2PModule.*;
 import static java.util.Arrays.asList;
 
 public class BitsquareAppMain extends BitsquareExecutable {
@@ -77,7 +71,7 @@ public class BitsquareAppMain extends BitsquareExecutable {
 
     // That will be called from UpdateFX after updates are checked
     public static void realMain(String[] args) throws Exception {
-        log.trace("realMain");
+        //log.trace("realMain");
         // For some reason the JavaFX launch process results in us losing the thread context class loader: reset it.
         // In order to work around a bug in JavaFX 8u25 and below, you must include the following code as the first line of your realMain method:
         Thread.currentThread().setContextClassLoader(BitsquareAppMain.class.getClassLoader());
@@ -112,12 +106,15 @@ public class BitsquareAppMain extends BitsquareExecutable {
                 description("Clean application data directory", DEFAULT_APP_DATA_DIR_CLEAN))
                 .withRequiredArg()
                 .ofType(boolean.class);
-        parser.accepts(NAME_KEY, description("Name of this node", null))
+        parser.accepts(ProgramArguments.NAME_KEY, description("Name of this node", null))
                 .withRequiredArg();
-        parser.accepts(PORT_KEY, description("Port to listen on", Node.CLIENT_PORT))
+        parser.accepts(ProgramArguments.PORT_KEY, description("Port to listen on", Utils.findFreeSystemPort()))
                 .withRequiredArg()
                 .ofType(int.class);
-        parser.accepts(USE_MANUAL_PORT_FORWARDING_KEY, description("Use manual port forwarding", false))
+        parser.accepts(ProgramArguments.USE_LOCALHOST, description("Use localhost network for development", false))
+                .withRequiredArg()
+                .ofType(boolean.class);
+        parser.accepts(ProgramArguments.DEV_TEST, description("Enable arbitrator dev priv key", false))
                 .withRequiredArg()
                 .ofType(boolean.class);
         parser.accepts(BitcoinNetwork.KEY, description("Bitcoin network", BitcoinNetwork.DEFAULT))
@@ -125,25 +122,11 @@ public class BitsquareAppMain extends BitsquareExecutable {
                 .ofType(BitcoinNetwork.class)
                 .withValuesConvertedBy(new EnumValueConverter(BitcoinNetwork.class));
 
+
         parser.accepts(RegTestHost.KEY, description("", RegTestHost.DEFAULT))
                 .withRequiredArg()
                 .ofType(RegTestHost.class)
                 .withValuesConvertedBy(new EnumValueConverter(RegTestHost.class));
-
-        BootstrapNodes bootstrapNodes = new BootstrapNodes();
-        bootstrapNodes.initWithNetworkId(Node.REG_TEST_P2P_ID); // use regtest as default
-        parser.accepts(BOOTSTRAP_NODE_NAME_KEY, description("Bootstrap node name", bootstrapNodes.getLocalhostNode().getName()))
-                .withRequiredArg();
-        parser.accepts(BOOTSTRAP_NODE_IP_KEY, description("Bootstrap node IP", bootstrapNodes.getLocalhostNode().getIp()))
-                .withRequiredArg();
-        parser.accepts(BOOTSTRAP_NODE_P2P_ID_KEY, description("Bootstrap node p2p network ID", bootstrapNodes.getLocalhostNode().getPort()))
-                .withRequiredArg()
-                .ofType(int.class);
-        parser.accepts(BOOTSTRAP_NODE_PORT_KEY, description("Bootstrap node port", bootstrapNodes.getLocalhostNode().getPort()))
-                .withRequiredArg()
-                .ofType(int.class);
-        parser.accepts(NETWORK_INTERFACE_KEY, description("Network interface", null))
-                .withRequiredArg();
     }
 
     @Override
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java b/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java
index 6150d024d9..efe3b6f229 100644
--- a/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java
+++ b/gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java
@@ -17,39 +17,31 @@
 
 package io.bitsquare.app;
 
-import io.bitsquare.BitsquareModule;
+import com.google.inject.Singleton;
+import io.bitsquare.alert.AlertModule;
 import io.bitsquare.arbitration.ArbitratorModule;
-import io.bitsquare.arbitration.tomp2p.TomP2PArbitratorModule;
 import io.bitsquare.btc.BitcoinModule;
-import io.bitsquare.crypto.CryptoModule;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.crypto.KeyStorage;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.common.crypto.KeyStorage;
+import io.bitsquare.crypto.EncryptionServiceModule;
 import io.bitsquare.gui.GuiModule;
+import io.bitsquare.gui.common.view.CachingViewLoader;
 import io.bitsquare.p2p.P2PModule;
-import io.bitsquare.p2p.tomp2p.TomP2PModule;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.TradeModule;
 import io.bitsquare.trade.offer.OfferModule;
-import io.bitsquare.trade.offer.tomp2p.TomP2POfferModule;
-import io.bitsquare.user.AccountSettings;
 import io.bitsquare.user.Preferences;
 import io.bitsquare.user.User;
-
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.env.Environment;
 
 import java.io.File;
 
-import javafx.stage.Stage;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.core.env.Environment;
-
 import static com.google.inject.name.Names.named;
 
-class BitsquareAppModule extends BitsquareModule {
+class BitsquareAppModule extends AppModule {
     private static final Logger log = LoggerFactory.getLogger(BitsquareAppModule.class);
 
     private final Stage primaryStage;
@@ -61,11 +53,11 @@ class BitsquareAppModule extends BitsquareModule {
 
     @Override
     protected void configure() {
+        bind(CachingViewLoader.class).in(Singleton.class);
         bind(KeyStorage.class).in(Singleton.class);
         bind(KeyRing.class).in(Singleton.class);
         bind(User.class).in(Singleton.class);
         bind(Preferences.class).in(Singleton.class);
-        bind(AccountSettings.class).in(Singleton.class);
 
         File storageDir = new File(env.getRequiredProperty(Storage.DIR_KEY));
         bind(File.class).annotatedWith(named(Storage.DIR_KEY)).toInstance(storageDir);
@@ -78,44 +70,44 @@ class BitsquareAppModule extends BitsquareModule {
 
         // ordering is used for shut down sequence
         install(tradeModule());
-        install(cryptoModule());
+        install(encryptionServiceModule());
         install(arbitratorModule());
         install(offerModule());
-        install(p2pModule());
+        install(torModule());
         install(bitcoinModule());
         install(guiModule());
+        install(alertModule());
     }
 
-    protected TradeModule tradeModule() {
+    private TradeModule tradeModule() {
         return new TradeModule(env);
     }
 
-    protected CryptoModule cryptoModule() {
-        return new CryptoModule(env);
+    private EncryptionServiceModule encryptionServiceModule() {
+        return new EncryptionServiceModule(env);
     }
 
-    protected ArbitratorModule arbitratorModule() {
-        return new TomP2PArbitratorModule(env);
+    private ArbitratorModule arbitratorModule() {
+        return new ArbitratorModule(env);
     }
 
-    protected OfferModule offerModule() {
-        return new TomP2POfferModule(env);
+    private AlertModule alertModule() {
+        return new AlertModule(env);
     }
 
-    protected P2PModule p2pModule() {
-        return new TomP2PModule(env);
+    private OfferModule offerModule() {
+        return new OfferModule(env);
     }
 
-    protected BitcoinModule bitcoinModule() {
+    private P2PModule torModule() {
+        return new P2PModule(env);
+    }
+
+    private BitcoinModule bitcoinModule() {
         return new BitcoinModule(env);
     }
 
-    protected GuiModule guiModule() {
+    private GuiModule guiModule() {
         return new GuiModule(env, primaryStage);
     }
-
-    @Override
-    protected void doClose(Injector injector) {
-        log.trace("doClose " + getClass().getSimpleName());
-    }
 }
diff --git a/gui/src/main/java/io/bitsquare/app/UpdateProcess.java b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java
index c03dfe0bb3..3161aa4963 100644
--- a/gui/src/main/java/io/bitsquare/app/UpdateProcess.java
+++ b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java
@@ -17,32 +17,26 @@
 
 package io.bitsquare.app;
 
-import io.bitsquare.util.Utilities;
-
 import com.google.inject.Inject;
-
-import java.io.IOException;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import java.util.List;
-import java.util.Timer;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.vinumeris.updatefx.Crypto;
 import com.vinumeris.updatefx.UpdateFX;
 import com.vinumeris.updatefx.UpdateSummary;
 import com.vinumeris.updatefx.Updater;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.common.util.Utilities;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import org.bouncycastle.math.ec.ECPoint;
-import rx.Observable;
-import rx.subjects.BehaviorSubject;
-import rx.subjects.Subject;
+import org.reactfx.util.FxTimer;
+import org.reactfx.util.Timer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.List;
 
 public class UpdateProcess {
     private static final Logger log = LoggerFactory.getLogger(UpdateProcess.class);
@@ -53,6 +47,7 @@ public class UpdateProcess {
     private static final Path ROOT_CLASS_PATH = UpdateFX.findCodePath(BitsquareAppMain.class);
 
     private final BitsquareEnvironment environment;
+    private ResultHandler resultHandler;
 
     public enum State {
         CHECK_FOR_UPDATES,
@@ -65,7 +60,6 @@ public class UpdateProcess {
     public final ObjectProperty<State> state = new SimpleObjectProperty<>(State.CHECK_FOR_UPDATES);
 
     private String releaseUrl;
-    private final Subject<State, State> process = BehaviorSubject.create();
     private Timer timeoutTimer;
 
     @Inject
@@ -77,17 +71,17 @@ public class UpdateProcess {
         UpdateFX.restartApp();
     }
 
-    public Observable<State> getProcess() {
-        return process.asObservable();
+    public void setResultHandler(ResultHandler resultHandler) {
+        this.resultHandler = resultHandler;
     }
 
     public void init() {
-        log.info("UpdateFX current version " + Version.PATCH_VERSION);
+        log.info("UpdateFX checking for patch version " + Version.PATCH_VERSION);
 
         // process.timeout() will cause an error state back but we don't want to break startup in case of an timeout
-        timeoutTimer = Utilities.setTimeout(10000, () -> {
+        timeoutTimer = FxTimer.runLater(Duration.ofMillis(10000), () -> {
             log.error("Timeout reached for UpdateFX");
-            process.onCompleted();
+            resultHandler.handleResult();
         });
         String userAgent = environment.getProperty(BitsquareEnvironment.APP_NAME_KEY) + Version.VERSION;
 
@@ -97,7 +91,7 @@ public class UpdateProcess {
             if (releaseUrl != null && releaseUrl.length() > 0) {
                 log.info("New release available at: " + releaseUrl);
                 state.set(State.NEW_RELEASE);
-                timeoutTimer.cancel();
+                timeoutTimer.stop();
                 return;
             }
             else {
@@ -121,11 +115,10 @@ public class UpdateProcess {
             log.trace("progressProperty newValue = " + newValue);
         });*/
 
-        log.info("Checking for updates!");
         updater.setOnSucceeded(event -> {
             try {
                 UpdateSummary summary = updater.get();
-                log.info("summary " + summary.toString());
+                //log.info("summary " + summary.toString());
                 if (summary.descriptions != null && summary.descriptions.size() > 0) {
                     log.info("One liner: {}", summary.descriptions.get(0).getOneLiner());
                     log.info("{}", summary.descriptions.get(0).getDescription());
@@ -135,13 +128,13 @@ public class UpdateProcess {
                     state.set(State.UPDATE_AVAILABLE);
                     // We stop the timeout and treat it not completed. 
                     // The user should click the restart button manually if there are updates available.
-                    timeoutTimer.cancel();
+                    timeoutTimer.stop();
                 }
                 else if (summary.highestVersion == Version.PATCH_VERSION) {
                     log.info("UP_TO_DATE");
                     state.set(State.UP_TO_DATE);
-                    timeoutTimer.cancel();
-                    process.onCompleted();
+                    timeoutTimer.stop();
+                    resultHandler.handleResult();
                 }
             } catch (Throwable e) {
                 log.error("Exception at processing UpdateSummary: " + e.getMessage());
@@ -149,8 +142,8 @@ public class UpdateProcess {
                 // we treat errors as update not as critical errors to prevent startup, 
                 // so we use state.onCompleted() instead of state.onError()
                 state.set(State.FAILURE);
-                timeoutTimer.cancel();
-                process.onCompleted();
+                timeoutTimer.stop();
+                resultHandler.handleResult();
             }
         });
         updater.setOnFailed(event -> {
@@ -160,8 +153,8 @@ public class UpdateProcess {
             // we treat errors as update not as critical errors to prevent startup, 
             // so we use state.onCompleted() instead of state.onError()
             state.set(State.FAILURE);
-            timeoutTimer.cancel();
-            process.onCompleted();
+            timeoutTimer.stop();
+            resultHandler.handleResult();
         });
 
         Thread thread = new Thread(updater, "Online update check");
diff --git a/gui/src/main/java/io/bitsquare/gui/GuiModule.java b/gui/src/main/java/io/bitsquare/gui/GuiModule.java
index a39ddd64a1..3c4b96c341 100644
--- a/gui/src/main/java/io/bitsquare/gui/GuiModule.java
+++ b/gui/src/main/java/io/bitsquare/gui/GuiModule.java
@@ -17,35 +17,27 @@
 
 package io.bitsquare.gui;
 
-import io.bitsquare.BitsquareModule;
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+import io.bitsquare.app.AppModule;
 import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.gui.common.fxml.FxmlViewLoader;
 import io.bitsquare.gui.common.view.CachingViewLoader;
 import io.bitsquare.gui.common.view.ViewFactory;
 import io.bitsquare.gui.common.view.ViewLoader;
 import io.bitsquare.gui.common.view.guice.InjectorViewFactory;
-import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.offer.offerbook.OfferBook;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.Transitions;
-import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
-import io.bitsquare.gui.util.validation.BtcValidator;
-import io.bitsquare.gui.util.validation.FiatValidator;
-import io.bitsquare.gui.util.validation.InputValidator;
-import io.bitsquare.gui.util.validation.PasswordValidator;
+import io.bitsquare.gui.util.validation.*;
 import io.bitsquare.locale.BSResources;
-
-import com.google.inject.Singleton;
-import com.google.inject.name.Names;
+import javafx.stage.Stage;
+import org.springframework.core.env.Environment;
 
 import java.util.ResourceBundle;
 
-import javafx.stage.Stage;
-
-import org.springframework.core.env.Environment;
-
-public class GuiModule extends BitsquareModule {
+public class GuiModule extends AppModule {
 
     private final Stage primaryStage;
 
@@ -66,10 +58,9 @@ public class GuiModule extends BitsquareModule {
         bind(Navigation.class).in(Singleton.class);
 
         bind(OfferBook.class).in(Singleton.class);
-        bind(OverlayManager.class).in(Singleton.class);
         bind(BSFormatter.class).in(Singleton.class);
 
-        bind(BankAccountNumberValidator.class).in(Singleton.class);
+        bind(IBANValidator.class).in(Singleton.class);
         bind(BtcValidator.class).in(Singleton.class);
         bind(FiatValidator.class).in(Singleton.class);
         bind(InputValidator.class).in(Singleton.class);
@@ -77,7 +68,6 @@ public class GuiModule extends BitsquareModule {
         bind(Transitions.class).in(Singleton.class);
 
         bind(Stage.class).toInstance(primaryStage);
-        Popups.primaryStage = primaryStage;
 
         bindConstant().annotatedWith(Names.named(MainView.TITLE_KEY)).to(env.getRequiredProperty(BitsquareEnvironment.APP_NAME_KEY));
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/Navigation.java b/gui/src/main/java/io/bitsquare/gui/Navigation.java
index f46cfddfa4..d2067ef845 100644
--- a/gui/src/main/java/io/bitsquare/gui/Navigation.java
+++ b/gui/src/main/java/io/bitsquare/gui/Navigation.java
@@ -17,30 +17,27 @@
 
 package io.bitsquare.gui;
 
+import com.google.inject.Inject;
 import io.bitsquare.app.Version;
 import io.bitsquare.gui.common.view.View;
 import io.bitsquare.gui.common.view.ViewPath;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.offer.BuyOfferView;
+import io.bitsquare.gui.main.market.MarketView;
 import io.bitsquare.storage.Storage;
-
-import com.google.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class Navigation implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
     transient private static final Logger log = LoggerFactory.getLogger(Navigation.class);
 
-    transient private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, BuyOfferView.class);
+    transient private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, MarketView.class);
 
 
     public interface Listener {
@@ -50,7 +47,7 @@ public class Navigation implements Serializable {
     // New listeners can be added during iteration so we use CopyOnWriteArrayList to
     // prevent invalid array modification
     transient private final List<Listener> listeners = new CopyOnWriteArrayList<>();
-    transient private final Storage<Navigation> storage;
+    transient private final Storage<Navigation> remoteStorage;
     transient private ViewPath currentPath;
     // Used for returning to the last important view. After setup is done we want to
     // return to the last opened view (e.g. sell/buy)
@@ -61,10 +58,10 @@ public class Navigation implements Serializable {
 
 
     @Inject
-    public Navigation(Storage<Navigation> storage) {
-        this.storage = storage;
+    public Navigation(Storage<Navigation> remoteStorage) {
+        this.remoteStorage = remoteStorage;
 
-        Navigation persisted = storage.initAndGetPersisted(this);
+        Navigation persisted = remoteStorage.initAndGetPersisted(this);
         if (persisted != null) {
             previousPath = persisted.getPreviousPath();
         }
@@ -106,7 +103,7 @@ public class Navigation implements Serializable {
 
         currentPath = newPath;
         previousPath = currentPath;
-        storage.queueUpForSave();
+        remoteStorage.queueUpForSave();
         listeners.stream().forEach((e) -> e.onNavigationRequested(currentPath));
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/OverlayManager.java b/gui/src/main/java/io/bitsquare/gui/OverlayManager.java
deleted file mode 100644
index 1020b8e11b..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/OverlayManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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;
-
-import com.google.inject.Inject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class OverlayManager {
-
-    private final static List<OverlayListener> listeners = new ArrayList<>();
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public OverlayManager() {
-    }
-
-    public static void blurContent() {
-        listeners.stream().forEach(OverlayListener::onBlurContentRequested);
-    }
-
-    public static void removeBlurContent() {
-        listeners.stream().forEach(OverlayListener::onRemoveBlurContentRequested);
-    }
-
-    public static void addListener(OverlayListener listener) {
-        listeners.add(listener);
-    }
-
-    public static void removeListener(OverlayListener listener) {
-        listeners.remove(listener);
-    }
-
-    public interface OverlayListener {
-        void onBlurContentRequested();
-
-        void onRemoveBlurContentRequested();
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/SystemTray.java b/gui/src/main/java/io/bitsquare/gui/SystemTray.java
index 298bda31d4..5d4b6f4a96 100644
--- a/gui/src/main/java/io/bitsquare/gui/SystemTray.java
+++ b/gui/src/main/java/io/bitsquare/gui/SystemTray.java
@@ -18,21 +18,18 @@
 package io.bitsquare.gui;
 
 import io.bitsquare.BitsquareException;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.util.Utilities;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-import java.io.IOException;
-
 import javafx.application.Platform;
 import javafx.stage.Stage;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
 
 /**
  * There is no JavaFX support yet, so we need to use AWT.
@@ -58,7 +55,7 @@ public class SystemTray {
         systemTray = new SystemTray(stage, onExit);
     }
 
-    public SystemTray(Stage stage, Runnable onExit) {
+    private SystemTray(Stage stage, Runnable onExit) {
         this.stage = stage;
         this.onExit = onExit;
         init();
@@ -116,11 +113,11 @@ public class SystemTray {
         toggleShowHideItem.addActionListener(e -> {
             if (stage.isShowing()) {
                 toggleShowHideItem.setLabel(SHOW_WINDOW_LABEL);
-                Platform.runLater(stage::hide);
+                UserThread.execute(stage::hide);
             }
             else {
                 toggleShowHideItem.setLabel(HIDE_WINDOW_LABEL);
-                Platform.runLater(stage::show);
+                UserThread.execute(stage::show);
             }
         });
 
diff --git a/gui/src/main/java/io/bitsquare/gui/bitsquare.css b/gui/src/main/java/io/bitsquare/gui/bitsquare.css
index 5129531397..cf0c420d8d 100644
--- a/gui/src/main/java/io/bitsquare/gui/bitsquare.css
+++ b/gui/src/main/java/io/bitsquare/gui/bitsquare.css
@@ -17,23 +17,31 @@ upper border on tab: cfcfcf
 lower border on tab: b5b5b5
 upper gradient color on tab: d3d3d3
 lower gradient color on tab: dddddd
+bg color of non edit textFields: fafafa
 */
 
+/* Splash */
+
 .root {
     -bs-grey: #666666;
-    -bs-light-grey: #cccccc;
     -bs-bg-grey: #dddddd;
-    -bs-bg-green: #00aa33;
-    -bs-error-red: #dd0000;
+    -bs-light-grey: #cccccc;
+    -bs-content-bg-grey: #f4f4f4;
+    -bs-very-light-grey: #f8f8f8;
 
     -fx-accent: #0f87c3;
+    -bs-green: #00aa33;
+    -bs-error-red: #dd0000;
+
+    -bs-blue-transparent: #0f87c344;
+    -bs-green-transparent: #00aa3344;
+
     -fx-default-button: derive(-fx-accent, 95%);
     -fx-focus-color: -fx-accent;
     -fx-faint-focus-color: #0f87c322;
     -fx-selection-bar: derive(-fx-accent, 50%);
 }
 
-/* Splash */
 #splash {
     -fx-background-color: #ffffff;
 }
@@ -44,7 +52,7 @@ lower gradient color on tab: dddddd
 
 #splash-bitcoin-network-label {
     -fx-text-fill: -fx-accent;
-    -fx-weight: bold;
+    -fx-font-weight: bold;
 }
 
 /* Main UI */
@@ -53,7 +61,7 @@ lower gradient color on tab: dddddd
 }
 
 #content-pane {
-    -fx-background-color: #f4f4f4;
+    -fx-background-color: -bs-content-bg-grey;
 }
 
 #footer-pane {
@@ -97,9 +105,8 @@ lower gradient color on tab: dddddd
 }
 
 #nav-balance-label {
-    -fx-font-weight: bold;
+    -fx-font-size: 10;
     -fx-alignment: center;
-    -fx-background-color: #dddddd;
 }
 
 #nav-alert-label {
@@ -221,12 +228,9 @@ textfield */
     -fx-fill: black;
 }
 
-.table-view .table-row-cell .copy-icon .text {
-    -fx-fill: -fx-accent;
-}
-
+.table-view .table-row-cell .copy-icon .text,
 .table-view .table-row-cell .copy-icon .text:hover {
-    -fx-fill: black;
+    -fx-fill: -fx-accent;
 }
 
 .table-view .table-row-cell:selected .copy-icon .text {
@@ -237,22 +241,31 @@ textfield */
     -fx-fill: black;
 }
 
-.table-view .table-row-cell .hyperlink .text {
-    -fx-fill: -fx-accent;
-}
-
-.table-view .table-row-cell .hyperlink .text:hover {
-    -fx-fill: black;
-}
-
 .table-view .table-row-cell:selected .hyperlink .text {
     -fx-fill: white;
 }
 
+.table-view .table-row-cell .hyperlink .text {
+    -fx-fill: -fx-accent;
+}
+
+.table-view .table-row-cell .hyperlink .text:hover,
+.table-view .table-row-cell:selected .hyperlink .tooltip .text,
 .table-view .table-row-cell:selected .hyperlink .text:hover {
     -fx-fill: black;
 }
 
+.table-view .table-row-cell .hyperlink:hover,
+.table-view .table-row-cell .hyperlink:visited,
+.table-view .table-row-cell .hyperlink:hover:visited {
+    -fx-underline: false;
+}
+
+.table-view .table-row-cell .hyperlink:focused {
+    -fx-border-style: none;
+    -fx-border-width: 0px;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Icons                                                                     *
@@ -269,7 +282,7 @@ textfield */
 }
 
 #clickable-icon:hover {
-    -fx-text-fill: #666666;
+    -fx-text-fill: -bs-grey;
 }
 
 /*******************************************************************************
@@ -364,12 +377,21 @@ textfield */
     -fx-border-insets: 0 0 0 -2;
 }
 
+#currency-info-label-disabled {
+    -fx-border-radius: 0 4 4 0;
+    -fx-padding: 4 4 4 4;
+    -fx-background-color: #e0e0e0;
+    -fx-border-color: #e0e0e0;
+    -fx-border-style: solid solid solid none;
+    -fx-border-insets: 0 0 0 -2;
+}
+
 #totals-separator {
     -fx-background: #AAAAAA;
 }
 
 #payment-info {
-    -fx-background-color: #f4f4f4;
+    -fx-background-color: -bs-content-bg-grey;
 }
 
 /* Account setup */
@@ -404,8 +426,8 @@ textfield */
 }
 
 #wizard-item-background-deactivated {
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
-    -fx-outer-border: linear-gradient(to bottom, #dddddd, #ccc);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #F0F0F0);
+    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, #ccc);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
     -fx-inner-border,
@@ -426,7 +448,7 @@ textfield */
 }
 
 #wizard-item-background-completed {
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #F0F0F0);
     -fx-outer-border: linear-gradient(to bottom, #99ba9c, #619865);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
@@ -456,8 +478,8 @@ textfield */
 }
 
 #account-settings-item-background-disabled {
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
-    -fx-outer-border: linear-gradient(to bottom, #dddddd, #ccc);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #F0F0F0);
+    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, #ccc);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
     -fx-inner-border,
@@ -467,8 +489,8 @@ textfield */
 }
 
 #account-settings-item-background-active {
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
-    -fx-outer-border: linear-gradient(to bottom, #dddddd, #ccc);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #F0F0F0);
+    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, #ccc);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
     -fx-inner-border,
@@ -491,8 +513,8 @@ textfield */
 /* Pending trades */
 #trade-wizard-item-background-disabled {
     -fx-text-fill: -bs-grey;
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
-    -fx-outer-border: linear-gradient(to bottom, #dddddd, #ccc);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #F0F0F0);
+    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, #ccc);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
     -fx-inner-border,
@@ -515,7 +537,7 @@ textfield */
 }
 
 #trade-wizard-item-background-completed {
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #E1E9E1);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #E1E9E1);
     -fx-outer-border: linear-gradient(to bottom, #99ba9c, #619865);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
@@ -530,19 +552,19 @@ textfield */
     -fx-font-weight: bold;
     -fx-font-size: 14;
     -fx-text-fill: -bs-grey;
-    -fx-background-color: #f4f4f4;
+    -fx-background-color: -bs-content-bg-grey;
 }
 
 #titled-group-bg-label-active {
     -fx-font-weight: bold;
     -fx-font-size: 14;
     -fx-text-fill: -fx-accent;
-    -fx-background-color: #f4f4f4;
+    -fx-background-color: -bs-content-bg-grey;
 }
 
 #titled-group-bg {
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
-    -fx-outer-border: linear-gradient(to bottom, #dddddd, #ccc);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #F0F0F0);
+    -fx-outer-border: linear-gradient(to bottom, -bs-bg-grey, #ccc);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
     -fx-inner-border,
@@ -552,7 +574,7 @@ textfield */
 }
 
 #titled-group-bg-active {
-    -fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
+    -fx-body-color: linear-gradient(to bottom, -bs-content-bg-grey, #F0F0F0);
     -fx-outer-border: linear-gradient(to bottom, #9bbdc9, #57acc9);
     -fx-background-color: -fx-shadow-highlight-color,
     -fx-outer-border,
@@ -562,9 +584,160 @@ textfield */
     -fx-background-radius: 3px, 3px, 2px, 1px;
 }
 
-/* TitledSeparator */
-#titled-separator:horizontal .line {
-    -fx-border-color: transparent #f4f4f4 transparent #f4f4f4;
-    -fx-background-color: transparent;
-    -fx-border-width: 10px;
+/* TableGroupHeadline */
+#table-group-headline {
+    -fx-background-color: -bs-content-bg-grey;
+    -fx-background-insets: 10 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
+}
+
+/* copied form modena.css text-input */
+#flowpane-checkboxes-bg {
+    -fx-text-fill: -fx-text-inner-color;
+    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
+    -fx-highlight-text-fill: -fx-text-inner-color;
+    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
+    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
+    -fx-background-insets: 0, 1;
+    -fx-background-radius: 3, 2;
+    -fx-padding: 0.333333em 0.583em 0.333333em 0.583em; /* 4 7 4 7 */
+}
+
+#flowpane-checkboxes-non-editable-bg {
+    -fx-text-fill: -fx-text-inner-color;
+    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
+    -fx-highlight-text-fill: -fx-text-inner-color;
+    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
+    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -bs-very-light-grey);
+    -fx-background-insets: 0, 1;
+    -fx-background-radius: 3, 2;
+    -fx-padding: 0.333333em 0.583em 0.333333em 0.583em; /* 4 7 4 7 */
+}
+
+/* message-list-view*/
+#message-list-view.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
+    -fx-background-color: white;
+}
+
+#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-background-color: white;
+}
+
+#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled {
+    -fx-background-color: white;
+}
+
+#message-list-view.list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
+    -fx-background-color: white;
+}
+
+#message-list-view.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-background-color: white;
+}
+
+#message-list-view.list-cell {
+    -fx-padding: 0.25em 0.583em 0.25em 0.583em;
+}
+
+#message-list-view.list-view {
+    -fx-background-color: -fx-box-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+    -fx-padding: 1;
+}
+
+#message-list-view.list-view:focused {
+    -fx-background-color: -fx-box-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+    -fx-padding: 1;
+}
+
+/* bubble */
+#message-bubble-green {
+    -fx-background-color: -bs-green;
+    -fx-background-radius: 10 10 10 10;
+}
+
+#message-bubble-blue {
+    -fx-background-color: -fx-accent;
+    -fx-background-radius: 10 10 10 10;
+}
+
+#message-bubble-grey {
+    -fx-background-color: -bs-light-grey;
+    -fx-background-radius: 10 10 10 10;
+}
+
+.attachment-icon {
+    -fx-text-fill: white;
+    -fx-cursor: hand;
+}
+
+.attachment-icon-black {
+    -fx-text-fill: black;
+    -fx-cursor: hand;
+}
+
+/********************************************************************************************************************
+ *
+ * Text validation
+ *
+ ********************************************************************************************************************/
+
+.text-field.validation_error, .text-area.validation_error .content, .date-picker.validation_error > .text-field {
+    -fx-background-color: red,
+    linear-gradient(
+            to bottom,
+            derive(#ff8986, 40%) 5%,
+            derive(#ff8986, 70%) 40%
+    );
+}
+
+/********************************************************************************************************************
+ *
+ * Chart
+ *
+ ********************************************************************************************************************/
+
+#charts .chart-legend {
+    -fx-font-size: 14;
+    -fx-alignment: center;
+}
+
+#charts .axis {
+    -fx-tick-label-fill: black;
+}
+
+#charts .chart-plot-background {
+    -fx-background-color: white;
+}
+
+#charts .default-color0.chart-area-symbol {
+    -fx-background-color: -bs-green, white;
+}
+
+#charts .default-color1.chart-area-symbol {
+    -fx-background-color: -fx-accent, white;
+}
+
+#charts .default-color0.chart-series-area-line {
+    -fx-stroke: -bs-green;
+}
+
+#charts .default-color1.chart-series-area-line {
+    -fx-stroke: -fx-accent;
+}
+
+#charts .default-color0.chart-series-area-fill {
+    -fx-fill: -bs-green-transparent;
+}
+
+#charts .default-color1.chart-series-area-fill {
+    -fx-fill: -bs-blue-transparent;
+}
+
+#charts .axis-label {
+    -fx-font-size: 16;
+    -fx-alignment: center;
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java b/gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java
index 5c931e4c85..6de5011659 100644
--- a/gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java
+++ b/gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java
@@ -22,18 +22,13 @@ import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.common.view.View;
 import io.bitsquare.gui.common.view.ViewFactory;
 import io.bitsquare.gui.common.view.ViewLoader;
-
-import java.io.IOException;
-
-import java.net.URL;
-
-import java.util.ResourceBundle;
+import javafx.fxml.FXMLLoader;
+import org.springframework.core.annotation.AnnotationUtils;
 
 import javax.inject.Inject;
-
-import javafx.fxml.FXMLLoader;
-
-import org.springframework.core.annotation.AnnotationUtils;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ResourceBundle;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.springframework.core.annotation.AnnotationUtils.getDefaultValue;
@@ -92,7 +87,7 @@ public class FxmlViewLoader implements ViewLoader {
         }
     }
 
-    public View loadFromFxml(URL fxmlUrl) {
+    private View loadFromFxml(URL fxmlUrl) {
         checkNotNull(fxmlUrl, "FXML URL must not be null");
         try {
             FXMLLoader loader = new FXMLLoader(fxmlUrl, resourceBundle);
diff --git a/gui/src/main/java/io/bitsquare/gui/common/model/Activatable.java b/gui/src/main/java/io/bitsquare/gui/common/model/Activatable.java
index f05b6283cb..9d7a0afca0 100644
--- a/gui/src/main/java/io/bitsquare/gui/common/model/Activatable.java
+++ b/gui/src/main/java/io/bitsquare/gui/common/model/Activatable.java
@@ -19,18 +19,18 @@ package io.bitsquare.gui.common.model;
 
 public interface Activatable {
 
-    void activate();
+    void _activate();
 
-    void deactivate();
+    void _deactivate();
 
 
     Activatable NOOP_INSTANCE = new Activatable() {
         @Override
-        public void activate() {
+        public void _activate() {
         }
 
         @Override
-        public void deactivate() {
+        public void _deactivate() {
         }
     };
 
diff --git a/gui/src/main/java/io/bitsquare/gui/common/model/ActivatableWithDataModel.java b/gui/src/main/java/io/bitsquare/gui/common/model/ActivatableWithDataModel.java
index 85b0ec83a2..b5bfe9bb6e 100644
--- a/gui/src/main/java/io/bitsquare/gui/common/model/ActivatableWithDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/common/model/ActivatableWithDataModel.java
@@ -17,27 +17,27 @@
 
 package io.bitsquare.gui.common.model;
 
-public abstract class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {
+public class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {
 
     public ActivatableWithDataModel(D dataModel) {
         super(dataModel);
     }
 
     @Override
-    public final void activate() {
-        dataModel.activate();
-        this.doActivate();
+    public final void _activate() {
+        dataModel._activate();
+        this.activate();
     }
 
-    protected void doActivate() {
+    protected void activate() {
     }
 
     @Override
-    public final void deactivate() {
-        dataModel.deactivate();
-        this.doDeactivate();
+    public final void _deactivate() {
+        dataModel._deactivate();
+        this.deactivate();
     }
 
-    protected void doDeactivate() {
+    protected void deactivate() {
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/common/model/WithDataModel.java b/gui/src/main/java/io/bitsquare/gui/common/model/WithDataModel.java
index 4919beed4a..c76577d4e3 100644
--- a/gui/src/main/java/io/bitsquare/gui/common/model/WithDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/common/model/WithDataModel.java
@@ -17,11 +17,15 @@
 
 package io.bitsquare.gui.common.model;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public abstract class WithDataModel<D> {
+public class WithDataModel<D> {
+    protected final Logger log = LoggerFactory.getLogger(this.getClass());
 
-    protected final D dataModel;
+    public final D dataModel;
 
     protected WithDataModel(D dataModel) {
         this.dataModel = checkNotNull(dataModel, "Delegate object must not be null");
diff --git a/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableViewAndModel.java b/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableViewAndModel.java
index 4c7c2ef5e5..a45a63ae74 100644
--- a/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableViewAndModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/common/view/ActivatableViewAndModel.java
@@ -18,8 +18,7 @@
 package io.bitsquare.gui.common.view;
 
 import io.bitsquare.gui.common.model.Activatable;
-
-import javafx.scene.*;
+import javafx.scene.Node;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -34,20 +33,17 @@ public abstract class ActivatableViewAndModel<R extends Node, M extends Activata
     }
 
     @Override
-    public final void activate() {
-        model.activate();
-        this.doActivate();
-    }
-
-    protected void doActivate() {
-    }
-
-    @Override
-    public final void deactivate() {
-        model.deactivate();
-        this.doDeactivate();
-    }
-
-    protected void doDeactivate() {
+    protected void prepareInitialize() {
+        if (root != null) {
+            root.sceneProperty().addListener((ov, oldValue, newValue) -> {
+                if (oldValue == null && newValue != null) {
+                    model._activate();
+                    activate();
+                } else if (oldValue != null && newValue == null) {
+                    model._deactivate();
+                    deactivate();
+                }
+            });
+        }
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/common/view/ViewPath.java b/gui/src/main/java/io/bitsquare/gui/common/view/ViewPath.java
index dfdcd4ecdd..ee78309b90 100644
--- a/gui/src/main/java/io/bitsquare/gui/common/view/ViewPath.java
+++ b/gui/src/main/java/io/bitsquare/gui/common/view/ViewPath.java
@@ -20,7 +20,6 @@ package io.bitsquare.gui.common.view;
 import io.bitsquare.app.Version;
 
 import java.io.Serializable;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -30,7 +29,7 @@ public class ViewPath extends ArrayList<Class<? extends View>> implements Serial
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = Version.LOCAL_DB_VERSION;
 
-    public ViewPath() {
+    private ViewPath() {
     }
 
     public ViewPath(Collection<? extends Class<? extends View>> c) {
diff --git a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java
index f05067e331..e97079313f 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java
@@ -17,37 +17,34 @@
 
 package io.bitsquare.gui.components;
 
-import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.util.GUIUtil;
-import io.bitsquare.util.Utilities;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.uri.BitcoinURI;
-
-import java.io.ByteArrayInputStream;
-
-import java.net.URI;
-
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.gui.main.MainView;
+import io.bitsquare.gui.popups.Popup;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.scene.control.*;
-import javafx.scene.image.*;
-import javafx.scene.layout.*;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.Pane;
 import javafx.stage.Window;
-
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
-
 import net.glxn.qrgen.QRCode;
 import net.glxn.qrgen.image.ImageType;
-
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.uri.BitcoinURI;
 import org.controlsfx.control.PopOver;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+
 public class AddressTextField extends AnchorPane {
     private static final Logger log = LoggerFactory.getLogger(AddressTextField.class);
 
@@ -71,8 +68,8 @@ public class AddressTextField extends AnchorPane {
                 Utilities.openURI(URI.create(getBitcoinURI()));
             } catch (Exception e) {
                 log.warn(e.getMessage());
-                Popups.openWarningPopup("Warning", "Opening a system Bitcoin wallet application has failed. " +
-                        "Perhaps you don't have one installed?");
+                new Popup().warning("Opening a system Bitcoin wallet application has failed. " +
+                        "Perhaps you don't have one installed?").show();
             }
         });
         textField.focusTraversableProperty().set(focusTraversableProperty().get());
@@ -85,7 +82,7 @@ public class AddressTextField extends AnchorPane {
         AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
         copyIcon.setOnMouseClicked(e -> {
             if (address.get() != null && address.get().length() > 0)
-                GUIUtil.copyToClipboard(address.get());
+                Utilities.copyToClipboard(address.get());
         });
 
         Label qrCode = new Label();
@@ -111,15 +108,13 @@ public class AddressTextField extends AnchorPane {
                 PopOver popOver = new PopOver(pane);
                 popOver.setDetachedTitle("Scan QR code for this address");
                 popOver.setDetached(true);
-                popOver.setOnHiding(windowEvent -> {
-                    OverlayManager.removeBlurContent();
-                });
+                popOver.setOnHiding(windowEvent -> MainView.removeBlur());
 
                 Window window = getScene().getWindow();
                 double x = Math.round(window.getX() + (window.getWidth() - 320) / 2);
                 double y = Math.round(window.getY() + (window.getHeight() - 240) / 2);
                 popOver.show(getScene().getWindow(), x, y);
-                OverlayManager.blurContent();
+                MainView.blur();
             }
         });
 
diff --git a/gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java b/gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java
index b47d80a983..2be02fa638 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java
@@ -20,19 +20,24 @@ package io.bitsquare.gui.components;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.gui.util.BSFormatter;
-
+import javafx.scene.control.TextField;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.effect.Effect;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.paint.Color;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 
-import javafx.scene.control.*;
-import javafx.scene.effect.*;
-import javafx.scene.layout.*;
-import javafx.scene.paint.*;
-
 public class BalanceTextField extends AnchorPane {
 
-    private final TextField textField;
+    private static WalletService walletService;
 
+    public static void setWalletService(WalletService walletService) {
+        BalanceTextField.walletService = walletService;
+    }
+
+    private final TextField textField;
     private final Effect fundedEffect = new DropShadow(BlurType.THREE_PASS_BOX, Color.GREEN, 4, 0.0, 0, 0);
     private final Effect notFundedEffect = new DropShadow(BlurType.THREE_PASS_BOX, Color.ORANGERED, 4, 0.0, 0, 0);
     private BSFormatter formatter;
@@ -53,7 +58,7 @@ public class BalanceTextField extends AnchorPane {
         getChildren().addAll(textField);
     }
 
-    public void setup(WalletService walletService, Address address, BSFormatter formatter) {
+    public void setup(Address address, BSFormatter formatter) {
         this.formatter = formatter;
 
         walletService.addBalanceListener(new BalanceListener(address) {
diff --git a/gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java b/gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java
index bf2a4b3af3..6ca5ac9b75 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java
@@ -22,18 +22,25 @@ import io.bitsquare.btc.listeners.AddressConfidenceListener;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
-
+import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.effect.Effect;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.paint.Color;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.TransactionConfidence;
 
-import javafx.scene.control.*;
-import javafx.scene.effect.*;
-import javafx.scene.layout.*;
-import javafx.scene.paint.*;
-
 public class BalanceWithConfirmationTextField extends AnchorPane {
 
+    private static WalletService walletService;
+
+    public static void setWalletService(WalletService walletService) {
+        BalanceWithConfirmationTextField.walletService = walletService;
+    }
+
     private final TextField textField;
     private final Tooltip progressIndicatorTooltip;
     private final ConfidenceProgressIndicator progressIndicator;
@@ -70,7 +77,7 @@ public class BalanceWithConfirmationTextField extends AnchorPane {
         getChildren().addAll(textField, progressIndicator);
     }
 
-    public void setup(WalletService walletService, Address address, BSFormatter formatter) {
+    public void setup(Address address, BSFormatter formatter) {
         this.formatter = formatter;
         walletService.addAddressConfidenceListener(new AddressConfidenceListener(address) {
             @Override
diff --git a/gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java b/gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java
index ebfe09e91c..7dfde9ba2f 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java
@@ -17,27 +17,22 @@
 
 package io.bitsquare.gui.components;
 
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
+import io.bitsquare.common.UserThread;
 import io.bitsquare.locale.BSResources;
-
-import javafx.application.Platform;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.beans.value.ChangeListener;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.VPos;
-import javafx.scene.*;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.scene.text.*;
-
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
+import javafx.scene.Parent;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.control.OverrunStyle;
+import javafx.scene.layout.GridPane;
+import javafx.scene.text.TextFlow;
 
 /**
  * Convenience Component for info icon, info text and link display in a GridPane.
@@ -94,7 +89,7 @@ public class InfoDisplay extends Parent {
         testLabel.widthProperty().addListener((ov, o, n) -> {
             useReadMore = (double) n > textFlow.getWidth();
             link.setText(BSResources.get(useReadMore ? "shared.readMore" : "shared.openHelp"));
-            Platform.runLater(() -> textFlow.getChildren().setAll(label, link));
+            UserThread.execute(() -> textFlow.getChildren().setAll(label, link));
         });
 
         // update the width when the window gets resized
@@ -134,7 +129,7 @@ public class InfoDisplay extends Parent {
                 newValue.getWindow().widthProperty().addListener(listener);
                 // localToScene does deliver 0 instead of the correct x position when scene propery gets set,
                 // so we delay for 1 render cycle
-                Platform.runLater(() -> {
+                UserThread.execute(() -> {
                     label.setVisible(true);
                     label.prefWidthProperty().unbind();
                     label.setPrefWidth(newValue.getWindow().getWidth() - localToScene(0, 0).getX() - 35);
@@ -150,7 +145,7 @@ public class InfoDisplay extends Parent {
 
     public void setText(String text) {
         this.text.set(text);
-        Platform.runLater(() -> {
+        UserThread.execute(() -> {
             if (getScene() != null) {
                 label.setVisible(true);
                 label.prefWidthProperty().unbind();
diff --git a/gui/src/main/java/io/bitsquare/gui/components/Popups.java b/gui/src/main/java/io/bitsquare/gui/components/Popups.java
deleted file mode 100644
index 65d4c6f750..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/components/Popups.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * 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.components;
-
-import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.locale.BSResources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javafx.event.ActionEvent;
-import javafx.stage.Stage;
-
-import org.controlsfx.control.action.AbstractAction;
-import org.controlsfx.control.action.Action;
-import org.controlsfx.dialog.Dialog;
-import org.controlsfx.dialog.Dialogs;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Popups {
-    private static final Logger log = LoggerFactory.getLogger(Popups.class);
-
-    public static Stage primaryStage;
-
-    public static void removeBlurContent() {
-        OverlayManager.removeBlurContent();
-    }
-
-    // Information
-    public static void openInfoPopup(String message) {
-        openInfoPopup(null, message);
-    }
-
-    public static void openInfoPopup(String masthead, String message) {
-        OverlayManager.blurContent();
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.close")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "CLOSE");
-                Dialog.Actions.CLOSE.handle(actionEvent);
-            }
-        });
-        openInfoPopup(masthead, message, actions);
-    }
-
-    public static void openInfoPopup(String masthead, String message, List<Action> actions) {
-        Dialogs.create()
-                .owner(primaryStage)
-                .message(message)
-                .masthead(masthead)
-                .actions(actions)
-                .showInformation();
-        removeBlurContent();
-    }
-
-    // Confirm
-    public static Action openConfirmPopup(String title, String message) {
-        return openConfirmPopup(title, null, message);
-    }
-
-    public static Action openConfirmPopup(String title, String masthead, String message) {
-        OverlayManager.blurContent();
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.ok")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "OK");
-                Dialog.Actions.OK.handle(actionEvent);
-            }
-        });
-        actions.add(new AbstractAction(BSResources.get("shared.cancel")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "CANCEL");
-                Dialog.Actions.CANCEL.handle(actionEvent);
-            }
-        });
-        return openConfirmPopup(title, masthead, message, actions);
-    }
-
-    public static Action openConfirmPopup(String title, String masthead, String message, List<Action> actions) {
-        return Dialogs.create()
-                .owner(primaryStage)
-                .title(title)
-                .message(message)
-                .masthead(masthead)
-                .actions(actions)
-                .showConfirm();
-    }
-
-    // Warning
-    public static void openWarningPopup(String message) {
-        openWarningPopup("Warning", message);
-    }
-
-    public static void openWarningPopup(String title, String message) {
-        openWarningPopup(title, null, message);
-    }
-
-    public static void openWarningPopup(String title, String masthead, String message) {
-        OverlayManager.blurContent();
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.close")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "CLOSE");
-                Dialog.Actions.CLOSE.handle(actionEvent);
-            }
-        });
-        openWarningPopup(title, masthead, message, actions);
-    }
-
-    private static void openWarningPopup(String title, String masthead, String message, List<Action> actions) {
-        Dialogs.create()
-                .owner(primaryStage)
-                .title(title)
-                .message(message)
-                .masthead(masthead)
-                .actions(actions)
-                .showWarning();
-        removeBlurContent();
-    }
-
-    // Error
-    public static void openErrorPopup(String message) {
-        openErrorPopup("Error", message);
-    }
-
-    public static void openErrorPopup(String title, String message) {
-        openErrorPopup(title, null, message);
-    }
-
-    public static void openErrorPopup(String title, String masthead, String message) {
-        OverlayManager.blurContent();
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.close")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "CLOSE");
-                Dialog.Actions.CLOSE.handle(actionEvent);
-            }
-        });
-        openErrorPopup(title, masthead, message, actions);
-    }
-
-    private static void openErrorPopup(String title, String masthead, String message, List<Action> actions) {
-        Dialogs.create()
-                .owner(primaryStage)
-                .title(title)
-                .message(message)
-                .masthead(masthead)
-                .actions(actions)
-                .showError();
-        removeBlurContent();
-    }
-
-    // Exception
-    public static void openExceptionPopup(Throwable throwable) {
-        openExceptionPopup(throwable, "Exception", "That should not have happened...");
-    }
-
-    public static void openExceptionPopup(Throwable throwable, String title, String message) {
-        openExceptionPopup(throwable, title, null, message);
-    }
-
-    private static void openExceptionPopup(Throwable throwable, String title, String masthead, String message) {
-        OverlayManager.blurContent();
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.close")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "CLOSE");
-                Dialog.Actions.CLOSE.handle(actionEvent);
-            }
-        });
-        Dialogs.create()
-                .owner(primaryStage)
-                .title(title)
-                .message(message)
-                .masthead(masthead)
-                .actions(actions)
-                .showException(throwable);
-        removeBlurContent();
-    }
-
-
-    // custom
-    public static void openInsufficientMoneyPopup() {
-        openWarningPopup("Warning", "There is not enough money available",
-                "Please pay in first to your wallet.");
-    }
-
-    public static boolean isOK(Action response) {
-        return response.getProperties().get("type").equals("OK");
-    }
-
-    public static boolean isYes(Action response) {
-        return response.getProperties().get("type").equals("YES");
-    }
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java b/gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java
index 2b9ff467a0..7f1f969a59 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java
@@ -17,11 +17,10 @@
 
 package io.bitsquare.gui.components;
 
-import io.bitsquare.util.Utilities;
-
 import eu.hansolo.enzo.notification.Notification;
 import eu.hansolo.enzo.notification.NotificationBuilder;
 import eu.hansolo.enzo.notification.NotifierBuilder;
+import io.bitsquare.common.util.Utilities;
 
 /**
  * Not sure if we stick with the eu.hansolo.enzo.notification.Notification implementation, so keep it behind a service
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java b/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java
index 4834c98dd8..ff6f5946d7 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java
@@ -17,15 +17,15 @@
 
 package io.bitsquare.gui.components;
 
-import io.bitsquare.gui.util.GUIUtil;
-
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
 import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
+import io.bitsquare.common.util.Utilities;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.AnchorPane;
 
 public class TextFieldWithCopyIcon extends AnchorPane {
 
@@ -45,7 +45,7 @@ public class TextFieldWithCopyIcon extends AnchorPane {
         AnchorPane.setRightAnchor(copyIcon, 0.0);
         copyIcon.setOnMouseClicked(e -> {
             if (getText() != null && getText().length() > 0)
-                GUIUtil.copyToClipboard(getText());
+                Utilities.copyToClipboard(getText());
         });
         TextField txIdLabel = new TextField();
         txIdLabel.setEditable(false);
@@ -63,7 +63,7 @@ public class TextFieldWithCopyIcon extends AnchorPane {
     // Getter/Setter
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public String getText() {
+    private String getText() {
         return text.get();
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java b/gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java
index 9d55ed027d..6ed55eba38 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java
@@ -20,8 +20,9 @@ package io.bitsquare.gui.components;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.geometry.Insets;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 
 public class TitledGroupBg extends Pane {
 
@@ -50,7 +51,7 @@ public class TitledGroupBg extends Pane {
         label.setId("titled-group-bg-label");
     }
 
-    public void setActive() {
+    private void setActive() {
         setId("titled-group-bg-active");
         label.setId("titled-group-bg-label-active");
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TitledSeparator.java b/gui/src/main/java/io/bitsquare/gui/components/TitledSeparator.java
deleted file mode 100644
index ed878c5b24..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/components/TitledSeparator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.components;
-
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.geometry.Insets;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
-public class TitledSeparator extends Pane {
-
-    private final Label label;
-    private final StringProperty text = new SimpleStringProperty();
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public TitledSeparator() {
-        GridPane.setMargin(this, new Insets(-10, -10, -10, -10));
-        GridPane.setColumnSpan(this, 2);
-
-        Separator separator = new Separator();
-        separator.prefWidthProperty().bind(widthProperty());
-        separator.setLayoutX(0);
-        separator.setLayoutY(6);
-        separator.setId("titled-separator");
-
-        label = new Label();
-        label.textProperty().bind(text);
-        label.setLayoutX(8);
-        label.setLayoutY(-8);
-        label.setPadding(new Insets(0, 7, 0, 5));
-        setActive();
-        getChildren().addAll(separator, label);
-
-    }
-
-    public void setInactive() {
-        setId("titled-group-bg");
-        label.setId("titled-group-bg-label");
-    }
-
-    public void setActive() {
-        setId("titled-group-bg-active");
-        label.setId("titled-group-bg-label-active");
-    }
-
-    public String getText() {
-        return text.get();
-    }
-
-    public StringProperty textProperty() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text.set(text);
-    }
-
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java b/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
index 6fdb0528d9..68e1e9ce2d 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
@@ -17,32 +17,42 @@
 
 package io.bitsquare.gui.components;
 
-import io.bitsquare.btc.WalletService;
-import io.bitsquare.btc.listeners.TxConfidenceListener;
-import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
-import io.bitsquare.gui.util.GUIUtil;
-import io.bitsquare.util.Utilities;
-
-import org.bitcoinj.core.TransactionConfidence;
-
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
 import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
-
+import io.bitsquare.btc.WalletService;
+import io.bitsquare.btc.listeners.TxConfidenceListener;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.user.Preferences;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.AnchorPane;
+import org.bitcoinj.core.TransactionConfidence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TxIdTextField extends AnchorPane {
     private static final Logger log = LoggerFactory.getLogger(TxIdTextField.class);
 
+    private static Preferences preferences;
+
+    public static void setPreferences(Preferences preferences) {
+        TxIdTextField.preferences = preferences;
+    }
+
+    private static WalletService walletService;
+
+    public static void setWalletService(WalletService walletService) {
+        TxIdTextField.walletService = walletService;
+    }
+
     private final TextField textField;
     private final Tooltip progressIndicatorTooltip;
     private final ConfidenceProgressIndicator progressIndicator;
     private final Label copyIcon;
     private TxConfidenceListener txConfidenceListener;
-    private WalletService walletService;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -80,8 +90,8 @@ public class TxIdTextField extends AnchorPane {
         getChildren().addAll(textField, copyIcon, progressIndicator);
     }
 
-    public void setup(WalletService walletService, String txID) {
-        this.walletService = walletService;
+
+    public void setup(String txID) {
         if (txConfidenceListener != null)
             walletService.removeTxConfidenceListener(txConfidenceListener);
 
@@ -97,18 +107,16 @@ public class TxIdTextField extends AnchorPane {
         textField.setText(txID);
         textField.setOnMouseClicked(mouseEvent -> {
             try {
-                // TODO get the url form the app preferences
-                Utilities.openWebPage("https://www.biteasy.com/testnet/transactions/" + txID);
-                // https://insight.bitpay.com/ only mainnet?
-                //Utilities.openURL("https://blockchain.info/tx/" + txID);
+                if (preferences != null)
+                    Utilities.openWebPage(preferences.getBlockChainExplorer().txUrl + txID);
             } catch (Exception e) {
                 log.error(e.getMessage());
-                Popups.openWarningPopup("Warning", "Opening browser failed. Please check your internet " +
-                        "connection.");
+                new Popup().warning("Opening browser failed. Please check your internet " +
+                        "connection.").show();
             }
         });
 
-        copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(txID));
+        copyIcon.setOnMouseClicked(e -> Utilities.copyToClipboard(txID));
     }
 
     public void cleanup() {
diff --git a/gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java b/gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
index 2dd2bab91d..9bd2b4ff02 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
@@ -26,14 +26,14 @@
 package io.bitsquare.gui.components.confidence;
 
 import io.bitsquare.gui.components.confidence.skin.ConfidenceProgressIndicatorSkin;
-
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.css.PseudoClass;
 import javafx.css.StyleableProperty;
-import javafx.scene.control.*;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
 
 // TODO Copied form OpenJFX, check license issues and way how we integrated it
 // We changed behaviour which was not exposed via APIs
@@ -45,22 +45,22 @@ import javafx.scene.control.*;
  * <p>
  * ProgressIndicator sets focusTraversable to false.
  * </p>
- * <p/>
- * <p/>
+ * <p>
+ * <p>
  * This first example creates a ProgressIndicator with an indeterminate value :
  * <pre><code>
  * import javafx.scene.control.ProgressIndicator;
  * ProgressIndicator p1 = new ProgressIndicator();
  * </code></pre>
- * <p/>
- * <p/>
+ * <p>
+ * <p>
  * This next example creates a ProgressIndicator which is 25% complete :
  * <pre><code>
  * import javafx.scene.control.ProgressIndicator;
  * ProgressIndicator p2 = new ProgressIndicator();
  * p2.setProgress(0.25F);
  * </code></pre>
- * <p/>
+ * <p>
  * Implementation of ProgressIndicator According to JavaFX UI Control API Specification
  *
  * @since JavaFX 2.0
@@ -83,7 +83,7 @@ public class ConfidenceProgressIndicator extends Control {
      **************************************************************************/
     /**
      * Initialize the style class to 'progress-indicator'.
-     * <p/>
+     * <p>
      * This is the selector class from which CSS can be used to style
      * this control.
      */
diff --git a/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java b/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
index 07ea85385d..7bbb4b1f41 100644
--- a/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
+++ b/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
@@ -17,11 +17,12 @@
 
 package io.bitsquare.gui.components.processbar;
 
-import java.util.List;
-
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import javafx.scene.control.*;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+
+import java.util.List;
 
 public class ProcessStepBar<T> extends Control {
 
@@ -65,7 +66,7 @@ public class ProcessStepBar<T> extends Control {
             ((ProcessStepBarSkin) getSkin()).setProcessStepItems(processStepItems);
     }
 
-    public void setSelectedIndex(int selectedIndex) {
+    private void setSelectedIndex(int selectedIndex) {
         this.selectedIndex.set(selectedIndex);
         if (getSkin() != null)
             ((ProcessStepBarSkin) getSkin()).setSelectedIndex(selectedIndex);
diff --git a/gui/src/main/java/io/bitsquare/gui/images.css b/gui/src/main/java/io/bitsquare/gui/images.css
index 880d3e2329..557e00ad85 100644
--- a/gui/src/main/java/io/bitsquare/gui/images.css
+++ b/gui/src/main/java/io/bitsquare/gui/images.css
@@ -14,6 +14,10 @@
     -fx-image: url("../../../images/info.png");
 }
 
+#light_close {
+    -fx-image: url("../../../images/light_close.png");
+}
+
 #image-alert-round {
     -fx-image: url("../../../images/alert_round.png");
 }
@@ -47,12 +51,12 @@
 }
 
 /* navigation buttons */
-#image-nav-home {
-    -fx-image: url("../../../images/nav/home.png");
+#image-nav-market {
+    -fx-image: url("../../../images/nav/market.png");
 }
 
-#image-nav-home-active {
-    -fx-image: url("../../../images/nav/home_active.png");
+#image-nav-market-active {
+    -fx-image: url("../../../images/nav/market_active.png");
 }
 
 #image-nav-buyoffer {
@@ -87,12 +91,12 @@
     -fx-image: url("../../../images/nav/funds_active.png");
 }
 
-#image-nav-msg {
-    -fx-image: url("../../../images/nav/msg.png");
+#image-nav-disputes {
+    -fx-image: url("../../../images/nav/disputes.png");
 }
 
-#image-nav-msg-active {
-    -fx-image: url("../../../images/nav/msg_active.png");
+#image-nav-disputes-active {
+    -fx-image: url("../../../images/nav/disputes_active.png");
 }
 
 #image-nav-settings {
@@ -169,4 +173,25 @@
 
 #image-offer_state_not_available {
     -fx-image: url("../../../images/offer/offer_state_not_available.png");
-}
\ No newline at end of file
+}
+
+#image-attachment {
+    -fx-image: url("../../../images/attachment.png");
+}
+
+#bubble_arrow_grey_left {
+    -fx-image: url("../../../images/bubble_arrow_grey_left.png");
+}
+
+#bubble_arrow_blue_left {
+    -fx-image: url("../../../images/bubble_arrow_blue_left.png");
+}
+
+#bubble_arrow_grey_right {
+    -fx-image: url("../../../images/bubble_arrow_grey_right.png");
+}
+
+#bubble_arrow_blue_right {
+    -fx-image: url("../../../images/bubble_arrow_blue_right.png");
+}
+
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.fxml b/gui/src/main/java/io/bitsquare/gui/main/MainView.fxml
index e907bbf155..f9028f5423 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.fxml
@@ -16,8 +16,7 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.StackPane?>
 <StackPane fx:id="root" fx:controller="io.bitsquare.gui.main.MainView"
-           prefHeight="750" prefWidth="1000" stylesheets="/io/bitsquare/gui/bitsquare.css"
            xmlns:fx="http://javafx.com/fxml">
 </StackPane>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java
index f5d2cc6009..69f04bc6f8 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -18,43 +18,35 @@
 package io.bitsquare.gui.main;
 
 import io.bitsquare.BitsquareException;
-import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.util.Tuple2;
+import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.InitializableView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
-import io.bitsquare.gui.components.Popups;
+import io.bitsquare.gui.common.view.*;
 import io.bitsquare.gui.components.SystemNotification;
 import io.bitsquare.gui.main.account.AccountView;
+import io.bitsquare.gui.main.disputes.DisputesView;
 import io.bitsquare.gui.main.funds.FundsView;
-import io.bitsquare.gui.main.home.HomeView;
-import io.bitsquare.gui.main.msg.MsgView;
+import io.bitsquare.gui.main.market.MarketView;
 import io.bitsquare.gui.main.offer.BuyOfferView;
 import io.bitsquare.gui.main.offer.SellOfferView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.settings.SettingsView;
+import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.Transitions;
-import io.bitsquare.util.Utilities;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.*;
 import javafx.scene.control.*;
-import javafx.scene.effect.*;
-import javafx.scene.image.*;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.*;
-import javafx.scene.paint.*;
-import javafx.scene.text.*;
+import javafx.scene.paint.Color;
+import javafx.scene.text.TextAlignment;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.util.List;
 
 import static javafx.scene.layout.AnchorPane.*;
 
@@ -63,11 +55,27 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
 
     public static final String TITLE_KEY = "view.title";
 
+    public static BorderPane getBaseApplicationContainer() {
+        return baseApplicationContainer;
+    }
+
+    public static void blur() {
+        transitions.blur(baseApplicationContainer);
+    }
+
+    public static void blurLight() {
+        transitions.blur(baseApplicationContainer, Transitions.DEFAULT_DURATION, true, false, 5);
+    }
+
+    public static void removeBlur() {
+        transitions.removeBlur(baseApplicationContainer);
+    }
+
     private final ToggleGroup navButtons = new ToggleGroup();
 
     private final ViewLoader viewLoader;
     private final Navigation navigation;
-    private final Transitions transitions;
+    private static Transitions transitions;
     private final String title;
     private ChangeListener<String> walletServiceErrorMsgListener;
     private ChangeListener<String> blockchainSyncIconIdListener;
@@ -84,6 +92,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
     private Label updateInfoLabel;
     private List<String> persistedFilesCorrupted;
     private Tooltip downloadButtonTooltip;
+    private static BorderPane baseApplicationContainer;
 
     @Inject
     public MainView(MainViewModel model, CachingViewLoader viewLoader, Navigation navigation, Transitions transitions,
@@ -91,36 +100,36 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         super(model);
         this.viewLoader = viewLoader;
         this.navigation = navigation;
-        this.transitions = transitions;
+        MainView.transitions = transitions;
         this.title = title;
     }
 
     @Override
     protected void initialize() {
-        ToggleButton homeButton = new NavButton(HomeView.class, "Overview") {{
-            setDisable(true); // TODO for alpha
-        }};
+        ToggleButton marketButton = new NavButton(MarketView.class, "Market");
         ToggleButton buyButton = new NavButton(BuyOfferView.class, "Buy BTC");
         ToggleButton sellButton = new NavButton(SellOfferView.class, "Sell BTC");
         ToggleButton portfolioButton = new NavButton(PortfolioView.class, "Portfolio");
         ToggleButton fundsButton = new NavButton(FundsView.class, "Funds");
-        ToggleButton msgButton = new NavButton(MsgView.class, "Messages") {{
-            setDisable(true); // TODO for alpha
-        }};
+        ToggleButton disputesButton = new NavButton(DisputesView.class, "Support");
         ToggleButton settingsButton = new NavButton(SettingsView.class, "Settings");
-        ToggleButton accountButton = new NavButton(AccountView.class, "Account") {{
-            setDisable(true); // TODO for alpha
-        }};
+        ToggleButton accountButton = new NavButton(AccountView.class, "Account");
         Pane portfolioButtonHolder = new Pane(portfolioButton);
-        Pane bankAccountComboBoxHolder = new Pane();
+        Pane disputesButtonHolder = new Pane(disputesButton);
 
-        HBox leftNavPane = new HBox(homeButton, buyButton, sellButton, portfolioButtonHolder, fundsButton, new Pane(msgButton)) {{
+        HBox leftNavPane = new HBox(marketButton, buyButton, sellButton, portfolioButtonHolder, fundsButton, disputesButtonHolder) {{
             setSpacing(10);
             setLeftAnchor(this, 10d);
             setTopAnchor(this, 0d);
         }};
 
-        HBox rightNavPane = new HBox(bankAccountComboBoxHolder, settingsButton, accountButton) {{
+        Tuple2<TextField, VBox> availableBalanceBox = getBalanceBox("Available balance");
+        availableBalanceBox.first.textProperty().bind(model.availableBalance);
+
+        Tuple2<TextField, VBox> lockedBalanceBox = getBalanceBox("Locked balance");
+        lockedBalanceBox.first.textProperty().bind(model.lockedBalance);
+
+        HBox rightNavPane = new HBox(availableBalanceBox.second, lockedBalanceBox.second, settingsButton, accountButton) {{
             setSpacing(10);
             setRightAnchor(this, 10d);
             setTopAnchor(this, 0d);
@@ -138,13 +147,15 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
             setId("content-pane");
         }};
 
-        BorderPane baseApplicationContainer = new BorderPane(applicationContainer) {{
+        baseApplicationContainer = new BorderPane(applicationContainer) {{
             setId("base-content-container");
         }};
         baseApplicationContainer.setBottom(createFooter());
 
         setupNotificationIcon(portfolioButtonHolder);
 
+        setupDisputesIcon(disputesButtonHolder);
+
         navigation.addListener(viewPath -> {
             if (viewPath.size() != 2 || viewPath.indexOf(MainView.class) != 0)
                 return;
@@ -161,25 +172,21 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
                     .setSelected(true);
         });
 
-        configureBlurring(baseApplicationContainer);
-
         VBox splashScreen = createSplashScreen();
 
         root.getChildren().addAll(baseApplicationContainer, splashScreen);
 
         model.showAppScreen.addListener((ov, oldValue, newValue) -> {
             if (newValue) {
-                bankAccountComboBoxHolder.getChildren().setAll(createBankAccountComboBox());
-
                 navigation.navigateToPreviousVisitedView();
 
                 if (!persistedFilesCorrupted.isEmpty()) {
                     // show warning that some files has been corrupted
-                    Popups.openWarningPopup("Those data base file(s) are not compatible with our current code base." +
+                    new Popup().warning("Those data base file(s) are not compatible with our current code base." +
                                     "\n" + persistedFilesCorrupted.toString() +
                                     "\n\nWe made a backup of the corrupted file(s) and applied the default values." +
                                     "\n\nThe backup is located at: [data directory]/db/corrupted"
-                    );
+                    ).show();
                 }
 
                 transitions.fadeOutAndRemove(splashScreen, 1500, actionEvent -> disposeSplashScreen());
@@ -187,7 +194,26 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         });
 
         // Delay a bit to give time for rendering the splash screen
-        Platform.runLater(model::initBackend);
+        UserThread.execute(model::initializeAllServices);
+    }
+
+    private Tuple2<TextField, VBox> getBalanceBox(String text) {
+        TextField textField = new TextField();
+        textField.setEditable(false);
+        textField.setPrefWidth(100);
+        textField.setMouseTransparent(true);
+        textField.setFocusTraversable(false);
+        textField.setStyle("-fx-alignment: center;  -fx-background-color: white;");
+
+        Label label = new Label(text);
+        label.setId("nav-balance-label");
+        label.setPadding(new Insets(0, 5, 0, 5));
+        label.setPrefWidth(textField.getPrefWidth());
+        VBox vBox = new VBox();
+        vBox.setSpacing(3);
+        vBox.setPadding(new Insets(11, 0, 0, 0));
+        vBox.getChildren().addAll(textField, label);
+        return new Tuple2(textField, vBox);
     }
 
     public void setPersistedFilesCorrupted(List<String> persistedFilesCorrupted) {
@@ -209,7 +235,6 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         blockchainSyncLabel.textProperty().bind(model.blockchainSyncInfo);
         walletServiceErrorMsgListener = (ov, oldValue, newValue) -> {
             blockchainSyncLabel.setId("splash-error-state-msg");
-            // error popup is called by error handler at createFooter
         };
         model.walletServiceErrorMsg.addListener(walletServiceErrorMsgListener);
 
@@ -258,7 +283,6 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         bootstrapErrorMsgListener = (ov, oldValue, newValue) -> {
             bootstrapStateLabel.setId("splash-error-state-msg");
             bootstrapIndicator.setVisible(false);
-            // error popup is handled by handler at createFooter
         };
         model.bootstrapErrorMsg.addListener(bootstrapErrorMsgListener);
 
@@ -353,6 +377,8 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         downloadButton.visibleProperty().unbind();
         downloadButton.managedProperty().unbind();
         downloadButtonTooltip.textProperty().unbind();
+
+        model.onSplashScreenRemoved();
     }
 
 
@@ -424,7 +450,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         bootstrapLabel.setId("footer-pane");
         setRightAnchor(bootstrapLabel, 100d);
         setBottomAnchor(bootstrapLabel, 7d);
-        bootstrapLabel.textProperty().bind(model.bootstrapInfoFooter);
+        bootstrapLabel.textProperty().bind(model.p2pNetworkInfoFooter);
 
         ImageView bootstrapIcon = new ImageView();
         setRightAnchor(bootstrapIcon, 60d);
@@ -435,18 +461,18 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         numPeersLabel.setId("footer-num-peers");
         setRightAnchor(numPeersLabel, 10d);
         setBottomAnchor(numPeersLabel, 7d);
-        numPeersLabel.textProperty().bind(model.numDHTPeers);
+        numPeersLabel.textProperty().bind(model.numP2PNetworkPeers);
         model.bootstrapErrorMsg.addListener((ov, oldValue, newValue) -> {
             if (newValue != null) {
                 bootstrapLabel.setId("splash-error-state-msg");
                 bootstrapLabel.textProperty().unbind();
                 bootstrapLabel.setText("Not connected");
-                Popups.openErrorPopup("Error", "Connecting to the P2P network failed. \n" + newValue
-                        + "\nPlease check your internet connection.");
+                new Popup().error("Connecting to the P2P network failed. \n" + newValue
+                        + "\nPlease check your internet connection.").show();
             }
             else {
                 bootstrapLabel.setId("footer-pane");
-                bootstrapLabel.textProperty().bind(model.bootstrapInfoFooter);
+                bootstrapLabel.textProperty().bind(model.p2pNetworkInfoFooter);
             }
         });
 
@@ -459,11 +485,11 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         return footerContainer;
     }
 
-    private void setupNotificationIcon(Pane portfolioButtonHolder) {
-        Label numPendingTradesLabel = new Label();
-        numPendingTradesLabel.textProperty().bind(model.numPendingTradesAsString);
-        numPendingTradesLabel.relocate(5, 1);
-        numPendingTradesLabel.setId("nav-alert-label");
+    private void setupNotificationIcon(Pane buttonHolder) {
+        Label label = new Label();
+        label.textProperty().bind(model.numPendingTradesAsString);
+        label.relocate(5, 1);
+        label.setId("nav-alert-label");
 
         ImageView icon = new ImageView();
         icon.setLayoutX(0.5);
@@ -473,60 +499,37 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         notification.relocate(30, 9);
         notification.setMouseTransparent(true);
         notification.setEffect(new DropShadow(4, 1, 2, Color.GREY));
-        notification.getChildren().addAll(icon, numPendingTradesLabel);
+        notification.getChildren().addAll(icon, label);
         notification.visibleProperty().bind(model.showPendingTradesNotification);
-        portfolioButtonHolder.getChildren().add(notification);
+        buttonHolder.getChildren().add(notification);
 
         model.showPendingTradesNotification.addListener((ov, oldValue, newValue) -> {
             if (newValue)
-                SystemNotification.openInfoNotification(title, "You got a new trade message.");
+                SystemNotification.openInfoNotification(title, "You received a new trade message.");
         });
     }
 
-    private VBox createBankAccountComboBox() {
-        final ComboBox<FiatAccount> comboBox = new ComboBox<>(model.getBankAccounts());
-        comboBox.setLayoutY(12);
-        comboBox.setVisibleRowCount(5);
-        comboBox.setConverter(model.getBankAccountsConverter());
-        comboBox.disableProperty().bind(model.bankAccountsComboBoxDisable);
-        comboBox.promptTextProperty().bind(model.bankAccountsComboBoxPrompt);
+    private void setupDisputesIcon(Pane buttonHolder) {
+        Label label = new Label();
+        label.textProperty().bind(model.numOpenDisputesAsString);
+        label.relocate(5, 1);
+        label.setId("nav-alert-label");
 
-        comboBox.getSelectionModel().selectedItemProperty().addListener((ov, oldValue, newValue) ->
-                model.setCurrentBankAccount(newValue));
+        ImageView icon = new ImageView();
+        icon.setLayoutX(0.5);
+        icon.setId("image-alert-round");
 
-        model.currentBankAccount.addListener((ov, oldValue, newValue) ->
-                comboBox.getSelectionModel().select(newValue));
-        comboBox.getSelectionModel().select(model.currentBankAccount.get());
+        Pane notification = new Pane();
+        notification.relocate(30, 9);
+        notification.setMouseTransparent(true);
+        notification.setEffect(new DropShadow(4, 1, 2, Color.GREY));
+        notification.getChildren().addAll(icon, label);
+        notification.visibleProperty().bind(model.showOpenDisputesNotification);
+        buttonHolder.getChildren().add(notification);
 
-        final Label titleLabel = new Label("Bank account");
-        titleLabel.setMouseTransparent(true);
-        titleLabel.setId("nav-button-label");
-        comboBox.widthProperty().addListener((ov, o, n) ->
-                titleLabel.setLayoutX(((double) n - titleLabel.getWidth()) / 2));
-
-        VBox vBox = new VBox();
-        vBox.setPadding(new Insets(12, 8, 0, 5));
-        vBox.setSpacing(2);
-        vBox.setAlignment(Pos.CENTER);
-        vBox.getChildren().setAll(comboBox, titleLabel);
-
-        // TODO for alpha
-        vBox.setDisable(true);
-
-        return vBox;
-    }
-
-    private void configureBlurring(Node node) {
-        OverlayManager.addListener(new OverlayManager.OverlayListener() {
-            @Override
-            public void onBlurContentRequested() {
-                transitions.blur(node);
-            }
-
-            @Override
-            public void onRemoveBlurContentRequested() {
-                transitions.removeBlur(node);
-            }
+        model.showOpenDisputesNotification.addListener((ov, oldValue, newValue) -> {
+            if (newValue)
+                SystemNotification.openInfoNotification(title, "You received a dispute message.");
         });
     }
 
@@ -577,7 +580,6 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
     }
 
     private void openBTCConnectionErrorPopup(String errorMsg) {
-        Popups.openErrorPopup("Error", "Connecting to the bitcoin network failed. \n" + errorMsg);
-        // + "\nPlease check your internet connection."
+        new Popup().error("Connecting to the bitcoin network failed. \n" + errorMsg).show();
     }
 }
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index e74fdcf791..1d32568328 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -17,65 +17,72 @@
 
 package io.bitsquare.gui.main;
 
+import com.google.inject.Inject;
+import io.bitsquare.alert.Alert;
+import io.bitsquare.alert.AlertManager;
+import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.app.UpdateProcess;
 import io.bitsquare.app.Version;
-import io.bitsquare.arbitration.ArbitrationRepository;
+import io.bitsquare.arbitration.ArbitratorManager;
+import io.bitsquare.arbitration.Dispute;
+import io.bitsquare.arbitration.DisputeManager;
+import io.bitsquare.btc.AddressEntry;
+import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.crypto.KeyRing;
-import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.btc.listeners.BalanceListener;
+import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.gui.common.model.ViewModel;
+import io.bitsquare.gui.components.BalanceTextField;
+import io.bitsquare.gui.components.BalanceWithConfirmationTextField;
+import io.bitsquare.gui.components.TxIdTextField;
+import io.bitsquare.gui.popups.*;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.locale.CountryUtil;
-import io.bitsquare.p2p.BaseP2PService;
-import io.bitsquare.p2p.BootstrapNodes;
-import io.bitsquare.p2p.ClientNode;
-import io.bitsquare.p2p.tomp2p.BootstrappedPeerBuilder;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.P2PServiceListener;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
+import io.bitsquare.trade.offer.OpenOffer;
 import io.bitsquare.trade.offer.OpenOfferManager;
 import io.bitsquare.user.Preferences;
 import io.bitsquare.user.User;
-import io.bitsquare.util.Utilities;
-
-import org.bitcoinj.store.BlockStoreException;
-
-import com.google.inject.Inject;
-
-import java.util.Timer;
-import java.util.concurrent.TimeoutException;
-
-import javafx.application.Platform;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.util.StringConverter;
-
+import org.bitcoinj.core.*;
+import org.bitcoinj.store.BlockStoreException;
+import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.monadic.MonadicBinding;
+import org.jetbrains.annotations.NotNull;
+import org.reactfx.util.FxTimer;
+import org.reactfx.util.Timer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import rx.Observable;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 class MainViewModel implements ViewModel {
     private static final Logger log = LoggerFactory.getLogger(MainViewModel.class);
 
     private static final long BLOCKCHAIN_SYNC_TIMEOUT = 60000;
     private static final long LOST_P2P_CONNECTION_TIMEOUT = 5000;
-    private static final long LOST_BTC_CONNECTION_TIMEOUT = 5000;
+    // private static final long LOST_BTC_CONNECTION_TIMEOUT = 5000;
 
-    private final User user;
-    private final KeyRing keyRing;
     private final WalletService walletService;
-    private final ArbitrationRepository arbitrationRepository;
-    private final ClientNode clientNode;
+    private final TradeWalletService tradeWalletService;
+    private final ArbitratorManager arbitratorManager;
+    private final P2PService p2PService;
     private final TradeManager tradeManager;
     private final OpenOfferManager openOfferManager;
+    private final DisputeManager disputeManager;
+    private final Preferences preferences;
+    private final KeyRing keyRing;
+    private final AlertManager alertManager;
+    private final WalletPasswordPopup walletPasswordPopup;
     private final UpdateProcess updateProcess;
     private final BSFormatter formatter;
 
@@ -85,90 +92,194 @@ class MainViewModel implements ViewModel {
     final DoubleProperty blockchainSyncProgress = new SimpleDoubleProperty(-1);
     final StringProperty walletServiceErrorMsg = new SimpleStringProperty();
     final StringProperty blockchainSyncIconId = new SimpleStringProperty();
-    final StringProperty numBTCPeers = new SimpleStringProperty();
+    final StringProperty availableBalance = new SimpleStringProperty();
+    final StringProperty lockedBalance = new SimpleStringProperty();
+    private final StringProperty numBTCPeers = new SimpleStringProperty();
 
     // P2P network
     final StringProperty bootstrapInfo = new SimpleStringProperty("Connecting to P2P network...");
-    final StringProperty bootstrapInfoFooter = new SimpleStringProperty();
+    final StringProperty p2pNetworkInfoFooter = new SimpleStringProperty("Setting up Tor hidden service...");
     final DoubleProperty bootstrapProgress = new SimpleDoubleProperty(-1);
     final StringProperty bootstrapErrorMsg = new SimpleStringProperty();
     final StringProperty bootstrapIconId = new SimpleStringProperty();
-    final StringProperty numDHTPeers = new SimpleStringProperty();
+    final StringProperty numP2PNetworkPeers = new SimpleStringProperty();
 
     // software update
     final StringProperty updateInfo = new SimpleStringProperty();
-    String version = "v." + Version.VERSION;
+    final String version = "v." + Version.VERSION;
 
     final BooleanProperty showRestartButton = new SimpleBooleanProperty(false);
     final BooleanProperty showDownloadButton = new SimpleBooleanProperty(false);
     final StringProperty newReleaseUrl = new SimpleStringProperty();
     final StringProperty updateIconId = new SimpleStringProperty();
 
-    final StringProperty bankAccountsComboBoxPrompt = new SimpleStringProperty();
-    final BooleanProperty bankAccountsComboBoxDisable = new SimpleBooleanProperty();
-    final ObjectProperty<FiatAccount> currentBankAccount = new SimpleObjectProperty<>();
-
     final BooleanProperty showAppScreen = new SimpleBooleanProperty();
     final StringProperty numPendingTradesAsString = new SimpleStringProperty();
     final BooleanProperty showPendingTradesNotification = new SimpleBooleanProperty();
+    final StringProperty numOpenDisputesAsString = new SimpleStringProperty();
+    final BooleanProperty showOpenDisputesNotification = new SimpleBooleanProperty();
+    private final BooleanProperty isSplashScreenRemoved = new SimpleBooleanProperty();
 
     final String bitcoinNetworkAsString;
 
     private Timer blockchainSyncTimeoutTimer;
     private Timer lostP2PConnectionTimeoutTimer;
-    private Timer lostBTCConnectionTimeoutTimer;
+    private MonadicBinding<Boolean> allServicesDone;
+    private User user;
+    //private Timer lostBTCConnectionTimeoutTimer;
 
 
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
     @Inject
-    public MainViewModel(User user, KeyRing keyRing, WalletService walletService, ArbitrationRepository arbitrationRepository, ClientNode clientNode,
-                         TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences, UpdateProcess updateProcess,
-                         BootstrapNodes bootstrapNodes, BSFormatter formatter) {
+    public MainViewModel(WalletService walletService, TradeWalletService tradeWalletService,
+                         ArbitratorManager arbitratorManager, P2PService p2PService, TradeManager tradeManager,
+                         OpenOfferManager openOfferManager, DisputeManager disputeManager, Preferences preferences,
+                         KeyRing keyRing, User user,
+                         AlertManager alertManager,
+                         WalletPasswordPopup walletPasswordPopup, UpdateProcess updateProcess, BSFormatter formatter) {
         this.user = user;
-        this.keyRing = keyRing;
+        log.debug("in");
         this.walletService = walletService;
-        this.arbitrationRepository = arbitrationRepository;
-        this.clientNode = clientNode;
+        this.tradeWalletService = tradeWalletService;
+        this.arbitratorManager = arbitratorManager;
+        this.p2PService = p2PService;
         this.tradeManager = tradeManager;
         this.openOfferManager = openOfferManager;
+        this.disputeManager = disputeManager;
+        this.preferences = preferences;
+        this.keyRing = keyRing;
+        this.alertManager = alertManager;
+        this.walletPasswordPopup = walletPasswordPopup;
         this.updateProcess = updateProcess;
         this.formatter = formatter;
 
         bitcoinNetworkAsString = formatter.formatBitcoinNetwork(preferences.getBitcoinNetwork());
-        bootstrapNodes.initWithNetworkId(preferences.getBitcoinNetwork().ordinal() + 10);
 
         updateProcess.state.addListener((observableValue, oldValue, newValue) -> applyUpdateState(newValue));
         applyUpdateState(updateProcess.state.get());
+        TxIdTextField.setPreferences(preferences);
+        TxIdTextField.setWalletService(walletService);
+        BalanceTextField.setWalletService(walletService);
+        BalanceWithConfirmationTextField.setWalletService(walletService);
 
-        currentBankAccount.bind(user.currentFiatAccountProperty());
-        user.fiatAccountsObservableList().addListener((ListChangeListener<FiatAccount>) change -> {
-            bankAccountsComboBoxDisable.set(change.getList().isEmpty());
-            bankAccountsComboBoxPrompt.set(change.getList().isEmpty() ? "No accounts" : "");
-        });
-        bankAccountsComboBoxDisable.set(user.fiatAccountsObservableList().isEmpty());
-        bankAccountsComboBoxPrompt.set(user.fiatAccountsObservableList().isEmpty() ? "No accounts" : "");
+        if (BitsquareApp.DEV_MODE) {
+            preferences.setShowPlaceOfferConfirmation(false);
+            preferences.setShowTakeOfferConfirmation(false);
+            preferences.setUseAnimations(false);
+            preferences.setUseEffects(false);
+        }
     }
 
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // API
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
     public void restart() {
         updateProcess.restart();
     }
 
-    public void initBackend() {
-        Platform.runLater(updateProcess::init);
+    public void initializeAllServices() {
+        log.trace("initializeAllServices");
 
+        p2pNetworkInfoFooter.set("Connecting to tor network...");
+
+        BooleanProperty updateProcessDone = initUpdateFx();
+        BooleanProperty walletInitialized = initBitcoinWallet();
+        BooleanProperty bootstrapDone = initP2PNetwork();
+
+        // need to store it to not get garbage collected
+        allServicesDone = EasyBind.combine(updateProcessDone, walletInitialized, bootstrapDone,
+                (a, b, c) -> a.booleanValue() && b.booleanValue() && c.booleanValue());
+        allServicesDone.subscribe((observable, oldValue, newValue) -> {
+            if (newValue)
+                onAllServicesInitialized();
+        });
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Initialisation
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private BooleanProperty initP2PNetwork() {
+    /*    if (networkService.getNetworkInfo() instanceof TomP2PNetworkInfo) {
+            TomP2PNetworkInfo networkInfo = (TomP2PNetworkInfo) networkService.getNetworkInfo();
+            networkInfo.numPeersProperty().addListener((observable, oldValue, newValue) -> {
+                numDHTPeers.set(String.valueOf(newValue) + " peers");
+                if ((int) newValue == 0) {
+                    if (lostP2PConnectionTimeoutTimer != null)
+                        lostP2PConnectionTimeoutTimer.stop();
+                    lostP2PConnectionTimeoutTimer = FxTimer.runLater(Duration.ofMillis(LOST_P2P_CONNECTION_TIMEOUT), () -> {
+                        log.trace("Connection lost timeout reached");
+                        bootstrapErrorMsg.set("We lost connection to the last peer.");
+                    });
+                } else if ((int) oldValue == 0 && (int) newValue > 0) {
+                    if (lostP2PConnectionTimeoutTimer != null) {
+                        lostP2PConnectionTimeoutTimer.stop();
+                        lostP2PConnectionTimeoutTimer = null;
+                    }
+                    bootstrapErrorMsg.set(null);
+                }
+            });
+
+            networkInfo.stateProperty().addListener((ov, oldValue, newValue) -> {
+                setBootstrapState(newValue);
+            });
+        }*/
+        final BooleanProperty p2pNetworkReady = new SimpleBooleanProperty();
+        p2PService.start(new P2PServiceListener() {
+            @Override
+            public void onTorNodeReady() {
+                p2pNetworkInfoFooter.set("Tor node created.");
+            }
+
+            @Override
+            public void onAllDataReceived() {
+                p2pNetworkInfoFooter.set("Data received from peer.");
+                p2pNetworkReady.set(true);
+            }
+
+            @Override
+            public void onAuthenticated() {
+                p2pNetworkInfoFooter.set("Authenticated in P2P network.");
+            }
+
+            @Override
+            public void onHiddenServiceReady() {
+                p2pNetworkInfoFooter.set("Tor hidden service available.");
+            }
+
+            @Override
+            public void onSetupFailed(Throwable throwable) {
+                bootstrapErrorMsg.set("Error at starting P2P network. " + throwable.getMessage());
+                bootstrapInfo.set("Connecting to the P2P network failed.");
+                bootstrapProgress.set(0);
+            }
+        });
+        return p2pNetworkReady;
+    }
+
+    private BooleanProperty initBitcoinWallet() {
         if (walletService.downloadPercentageProperty().get() > -1)
             startBlockchainSyncTimeout();
 
-        walletService.downloadPercentageProperty().addListener((ov, oldValue, newValue) -> {
+        EasyBind.subscribe(walletService.downloadPercentageProperty(), newValue -> setBitcoinNetworkSyncProgress((double) newValue));
+        
+       /* walletService.downloadPercentageProperty().addListener((ov, oldValue, newValue) -> {
             setBitcoinNetworkSyncProgress((double) newValue);
         });
         setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get());
         // Sometimes we don't get the updates, so add an additional setter after 2 seconds
-        Utilities.setTimeout(2000, () -> setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get()));
+        FxTimer.runLater(Duration.ofMillis(2000), () -> setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get()));*/
 
         walletService.numPeersProperty().addListener((observable, oldValue, newValue) -> {
             log.debug("Bitcoin peers " + newValue);
             numBTCPeers.set(String.valueOf(newValue) + " peers");
-            if ((int) newValue < 1) {
+         /*   if ((int) newValue < 1) {
                 if (lostBTCConnectionTimeoutTimer != null)
                     lostBTCConnectionTimeoutTimer.cancel();
                 lostBTCConnectionTimeoutTimer = Utilities.setTimeout(LOST_BTC_CONNECTION_TIMEOUT, () -> {
@@ -182,106 +293,173 @@ class MainViewModel implements ViewModel {
                     lostBTCConnectionTimeoutTimer = null;
                 }
                 walletServiceErrorMsg.set(null);
-            }
+            }*/
         });
+        final BooleanProperty walletInitialized = new SimpleBooleanProperty();
+        walletService.initialize(null,
+                () -> {
+                    log.trace("wallet initialized");
+                    walletInitialized.set(true);
+                },
+                errorMessage -> setWalletServiceException(errorMessage));
+        return walletInitialized;
+    }
 
-        // Set executor for all P2PServices
-        BaseP2PService.setUserThread(Platform::runLater);
-
-        clientNode.numPeersProperty().addListener((observable, oldValue, newValue) -> {
-            numDHTPeers.set(String.valueOf(newValue) + " peers");
-            if ((int) newValue == 0) {
-                if (lostP2PConnectionTimeoutTimer != null)
-                    lostP2PConnectionTimeoutTimer.cancel();
-                lostP2PConnectionTimeoutTimer = Utilities.setTimeout(LOST_P2P_CONNECTION_TIMEOUT, () -> {
-                    log.trace("Connection lost timeout reached");
-                    bootstrapErrorMsg.set("We lost connection to the last peer.");
-                });
-            }
-            else if ((int) oldValue == 0 && (int) newValue > 0) {
-                if (lostP2PConnectionTimeoutTimer != null) {
-                    lostP2PConnectionTimeoutTimer.cancel();
-                    lostP2PConnectionTimeoutTimer = null;
-                }
-                bootstrapErrorMsg.set(null);
-            }
+    @NotNull
+    private BooleanProperty initUpdateFx() {
+        updateProcess.init();
+        final BooleanProperty updateProcessDone = new SimpleBooleanProperty();
+        updateProcess.setResultHandler(() -> {
+            log.trace("updateProcess completed");
+            updateProcessDone.set(true);
         });
-
-        clientNode.setExecutor(Platform::runLater);
-        Observable<BootstrappedPeerBuilder.State> bootstrapStateAsObservable = clientNode.bootstrap(keyRing.getDhtSignatureKeyPair());
-        bootstrapStateAsObservable.publish();
-        bootstrapStateAsObservable.subscribe(
-                state -> Platform.runLater(() -> setBootstrapState(state)),
-                error -> Platform.runLater(() -> {
-                    bootstrapErrorMsg.set(error.getMessage());
-                    bootstrapInfo.set("Connecting to the P2P network failed.");
-                    bootstrapProgress.set(0);
-
-                }),
-                () -> log.trace("message completed"));
-
-        Observable<Object> walletServiceObservable = walletService.initialize(Platform::runLater);
-        walletServiceObservable.subscribe(
-                next -> {
-                    //log.trace("wallet next");
-                },
-                error -> Platform.runLater(() -> {
-                    log.trace("wallet error");
-                    setWalletServiceException(error);
-                }),
-                () -> {
-                    log.trace("wallet completed");
-                });
-
-        Observable<UpdateProcess.State> updateProcessObservable = this.updateProcess.getProcess();
-        updateProcessObservable.subscribe(next -> {
-                    //log.trace("updateProcess next");
-                },
-                error -> {
-                },
-                () -> {
-                    log.trace("updateProcess completed");
-                });
-
-        Observable<?> allServices = Observable.merge(bootstrapStateAsObservable, walletServiceObservable, updateProcessObservable);
-        allServices.subscribe(
-                next -> {
-                },
-                error -> {
-                },
-                () -> Platform.runLater(this::onAllServicesInitialized)
-        );
+        return updateProcessDone;
     }
 
     private void onAllServicesInitialized() {
-        log.trace("backend completed");
+        log.trace("onAllServicesInitialized");
 
-        setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get());
-        tradeManager.getPendingTrades().addListener((ListChangeListener<Trade>) change -> updateNumPendingTrades());
-        updateNumPendingTrades();
-        showAppScreen.set(true);
 
-        // TODO for alpha version
-        if (!user.isRegistered()) {
-            FiatAccount fiatAccount = new FiatAccount(FiatAccount.Type.IRC,
-                    "EUR",
-                    CountryUtil.getDefaultCountry(),
-                    "Demo (Name of bank)",
-                    "Demo (Account holder name)",
-                    "Demo (E.g. IBAN) ",
-                    "Demo (E.g. BIC) ");
-            user.addFiatAccount(fiatAccount);
-            user.setAccountID(walletService.getRegistrationAddressEntry().toString());
-        }
+        // disputeManager
+        disputeManager.getDisputesAsObservableList().addListener((ListChangeListener<Dispute>) change -> {
+            change.next();
+            addDisputeClosedChangeListener(change.getAddedSubList());
+            updateDisputeStates();
+        });
+        addDisputeClosedChangeListener(disputeManager.getDisputesAsObservableList());
+        updateDisputeStates();
+        disputeManager.onAllServicesInitialized();
 
-        // Load all arbitrators in background. Any class requiring a loaded list of arbitrators need to register itself as listener to handle the async 
-        // operation.
-        log.debug("loadAllArbitrators");
-        arbitrationRepository.loadAllArbitrators();
+
+        // tradeManager
+        tradeManager.getTrades().addListener((ListChangeListener<Trade>) c -> updateBalance());
+
+        tradeManager.getTrades().addListener((ListChangeListener<Trade>) change -> {
+            change.next();
+            addDisputeStateListeners(change.getAddedSubList());
+            pendingTradesChanged();
+        });
+        pendingTradesChanged();
+        addDisputeStateListeners(tradeManager.getTrades());
         tradeManager.onAllServicesInitialized();
+
+
+        // arbitratorManager
+        arbitratorManager.onAllServicesInitialized();
+
+
+        // walletService
+        // In case we have any offers open or a pending trade we need to unlock our trading wallet so a trade can be executed automatically
+        // Otherwise we delay the password request to create offer, or take offer.
+        // When the password is set it will be stored to the tradeWalletService as well, so its only needed after a restart.
+        if (walletService.getWallet().isEncrypted() &&
+                (openOfferManager.getOpenOffers().size() > 0
+                        || tradeManager.getTrades().size() > 0
+                        || disputeManager.getDisputesAsObservableList().size() > 0))
+            walletPasswordPopup.show().onAesKey(aesKey -> tradeWalletService.setAesKey(aesKey));
+
+        if (tradeManager.pendingTradesInitializedProperty().get() && isSplashScreenRemoved.get())
+            applyTradePeriodState();
+        else {
+            isSplashScreenRemoved.addListener((observable, oldValue, newValue) -> {
+                if (tradeManager.pendingTradesInitializedProperty().get() && isSplashScreenRemoved.get())
+                    applyTradePeriodState();
+            });
+            tradeManager.pendingTradesInitializedProperty().addListener((observable, oldValue, newValue) -> {
+                if (tradeManager.pendingTradesInitializedProperty().get() && isSplashScreenRemoved.get())
+                    applyTradePeriodState();
+            });
+        }
+        walletService.addBalanceListener(new BalanceListener() {
+            @Override
+            public void onBalanceChanged(Coin balance) {
+                updateBalance();
+            }
+        });
+        updateBalance();
+        setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get());
+
+
+        // openOfferManager
+        openOfferManager.getOpenOffers().addListener((ListChangeListener<OpenOffer>) c -> updateBalance());
         openOfferManager.onAllServicesInitialized();
+
+
+        // alertManager
+        alertManager.alertMessageProperty().addListener((observable, oldValue, newValue) -> displayAlertIfPresent(newValue));
+        displayAlertIfPresent(alertManager.alertMessageProperty().get());
+
+
+        // tac
+        if (!preferences.getTacAccepted() && !BitsquareApp.DEV_MODE)
+            new TacPopup().url(WebViewPopup.getLocalUrl("tac.html")).onAgree(() -> preferences.setTacAccepted(true)).show();
+
+
+        // now show app
+        showAppScreen.set(true);
     }
 
+    private void displayAlertIfPresent(Alert alert) {
+        boolean alreadyDisplayed = alert != null && alert.equals(user.getDisplayedAlert());
+        user.setDisplayedAlert(alert);
+
+        if (alert != null && !alreadyDisplayed) {
+            new DisplayAlertMessagePopup().alertMessage(alert).show();
+        }
+    }
+
+    private void updateBalance() {
+        updateAvailableBalance();
+        updateLockedBalance();
+    }
+
+    private void updateLockedBalance() {
+        List<AddressEntry> result = new ArrayList<>();
+
+        result.addAll(Stream.concat(openOfferManager.getOpenOffers().stream(), tradeManager.getTrades().stream())
+                .map(tradable -> walletService.getAddressEntryByOfferId(tradable.getOffer().getId()))
+                .collect(Collectors.toList()));
+
+        Optional<Coin> totalLockedOptional = result.stream().map(e -> walletService.getBalanceForAddress(e.getAddress())).reduce((a, b) -> a.add(b));
+        if (totalLockedOptional.isPresent())
+            lockedBalance.set(formatter.formatCoinWithCode(totalLockedOptional.get()));
+        else
+            lockedBalance.set(formatter.formatCoinWithCode(Coin.ZERO));
+    }
+
+    private void updateAvailableBalance() {
+        List<AddressEntry> result = new ArrayList<>();
+
+        List<String> reservedTrades = Stream.concat(openOfferManager.getOpenOffers().stream(), tradeManager.getTrades().stream())
+                .map(tradable -> tradable.getOffer().getId())
+                .collect(Collectors.toList());
+
+        result.addAll(walletService.getAddressEntryList().stream()
+                .filter(e -> walletService.getBalanceForAddress(e.getAddress()).isPositive())
+                .filter(e -> !reservedTrades.contains(e.getOfferId()))
+                .collect(Collectors.toList()));
+
+        Optional<Coin> totalAvailableOptional = result.stream().map(e -> walletService.getBalanceForAddress(e.getAddress())).reduce((a, b) -> a.add(b));
+        if (totalAvailableOptional.isPresent())
+            availableBalance.set(formatter.formatCoinWithCode(totalAvailableOptional.get()));
+        else
+            availableBalance.set(formatter.formatCoinWithCode(Coin.ZERO));
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // UI callbacks
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    void onSplashScreenRemoved() {
+        isSplashScreenRemoved.set(true);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Apply states
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
     private void applyUpdateState(UpdateProcess.State state) {
         switch (state) {
             case CHECK_FOR_UPDATES:
@@ -310,7 +488,7 @@ class MainViewModel implements ViewModel {
         }
     }
 
-    private void setBootstrapState(BootstrappedPeerBuilder.State state) {
+  /*  private void setBootstrapState(TomP2PNetworkInfo.State state) {
         switch (state) {
             case DISCOVERY_DIRECT_SUCCEEDED:
                 bootstrapIconId.set("image-connection-direct");
@@ -344,6 +522,38 @@ class MainViewModel implements ViewModel {
                 bootstrapProgress.set(-1);
                 break;
         }
+    }*/
+
+    private void applyTradePeriodState() {
+        updateTradePeriodState();
+        tradeWalletService.addBlockChainListener(new BlockChainListener() {
+            @Override
+            public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
+                updateTradePeriodState();
+            }
+
+            @Override
+            public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List<StoredBlock> newBlocks)
+                    throws VerificationException {
+            }
+
+            @Override
+            public boolean isTransactionRelevant(Transaction tx) throws ScriptException {
+                return false;
+            }
+
+            @Override
+            public void receiveFromBlock(Transaction tx, StoredBlock block, AbstractBlockChain.NewBlockType blockType, int relativityOffset)
+                    throws VerificationException {
+
+            }
+
+            @Override
+            public boolean notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block, AbstractBlockChain.NewBlockType blockType,
+                                                      int relativityOffset) throws VerificationException {
+                return false;
+            }
+        });
     }
 
     private void setWalletServiceException(Throwable error) {
@@ -354,51 +564,100 @@ class MainViewModel implements ViewModel {
             walletServiceErrorMsg.set("Please check your network connection.\n\n" +
                     "You must allow outgoing TCP connections to port 18333 for the bitcoin testnet.\n\n" +
                     "See https://github.com/bitsquare/bitsquare/wiki for instructions.");
-        }
-        else if (error.getCause() instanceof BlockStoreException) {
+        } else if (error.getCause() instanceof BlockStoreException) {
             walletServiceErrorMsg.set("You cannot run 2 instances of the program.");
-        }
-        else if (error.getMessage() != null) {
+        } else if (error.getMessage() != null) {
             walletServiceErrorMsg.set(error.getMessage());
-        }
-        else {
+        } else {
             walletServiceErrorMsg.set(error.toString());
         }
     }
 
+    private void updateTradePeriodState() {
+        tradeManager.getTrades().stream().forEach(trade -> {
+            int bestChainHeight = tradeWalletService.getBestChainHeight();
+            if (trade.getCheckPaymentTimeAsBlockHeight() > 0 && bestChainHeight >= trade.getCheckPaymentTimeAsBlockHeight())
+                trade.setTradePeriodState(Trade.TradePeriodState.HALF_REACHED);
 
-    public StringConverter<FiatAccount> getBankAccountsConverter() {
-        return new StringConverter<FiatAccount>() {
-            @Override
-            public String toString(FiatAccount fiatAccount) {
-                return fiatAccount.nameOfBank;
+            if (trade.getOpenDisputeTimeAsBlockHeight() > 0 && bestChainHeight >= trade.getOpenDisputeTimeAsBlockHeight())
+                trade.setTradePeriodState(Trade.TradePeriodState.TRADE_PERIOD_OVER);
+
+            switch (trade.getTradePeriodState()) {
+                case NORMAL:
+                    break;
+                case HALF_REACHED:
+                    if (!trade.isHalfTradePeriodReachedWarningDisplayed()) {
+                        new Popup().warning("Your trade with ID " + trade.getShortId() +
+                                " has reached the half of the max. allowed trading period and " +
+                                "is still not completed.\nPlease check your trade state at Portfolio/open trades for further information.").show();
+                        trade.setHalfTradePeriodReachedWarningDisplayed(true);
+                    }
+                    break;
+                case TRADE_PERIOD_OVER:
+                    if (!trade.isTradePeriodOverWarningDisplayed()) {
+                        new Popup().warning("Your trade with ID " + trade.getShortId() + " has reached the max. allowed trading period and is " +
+                                "not completed.\nPlease check your trade at Portfolio/Open trades for contacting the arbitrator.").show();
+                        trade.setTradePeriodOverWarningDisplayed(true);
+                    }
+                    break;
             }
-
-            @Override
-            public FiatAccount fromString(String s) {
-                return null;
-            }
-        };
+        });
     }
 
-    public ObservableList<FiatAccount> getBankAccounts() {
-        return user.fiatAccountsObservableList();
+    private void addDisputeClosedChangeListener(List<? extends Dispute> list) {
+        list.stream().forEach(e -> e.isClosedProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue)
+                updateDisputeStates();
+        }));
     }
 
-    public void setCurrentBankAccount(FiatAccount currentFiatAccount) {
-        user.setCurrentFiatAccountProperty(currentFiatAccount);
+    private void updateDisputeStates() {
+        int openDisputes = disputeManager.getDisputesAsObservableList().stream().filter(e -> !e.isClosed()).collect(Collectors.toList()).size();
+        if (openDisputes > 0)
+            numOpenDisputesAsString.set(String.valueOf(openDisputes));
+        if (openDisputes > 9)
+            numOpenDisputesAsString.set("?");
+
+        showOpenDisputesNotification.set(openDisputes > 0);
     }
 
-    private void updateNumPendingTrades() {
-        long numPendingTrades = tradeManager.getPendingTrades().size();
+    private void pendingTradesChanged() {
+        long numPendingTrades = tradeManager.getTrades().size();
         if (numPendingTrades > 0)
             numPendingTradesAsString.set(String.valueOf(numPendingTrades));
         if (numPendingTrades > 9)
-            numPendingTradesAsString.set("-");
+            numPendingTradesAsString.set("?");
 
         showPendingTradesNotification.set(numPendingTrades > 0);
     }
 
+    private void addDisputeStateListeners(List<? extends Trade> addedTrades) {
+        addedTrades.stream().forEach(trade -> trade.disputeStateProperty().addListener((observable, oldValue, newValue) -> {
+            switch (newValue) {
+                case NONE:
+                    break;
+                case DISPUTE_REQUESTED:
+                    break;
+                case DISPUTE_STARTED_BY_PEER:
+                    disputeManager.findOwnDispute(trade.getId()).ifPresent(dispute -> {
+                        String msg;
+                        if (dispute.isSupportTicket())
+                            msg = "Your trading peer has encountered technical problems and requested support for trade with ID " + trade.getShortId() + ".\n" +
+                                    "Please await further instructions from the arbitrator.\n" +
+                                    "Your funds are safe and will be refunded as soon the problem is resolved.";
+                        else
+                            msg = "Your trading peer has requested a dispute for trade with ID " + trade.getShortId() + ".";
+
+                        new Popup().information(msg).show();
+                    });
+                    break;
+                case DISPUTE_CLOSED:
+                    new Popup().information("A support ticket for trade with ID " + trade.getShortId() + " has been closed.").show();
+                    break;
+            }
+        }));
+    }
+
     private void setBitcoinNetworkSyncProgress(double value) {
         blockchainSyncProgress.set(value);
         if (value >= 1) {
@@ -406,15 +665,13 @@ class MainViewModel implements ViewModel {
 
             blockchainSyncInfo.set("Blockchain synchronization complete.");
             blockchainSyncIconId.set("image-connection-synced");
-        }
-        else if (value > 0.0) {
+        } else if (value > 0.0) {
             // We stop as soon the download started the timeout
             stopBlockchainSyncTimeout();
 
             blockchainSyncInfo.set("Synchronizing blockchain: " + formatter.formatToPercent(value));
             blockchainSyncInfoFooter.set("Synchronizing: " + formatter.formatToPercent(value));
-        }
-        else {
+        } else {
             blockchainSyncInfo.set("Connecting to the bitcoin network...");
             blockchainSyncInfoFooter.set("Connecting...");
         }
@@ -424,7 +681,7 @@ class MainViewModel implements ViewModel {
         log.trace("startBlockchainSyncTimeout");
         stopBlockchainSyncTimeout();
 
-        blockchainSyncTimeoutTimer = Utilities.setTimeout(BLOCKCHAIN_SYNC_TIMEOUT, () -> {
+        blockchainSyncTimeoutTimer = FxTimer.runLater(Duration.ofMillis(BLOCKCHAIN_SYNC_TIMEOUT), () -> {
             log.trace("Timeout reached");
             setWalletServiceException(new TimeoutException());
         });
@@ -433,9 +690,8 @@ class MainViewModel implements ViewModel {
     private void stopBlockchainSyncTimeout() {
         if (blockchainSyncTimeoutTimer != null) {
             log.trace("stopBlockchainSyncTimeout");
-            blockchainSyncTimeoutTimer.cancel();
+            blockchainSyncTimeoutTimer.stop();
             blockchainSyncTimeoutTimer = null;
         }
     }
-
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
index 5187d4a2c9..60bb227844 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
@@ -17,14 +17,15 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Tab?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.layout.AnchorPane?>
 <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"
          xmlns:fx="http://javafx.com/fxml">
     <Tab fx:id="accountSettingsTab" closable="false"/>
-    <Tab fx:id="arbitratorSettingsTab" text="Arbitrator setup" closable="false"/>
+    <Tab fx:id="arbitratorRegistrationTab" text="Arbitrator registration" closable="false"/>
 
 </TabPane>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
index f30c45c18b..4ac2443c04 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
@@ -18,26 +18,22 @@
 package io.bitsquare.gui.main.account;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.common.view.ActivatableView;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
+import io.bitsquare.gui.common.view.*;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView;
+import io.bitsquare.gui.main.account.arbitratorregistration.ArbitratorRegistrationView;
 import io.bitsquare.gui.main.account.settings.AccountSettingsView;
-import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
-
-import javax.inject.Inject;
-
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+
+import javax.inject.Inject;
 
 @FxmlView
 public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
 
-    @FXML Tab accountSettingsTab, arbitratorSettingsTab;
+    @FXML
+    Tab accountSettingsTab, arbitratorRegistrationTab;
 
     private Navigation.Listener navigationListener;
     private ChangeListener<Tab> tabChangeListener;
@@ -46,6 +42,7 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
     private final Navigation navigation;
     private View accountSetupWizardView;
     private Tab tab;
+    private ArbitratorRegistrationView arbitratorRegistrationView;
 
     @Inject
     private AccountView(AccountViewModel model, CachingViewLoader viewLoader, Navigation navigation) {
@@ -65,35 +62,35 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
             if (newValue == accountSettingsTab)
                 navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class);
             else
-                navigation.navigateTo(MainView.class, AccountView.class, ArbitratorSettingsView.class);
+                navigation.navigateTo(MainView.class, AccountView.class, ArbitratorRegistrationView.class);
         };
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
         navigation.addListener(navigationListener);
         root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
 
         if (navigation.getCurrentPath().size() == 2 && navigation.getCurrentPath().get(1) == AccountView.class) {
-            if (model.getNeedRegistration()) {
+           /* if (model.getNeedRegistration()) {
                 navigation.navigateTo(MainView.class, AccountView.class, AccountSetupWizard.class);
             }
-            else {
-                if (root.getSelectionModel().getSelectedItem() == accountSettingsTab)
-                    navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class);
-                else
-                    navigation.navigateTo(MainView.class, AccountView.class, ArbitratorSettingsView.class);
-            }
+            else {*/
+            if (root.getSelectionModel().getSelectedItem() == accountSettingsTab)
+                navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class);
+            else
+                navigation.navigateTo(MainView.class, AccountView.class, ArbitratorRegistrationView.class);
+            // }
         }
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         navigation.removeListener(navigationListener);
         root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
 
-        if (accountSetupWizardView != null)
-            tab.setContent(null);
+       /* if (accountSetupWizardView != null)
+            tab.setContent(null);*/
     }
 
     private void loadView(Class<? extends View> viewClass) {
@@ -102,24 +99,25 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
         if (view instanceof AccountSettingsView) {
             tab = accountSettingsTab;
             tab.setText("Account settings");
-            arbitratorSettingsTab.setDisable(false);
+            arbitratorRegistrationTab.setDisable(false);
+            if (arbitratorRegistrationView != null)
+                arbitratorRegistrationView.onTabSelection(false);
         }
-        else if (view instanceof AccountSetupWizard) {
+       /* else if (view instanceof AccountSetupWizard) {
             tab = accountSettingsTab;
             tab.setText("Account setup");
-            arbitratorSettingsTab.setDisable(true);
+            arbitratorRegistrationTab.setDisable(true);
             accountSetupWizardView = view;
-        }
-        else if (view instanceof ArbitratorSettingsView) {
-            tab = arbitratorSettingsTab;
+        }*/
+        else if (view instanceof ArbitratorRegistrationView) {
+            tab = arbitratorRegistrationTab;
+            arbitratorRegistrationView = (ArbitratorRegistrationView) view;
+            arbitratorRegistrationView.onTabSelection(true);
         }
         else {
             throw new IllegalArgumentException("View not supported: " + view);
         }
 
-        // for IRC demo we deactivate the arbitratorSettingsTab
-        // arbitratorSettingsTab.setDisable(true);
-
         tab.setContent(view.getRoot());
         root.getSelectionModel().select(tab);
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
deleted file mode 100644
index 99e13f1f47..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.ArbitratorSettingsView"
-            prefHeight="660.0" prefWidth="1000.0"
-            xmlns:fx="http://javafx.com/fxml">
-    <VBox spacing="20">
-        <padding>
-            <Insets left="20" top="20" right="20"/>
-        </padding>
-        <Label text="Arbitration system is not implemented yet. At the moment there are just very basic UI screens for the registration and editing."/>
-        <Button text="Register yourself as an arbitrator" onAction="#onArbitratorRegistration"/>
-        <Button text="Edit my arbitrator details" onAction="#onArbitratorEdit"/>
-    </VBox>
-</AnchorPane>
-
-
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
deleted file mode 100644
index 07dbb963a2..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.gui.common.view.AbstractView;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
-import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
-
-import javax.inject.Inject;
-
-import javafx.fxml.FXML;
-import javafx.scene.*;
-import javafx.scene.layout.*;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-
-@FxmlView
-public class ArbitratorSettingsView extends AbstractView {
-
-    private final ViewLoader viewLoader;
-    private final Stage primaryStage;
-
-    @Inject
-    private ArbitratorSettingsView(CachingViewLoader viewLoader, Stage primaryStage) {
-        this.viewLoader = viewLoader;
-        this.primaryStage = primaryStage;
-    }
-
-    @FXML
-    public void onArbitratorRegistration() {
-        View view = viewLoader.load(ArbitratorRegistrationView.class);
-        showStage(view);
-    }
-
-    @FXML
-    public void onArbitratorEdit() {
-        View view = viewLoader.load(ArbitratorRegistrationView.class);
-        showStage(view);
-        ((ArbitratorRegistrationView) view).setEditMode(true);
-    }
-
-    private void showStage(View view) {
-        Stage stage = new Stage();
-        stage.setTitle("Arbitrator");
-        stage.setMinWidth(800);
-        stage.setMinHeight(400);
-        stage.setWidth(800);
-        stage.setHeight(600);
-        stage.setX(primaryStage.getX() + 50);
-        stage.setY(primaryStage.getY() + 50);
-        stage.initModality(Modality.WINDOW_MODAL);
-        stage.initOwner(primaryStage);
-        Scene scene = new Scene((Parent) view.getRoot(), 800, 600);
-        stage.setScene(scene);
-        stage.setOnCloseRequest(e -> {
-            // need to unset root to be re-uasabel to other popups screens
-            scene.setRoot(new Pane());
-        });
-        stage.show();
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml
deleted file mode 100644
index 416cfc2408..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.arbitrator.browser.BrowserView"
-            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">
-    <Pane fx:id="arbitratorProfile"/>
-    <Button fx:id="prevButton" text="Previous" onAction="#onPrevious" AnchorPane.bottomAnchor="45.0"
-            AnchorPane.leftAnchor="10.0"/>
-    <Button fx:id="nextButton" text="Next" onAction="#onNext" AnchorPane.bottomAnchor="45.0"
-            AnchorPane.rightAnchor="10.0"/>
-    <Button fx:id="selectButton" text="Select" onAction="#onSelect" AnchorPane.bottomAnchor="45.0"
-            AnchorPane.leftAnchor="350.0"/>
-    <Button fx:id="closeButton" text="close" onAction="#onClose" AnchorPane.bottomAnchor="10.0"
-            AnchorPane.leftAnchor="10.0"/>
-</AnchorPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java
deleted file mode 100644
index 4a1b3c548c..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/BrowserView.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.browser;
-
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.arbitration.ArbitratorService;
-import io.bitsquare.gui.common.view.ActivatableView;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
-import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
-import io.bitsquare.user.AccountSettings;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.stage.Stage;
-
-@FxmlView
-public class BrowserView extends ActivatableView<Pane, Void> implements ArbitratorService.Listener {
-
-    @FXML Button prevButton, nextButton, selectButton, closeButton;
-    @FXML Pane arbitratorProfile;
-
-    private Arbitrator currentArbitrator;
-    private ArbitratorProfileView arbitratorProfileView;
-    private int index = -1;
-
-    private final List<Arbitrator> allArbitrators = new ArrayList<>();
-
-    private final ViewLoader viewLoader;
-    private final AccountSettings accountSettings;
-    private final ArbitratorService arbitratorService;
-
-    @Inject
-    public BrowserView(CachingViewLoader viewLoader, AccountSettings accountSettings,
-                       ArbitratorService arbitratorService) {
-        this.viewLoader = viewLoader;
-        this.accountSettings = accountSettings;
-        this.arbitratorService = arbitratorService;
-    }
-
-    @Override
-    public void initialize() {
-        arbitratorService.addListener(this);
-       /* arbitratorService.loadAllArbitrators(() -> log.debug("Arbitrators successful loaded " + arbitratorService.getAllArbitrators().size()),
-                (errorMessage -> log.error(errorMessage)));*/
-
-        View view = viewLoader.load(ArbitratorProfileView.class);
-        root.getChildren().set(0, view.getRoot());
-        arbitratorProfileView = (ArbitratorProfileView) view;
-
-        checkButtonState();
-    }
-
-    @Override
-    public void onArbitratorAdded(Arbitrator arbitrator) {
-    }
-
-    @Override
-    public void onAllArbitratorsLoaded(Map<String, Arbitrator> arbitratorsMap) {
-
-    }
-/*
-    @Override
-    public void onAllArbitratorsLoaded(List<Arbitrator> arbitrators) {
-        allArbitrators.clear();
-        allArbitrators.addAll(arbitrators);
-
-        if (!allArbitrators.isEmpty()) {
-            index = 0;
-            currentArbitrator = allArbitrators.get(index);
-            arbitratorProfileView.applyArbitrator(currentArbitrator);
-            checkButtonState();
-        }
-    }*/
-
-    @Override
-    public void onArbitratorRemoved(Arbitrator arbitrator) {
-    }
-
-    @FXML
-    public void onPrevious() {
-        if (index > 0) {
-            index--;
-            currentArbitrator = allArbitrators.get(index);
-            arbitratorProfileView.applyArbitrator(currentArbitrator);
-        }
-        checkButtonState();
-    }
-
-    @FXML
-    public void onNext() {
-        if (index < allArbitrators.size() - 1) {
-            index++;
-            currentArbitrator = allArbitrators.get(index);
-            arbitratorProfileView.applyArbitrator(currentArbitrator);
-        }
-        checkButtonState();
-    }
-
-    @FXML
-    public void onSelect() {
-        accountSettings.addAcceptedArbitrator(currentArbitrator);
-    }
-
-    @FXML
-    public void onClose() {
-        Stage stage = (Stage) root.getScene().getWindow();
-        stage.close();
-    }
-
-    private void checkButtonState() {
-        prevButton.setDisable(index < 1);
-        nextButton.setDisable(index == allArbitrators.size() - 1 || index == -1);
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml
deleted file mode 100644
index 4e816828a9..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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.*?>
-<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">
-
-    <Label fx:id="nameLabel" text="Name:"/>
-    <TextField fx:id="nameTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"/>
-    <Label text="Languages:" GridPane.rowIndex="1"/>
-    <TextField fx:id="languagesTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.rowIndex="1"/>
-
-    <Label text="Reputation:" GridPane.rowIndex="2"/>
-    <TextField fx:id="reputationTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.rowIndex="2"/>
-
-    <Label text="Max. trade volume:" GridPane.rowIndex="3"/>
-    <TextField fx:id="maxTradeVolumeTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.rowIndex="3"/>
-
-    <Label text="Passive service fee:" GridPane.rowIndex="4"/>
-    <TextField fx:id="passiveServiceFeeTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.rowIndex="4"/>
-
-    <Label text="Arbitration fee:" GridPane.rowIndex="5"/>
-    <TextField fx:id="feeTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.columnSpan="2" GridPane.rowIndex="5"/>
-
-    <Label text="Methods of arbitration:" GridPane.rowIndex="6"/>
-    <TextField fx:id="methodsTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.columnSpan="2" GridPane.rowIndex="6"/>
-
-    <Label text="ID verifications:" GridPane.rowIndex="7"/>
-    <TextField fx:id="idVerificationsTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.columnSpan="2" GridPane.rowIndex="7"/>
-
-    <Label text="Web page:" GridPane.rowIndex="9"/>
-    <TextField fx:id="webPageTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1"
-               GridPane.columnSpan="2" GridPane.rowIndex="9"/>
-
-    <Label text="Description:" GridPane.rowIndex="10" GridPane.valignment="TOP">
-        <GridPane.margin>
-            <Insets top="10.0"/>
-        </GridPane.margin>
-    </Label>
-    <TextArea fx:id="descriptionTextArea" editable="false" focusTraversable="false" prefHeight="150.0"
-              GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="10"/>
-
-    <columnConstraints>
-        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0"/>
-        <ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="ALWAYS"/>
-    </rowConstraints>
-
-</GridPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
deleted file mode 100644
index ef8b150715..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.profile;
-
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.gui.common.view.AbstractView;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.util.BSFormatter;
-
-import javax.inject.Inject;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-
-@FxmlView
-public class ArbitratorProfileView extends AbstractView {
-
-    @FXML Label nameLabel;
-    @FXML TextArea descriptionTextArea;
-    @FXML TextField nameTextField, languagesTextField, reputationTextField, feeTextField, methodsTextField,
-            passiveServiceFeeTextField, idVerificationsTextField, webPageTextField, maxTradeVolumeTextField;
-
-    private final BSFormatter formatter;
-
-    @Inject
-    public ArbitratorProfileView(BSFormatter formatter) {
-        this.formatter = formatter;
-    }
-
-    public void applyArbitrator(Arbitrator arbitrator) {
-        if (arbitrator != null && arbitrator.getIdType() != null) {
-            String name = "";
-            switch (arbitrator.getIdType()) {
-                case REAL_LIFE_ID:
-                    name = "Name:";
-                    break;
-                case NICKNAME:
-                    name = "Nickname:";
-                    break;
-                case COMPANY:
-                    name = "Company:";
-                    break;
-            }
-            nameLabel.setText(name);
-
-            nameTextField.setText(arbitrator.getName());
-            //  languagesTextField.setText(formatter.languageLocalesToString(arbitrator.getLanguages()));
-            reputationTextField.setText(arbitrator.getReputation().toString());
-            feeTextField.setText(String.valueOf(arbitrator.getFee() + " BTC"));
-            methodsTextField.setText(formatter.arbitrationMethodsToString(arbitrator.getArbitrationMethods()));
-            idVerificationsTextField.setText(
-                    formatter.arbitrationIDVerificationsToString(arbitrator.getIdVerifications()));
-            webPageTextField.setText(arbitrator.getWebUrl());
-            descriptionTextArea.setText(arbitrator.getDescription());
-        }
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
deleted file mode 100644
index fd7d993400..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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 io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root"
-            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">
-
-    <Accordion fx:id="accordion" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
-               AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0">
-        <panes>
-
-            <TitledPane fx:id="profileTitledPane" text="Profile" expanded="true">
-
-                <GridPane hgap="5.0" vgap="5.0" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0"
-                          AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0">
-
-                    <Label fx:id="nameLabel" text="Name:"/>
-                    <TextField fx:id="nameTextField" GridPane.columnIndex="1" GridPane.columnSpan="3"/>
-
-                    <Label text="ID type:" GridPane.rowIndex="1"/>
-                    <TextField fx:id="idTypeTextField" editable="false" focusTraversable="false"
-                               GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-                    <ComboBox fx:id="idTypeComboBox" onAction="#onSelectIDType" promptText="Select ID type"
-                              prefWidth="150.0" GridPane.columnIndex="3" GridPane.rowIndex="1"/>
-
-                    <Label text="Supported language(s):" GridPane.rowIndex="2"/>
-                    <TextField fx:id="languagesTextField" editable="false" focusTraversable="false"
-                               GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                    <Button onAction="#onClearLanguages" text="Clear" GridPane.columnIndex="2" GridPane.rowIndex="2"/>
-                    <ComboBox fx:id="languageComboBox" onAction="#onAddLanguage" prefWidth="150.0"
-                              promptText="Add language" GridPane.columnIndex="3" GridPane.rowIndex="2"/>
-
-                    <Label text="Max. trade volume:" GridPane.rowIndex="3"/>
-                    <TextField fx:id="maxTradeVolumeTextField" promptText="Recommended: 0.1 - 2 BTC"
-                               GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.columnSpan="3"/>
-
-                    <Label text="Passive service fee (%):" GridPane.rowIndex="4"/>
-                    <TextField fx:id="passiveServiceFeeTextField" promptText="Recommended: 0.1 - 1%"
-                               GridPane.columnIndex="1" GridPane.rowIndex="4" GridPane.columnSpan="3"/>
-
-                    <Label text="Min. passive service fee" GridPane.rowIndex="5"/>
-                    <TextField fx:id="minPassiveServiceFeeTextField" promptText="Recommended: 0.0001 - 0.005 BTC"
-                               GridPane.columnIndex="1" GridPane.rowIndex="5" GridPane.columnSpan="3"/>
-
-                    <Label text="Arbitration fee (%):" GridPane.rowIndex="6"/>
-                    <TextField fx:id="arbitrationFeeTextField" promptText="Recommended: 5 - 20 %"
-                               GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.columnSpan="3"/>
-
-                    <Label text="Min. arbitration fee:" GridPane.rowIndex="7"/>
-                    <TextField fx:id="minArbitrationFeeTextField" promptText="Recommended: 0.1 - 0.2 BTC"
-                               GridPane.columnIndex="1" GridPane.rowIndex="7" GridPane.columnSpan="3"/>
-
-                    <Label text="Method(s) used for arbitration:" GridPane.rowIndex="8"/>
-                    <TextField fx:id="methodsTextField" editable="false" focusTraversable="false"
-                               GridPane.columnIndex="1" GridPane.rowIndex="8"/>
-                    <Button onAction="#onClearMethods" text="Clear" GridPane.columnIndex="2" GridPane.rowIndex="8"/>
-                    <ComboBox fx:id="methodsComboBox" onAction="#onAddMethod" prefWidth="150.0" promptText="Add method"
-                              GridPane.columnIndex="3" GridPane.rowIndex="8"/>
-
-                    <Label text="Offer ID verification(s):" GridPane.rowIndex="9"/>
-                    <TextField fx:id="idVerificationsTextField" promptText="Optional" editable="false"
-                               focusTraversable="false" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
-                    <Button onAction="#onClearIDVerifications" text="Clear" GridPane.columnIndex="2"
-                            GridPane.rowIndex="9"/>
-                    <ComboBox fx:id="idVerificationsComboBox" onAction="#onAddIDVerification" prefWidth="150.0"
-                              promptText="Add verification" GridPane.columnIndex="3"
-                              GridPane.rowIndex="9"/>
-
-                    <Label text="Web page:" GridPane.rowIndex="10"/>
-                    <TextField fx:id="webPageTextField" GridPane.columnIndex="1" GridPane.columnSpan="3"
-                               GridPane.rowIndex="10"/>
-
-                    <Label text="Description:" GridPane.rowIndex="11" GridPane.valignment="TOP">
-                        <GridPane.margin>
-                            <Insets top="10.0"/>
-                        </GridPane.margin>
-                    </Label>
-                    <TextArea fx:id="descriptionTextArea" prefHeight="150.0" GridPane.columnIndex="1"
-                              GridPane.columnSpan="3" GridPane.rowIndex="11"/>
-
-                    <Button fx:id="saveProfileButton" defaultButton="true" onAction="#onSaveProfile" text="Next"
-                            GridPane.columnIndex="1" GridPane.rowIndex="12"/>
-
-                    <columnConstraints>
-                        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0"/>
-                        <ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="150.0"/>
-                    </columnConstraints>
-
-                    <rowConstraints>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="ALWAYS"/>
-                        <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                    </rowConstraints>
-
-                </GridPane>
-            </TitledPane>
-
-            <TitledPane fx:id="paySecurityDepositTitledPane" text="Pay security deposit">
-                <AnchorPane>
-                    <VBox spacing="20" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                          AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-
-                        <Label fx:id="infoLabel"/>
-
-                        <GridPane hgap="5.0" vgap="5.0">
-
-                            <Label text="Security deposit address:"/>
-                            <TextField fx:id="securityDepositAddressTextField" editable="false" focusTraversable="false"
-                                       GridPane.columnIndex="1"/>
-                            <Label fx:id="copyIcon" id="copy-icon" GridPane.columnIndex="2">
-                                <padding>
-                                    <Insets bottom="0.0" left="0.0" right="0.0" top="-1.0"/>
-                                </padding>
-                                <tooltip>
-                                    <Tooltip text="Copy address to clipboard"/>
-                                </tooltip>
-                            </Label>
-
-                            <Label text="Balance:" GridPane.rowIndex="1"/>
-                            <TextField fx:id="balanceTextField" editable="false" focusTraversable="false"
-                                       GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-                            <ConfidenceProgressIndicator fx:id="progressIndicator" GridPane.columnIndex="2"
-                                                         GridPane.halignment="LEFT"
-                                                         GridPane.rowIndex="1" GridPane.rowSpan="2"
-                                                         GridPane.valignment="TOP">
-                                <GridPane.margin>
-                                    <Insets top="2.0"/>
-                                </GridPane.margin>
-                            </ConfidenceProgressIndicator>
-                            <Label fx:id="confirmationLabel" text="Checking confirmations..." GridPane.columnIndex="3"
-                                   GridPane.rowIndex="1"/>
-
-                            <Button fx:id="paymentDoneButton" defaultButton="true" onAction="#onPaymentDone"
-                                    text="Payment done" disable="true" GridPane.columnIndex="1"
-                                    GridPane.rowIndex="2"/>
-
-
-                            <columnConstraints>
-                                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES"/>
-                                <ColumnConstraints hgrow="ALWAYS"/>
-                                <ColumnConstraints hgrow="SOMETIMES" prefWidth="20.0" minWidth="20"/>
-                                <ColumnConstraints hgrow="SOMETIMES"/>
-                                <ColumnConstraints hgrow="SOMETIMES"/>
-                            </columnConstraints>
-                            <rowConstraints>
-                                <RowConstraints vgrow="SOMETIMES"/>
-                                <RowConstraints vgrow="SOMETIMES"/>
-                                <RowConstraints vgrow="SOMETIMES"/>
-                                <RowConstraints vgrow="SOMETIMES"/>
-                            </rowConstraints>
-
-                        </GridPane>
-                    </VBox>
-                </AnchorPane>
-            </TitledPane>
-
-        </panes>
-    </Accordion>
-</AnchorPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
deleted file mode 100644
index 68da0c016e..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * 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.registration;
-
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.arbitration.ArbitratorService;
-import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.common.view.ActivatableView;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
-import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.gui.util.GUIUtil;
-import io.bitsquare.locale.BSResources;
-import io.bitsquare.locale.LanguageUtil;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.ECKey;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.Wallet;
-import org.bitcoinj.core.WalletEventListener;
-import org.bitcoinj.script.Script;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.stage.Stage;
-import javafx.util.StringConverter;
-
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
-
-@FxmlView
-public class ArbitratorRegistrationView extends ActivatableView<AnchorPane, Void> {
-
-    @FXML Accordion accordion;
-    @FXML TextArea descriptionTextArea;
-    @FXML Button saveProfileButton, paymentDoneButton;
-    @FXML Label nameLabel, infoLabel, copyIcon, confirmationLabel;
-    @FXML ComboBox<String> languageComboBox;
-    @FXML ComboBox<Arbitrator.ID_TYPE> idTypeComboBox;
-    @FXML ComboBox<Arbitrator.METHOD> methodsComboBox;
-    @FXML ConfidenceProgressIndicator progressIndicator;
-    @FXML ComboBox<Arbitrator.ID_VERIFICATION> idVerificationsComboBox;
-    @FXML TitledPane profileTitledPane, paySecurityDepositTitledPane;
-    @FXML TextField nameTextField, idTypeTextField, languagesTextField, maxTradeVolumeTextField,
-            passiveServiceFeeTextField, minPassiveServiceFeeTextField, arbitrationFeeTextField,
-            minArbitrationFeeTextField, methodsTextField, idVerificationsTextField, webPageTextField,
-            securityDepositAddressTextField, balanceTextField;
-
-    private boolean isEditMode;
-    private Arbitrator.ID_TYPE idType;
-
-    private List<String> languageCodes = new ArrayList<>();
-    private List<Arbitrator.METHOD> methodList = new ArrayList<>();
-    private List<Arbitrator.ID_VERIFICATION> idVerificationList = new ArrayList<>();
-
-    // TODO not set
-    private Arbitrator arbitrator;
-
-    private final WalletService walletService;
-    private final ArbitratorService arbitratorService;
-    private final BSFormatter formatter;
-
-
-    @Inject
-    private ArbitratorRegistrationView(WalletService walletService,
-                                       ArbitratorService arbitratorService, BSFormatter formatter) {
-        this.walletService = walletService;
-        this.arbitratorService = arbitratorService;
-        this.formatter = formatter;
-    }
-
-    @Override
-    public void initialize() {
-        accordion.setExpandedPane(profileTitledPane);
-
-        applyArbitrator();
-
-        languageComboBox.setItems(FXCollections.observableArrayList(LanguageUtil.getAllLanguageLocaleCodes()));
-        languageComboBox.setConverter(new StringConverter<String>() {
-            @Override
-            public String toString(String code) {
-                return LanguageUtil.getDisplayName(code);
-            }
-
-            @Override
-            public String fromString(String s) {
-                return null;
-            }
-        });
-
-        idTypeComboBox.setItems(FXCollections.observableArrayList(
-                new ArrayList<>(EnumSet.allOf(Arbitrator.ID_TYPE.class))));
-        idTypeComboBox.setConverter(new StringConverter<Arbitrator.ID_TYPE>() {
-            @Override
-            public String toString(Arbitrator.ID_TYPE item) {
-                return BSResources.get(item.toString());
-            }
-
-            @Override
-            public Arbitrator.ID_TYPE fromString(String s) {
-                return null;
-            }
-        });
-
-        methodsComboBox.setItems(FXCollections.observableArrayList(new ArrayList<>(EnumSet.allOf(Arbitrator.METHOD
-                .class))));
-        methodsComboBox.setConverter(new StringConverter<Arbitrator.METHOD>() {
-            @Override
-            public String toString(Arbitrator.METHOD item) {
-                return BSResources.get(item.toString());
-            }
-
-            @Override
-            public Arbitrator.METHOD fromString(String s) {
-                return null;
-            }
-        });
-
-        idVerificationsComboBox.setItems(
-                FXCollections.observableArrayList(new ArrayList<>(EnumSet.allOf(Arbitrator.ID_VERIFICATION.class))));
-        idVerificationsComboBox.setConverter(new StringConverter<Arbitrator.ID_VERIFICATION>() {
-            @Override
-            public String toString(Arbitrator.ID_VERIFICATION item) {
-                return BSResources.get(item.toString());
-            }
-
-            @Override
-            public Arbitrator.ID_VERIFICATION fromString(String s) {
-                return null;
-            }
-        });
-    }
-
-    public void setEditMode(boolean isEditMode) {
-        this.isEditMode = isEditMode;
-
-        if (isEditMode) {
-            saveProfileButton.setText("Save");
-            profileTitledPane.setCollapsible(false);
-            paySecurityDepositTitledPane.setVisible(false);
-        }
-    }
-
-    @FXML
-    public void onSelectIDType() {
-        idType = idTypeComboBox.getSelectionModel().getSelectedItem();
-        if (idType != null) {
-            idTypeTextField.setText(BSResources.get(idType.toString()));
-
-            String name = "";
-            switch (idType) {
-                case REAL_LIFE_ID:
-                    name = "Name:";
-                    break;
-                case NICKNAME:
-                    name = "Nickname:";
-                    break;
-                case COMPANY:
-                    name = "Company:";
-                    break;
-            }
-            nameLabel.setText(name);
-
-            idTypeComboBox.getSelectionModel().clearSelection();
-        }
-    }
-
-    @FXML
-    public void onAddLanguage() {
-        String item = languageComboBox.getSelectionModel().getSelectedItem();
-        if (!languageCodes.contains(item) && item != null) {
-            languageCodes.add(item);
-            languagesTextField.setText(formatter.languageCodesToString(languageCodes));
-            languageComboBox.getSelectionModel().clearSelection();
-        }
-    }
-
-    @FXML
-    public void onClearLanguages() {
-        languageCodes.clear();
-        languagesTextField.setText("");
-    }
-
-    @FXML
-    public void onAddMethod() {
-        Arbitrator.METHOD item = methodsComboBox.getSelectionModel().getSelectedItem();
-        if (!methodList.contains(item) && item != null) {
-            methodList.add(item);
-            methodsTextField.setText(formatter.arbitrationMethodsToString(methodList));
-            methodsComboBox.getSelectionModel().clearSelection();
-        }
-    }
-
-    @FXML
-    public void onClearMethods() {
-        methodList.clear();
-        methodsTextField.setText("");
-    }
-
-    @FXML
-    public void onAddIDVerification() {
-        Arbitrator.ID_VERIFICATION idVerification = idVerificationsComboBox.getSelectionModel().getSelectedItem();
-        if (idVerification != null) {
-            if (!idVerificationList.contains(idVerification)) {
-                idVerificationList.add(idVerification);
-                idVerificationsTextField.setText(
-                        formatter.arbitrationIDVerificationsToString(idVerificationList));
-            }
-        }
-
-        idVerificationsComboBox.getSelectionModel().clearSelection();
-    }
-
-    @FXML
-    public void onClearIDVerifications() {
-        idVerificationList.clear();
-        idVerificationsTextField.setText("");
-    }
-
-    @FXML
-    public void onSaveProfile() {
-        arbitrator.setWebUrl(webPageTextField.getText());
-        arbitrator.setFee(formatter.parseToCoin(arbitrationFeeTextField.getText()));
-        arbitrator.setIdType(idType);
-        arbitrator.setIdVerifications(idVerificationList);
-        arbitrator.setLanguageCodes(languageCodes);
-        arbitrator.setArbitrationMethods(methodList);
-        arbitrator.save();
-
-        if (isEditMode) {
-            close();
-        }
-        else {
-            setupPaySecurityDepositScreen();
-            accordion.setExpandedPane(paySecurityDepositTitledPane);
-        }
-
-        arbitratorService.addArbitrator(arbitrator,
-                () -> {
-                    // log.debug("arbitrator added successfully " + arbitratorService.getAllArbitrators().size());
-                },
-                log::error);
-    }
-
-    @FXML
-    public void onPaymentDone() {
-    }
-
-    private void setupPaySecurityDepositScreen() {
-        infoLabel.setText("You need to pay 2 x the max. trading volume as security deposit.\n\nThat payment will be " +
-                "locked into a MultiSig fund and be refunded when you leave the arbitration pool.\nIn case of fraud " +
-                "(collusion, not fulfilling the min. dispute quality requirements) you will lose your security " +
-                "deposit.\n" +
-                "If you have a negative feedback from your clients you will lose a part of the security deposit,\n" +
-                "depending on the overall relation of negative to positive ratings you received after a dispute " +
-                "resolution.\n\nPlease pay in 2 BTC");
-
-
-        String securityDepositAddress = walletService.getRegistrationAddressEntry() != null ?
-                walletService.getRegistrationAddressEntry().toString() : "";
-        securityDepositAddressTextField.setText(securityDepositAddress);
-
-        AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
-        copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(securityDepositAddress));
-
-        paymentDoneButton.setDisable(walletService.getArbitratorDepositBalance().isZero());
-        log.debug("getArbitratorDepositBalance " + walletService.getArbitratorDepositBalance());
-        walletService.getWallet().addEventListener(new WalletEventListener() {
-            @Override
-            public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
-                paymentDoneButton.setDisable(newBalance.isZero());
-            }
-
-            @Override
-            public void onCoinsSent(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
-
-            }
-
-            @Override
-            public void onReorganize(Wallet wallet) {
-
-            }
-
-            @Override
-            public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
-
-            }
-
-            @Override
-            public void onWalletChanged(Wallet wallet) {
-
-            }
-
-            @Override
-            public void onScriptsChanged(Wallet var1, List<Script> scripts, boolean isAddingScripts) {
-            }
-
-            @Override
-            public void onKeysAdded(List<ECKey> keys) {
-
-            }
-        });
-    }
-
-    private void applyArbitrator() {
-        if (arbitrator != null) {
-            String name = "";
-            switch (arbitrator.getIdType()) {
-                case REAL_LIFE_ID:
-                    name = "Name:";
-                    break;
-                case NICKNAME:
-                    name = "Nickname:";
-                    break;
-                case COMPANY:
-                    name = "Company:";
-                    break;
-            }
-            nameLabel.setText(name);
-
-            nameTextField.setText(arbitrator.getName());
-            idTypeTextField.setText(BSResources.get(arbitrator.getIdType().toString()));
-            // languagesTextField.setText(formatter.languageLocalesToString(arbitrator.getLanguages()));
-            arbitrationFeeTextField.setText(String.valueOf(arbitrator.getFee()));
-            methodsTextField.setText(formatter.arbitrationMethodsToString(arbitrator.getArbitrationMethods()));
-            idVerificationsTextField.setText(
-                    formatter.arbitrationIDVerificationsToString(arbitrator.getIdVerifications()));
-            webPageTextField.setText(arbitrator.getWebUrl());
-            descriptionTextArea.setText(arbitrator.getDescription());
-
-            idType = arbitrator.getIdType();
-            languageCodes = arbitrator.getLanguageCodes();
-            methodList = arbitrator.getArbitrationMethods();
-            idVerificationList = arbitrator.getIdVerifications();
-        }
-    }
-
-    private void close() {
-        Stage stage = (Stage) root.getScene().getWindow();
-        stage.close();
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java
deleted file mode 100644
index d50d4fa399..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountDataModel.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.content.altcoin;
-
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
-import io.bitsquare.locale.CountryUtil;
-import io.bitsquare.locale.CurrencyUtil;
-import io.bitsquare.user.User;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-class AltCoinAccountDataModel implements Activatable, DataModel {
-
-    private final User user;
-
-    final StringProperty nickName = new SimpleStringProperty();
-    final StringProperty currencyCode = new SimpleStringProperty();
-    final ObjectProperty<FiatAccount.Type> type = new SimpleObjectProperty<>();
-
-    final ObservableList<FiatAccount.Type> allTypes =
-            FXCollections.observableArrayList(FiatAccount.Type.getAllBankAccountTypes());
-    final ObservableList<String> allCurrencyCodes = FXCollections.observableArrayList(CurrencyUtil.getAllCurrencyCodes());
-    final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
-
-
-    @Inject
-    public AltCoinAccountDataModel(User user) {
-        this.user = user;
-    }
-
-    @Override
-    public void activate() {
-        allFiatAccounts.setAll(user.fiatAccountsObservableList());
-    }
-
-    @Override
-    public void deactivate() {
-        // no-op
-    }
-
-    void saveBankAccount() {
-        FiatAccount fiatAccount = new FiatAccount(type.get(),
-                currencyCode.get(),
-                CountryUtil.getDefaultCountry(),
-                nickName.get(),
-                nickName.get(),
-                "irc",
-                "irc");
-        user.addFiatAccount(fiatAccount);
-        allFiatAccounts.setAll(user.fiatAccountsObservableList());
-        reset();
-    }
-
-    void setType(FiatAccount.Type type) {
-        this.type.set(type);
-    }
-
-    void setCurrencyCode(String currencyCode) {
-        this.currencyCode.set(currencyCode);
-    }
-
-    private void reset() {
-        nickName.set(null);
-
-        type.set(null);
-        currencyCode.set(null);
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.fxml
deleted file mode 100644
index 4a30b595d9..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.fxml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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 io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.InputTextField?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.altcoin.AltCoinAccountView" 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">
-
-    <!--
-    Setup
-    -->
-    <TitledGroupBg text="Setup your payments account" GridPane.rowSpan="8"/>
-
-    <Label text="Payments method:" GridPane.rowIndex="0">
-        <GridPane.margin>
-            <Insets top="10"/>
-        </GridPane.margin>
-    </Label>
-    <ComboBox fx:id="typesComboBox" promptText="Select payments method" onAction="#onSelectType"
-              GridPane.rowIndex="0" GridPane.columnIndex="1">
-        <GridPane.margin>
-            <Insets top="10"/>
-        </GridPane.margin>
-    </ComboBox>
-
-    <Label text="Check if your nickname is available:" GridPane.rowIndex="1"/>
-    <Hyperlink text="Open IRC @Freenode #bitsquare-trading in browser"
-               onAction="#onOpenIRC" GridPane.columnIndex="1" GridPane.rowIndex="1" minHeight="26"/>
-
-    <Label text="Your IRC nick name:" GridPane.rowIndex="2"/>
-    <InputTextField fx:id="ircNickNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-
-    <Label text="Currency:" GridPane.rowIndex="3"/>
-    <ComboBox fx:id="currencyComboBox" promptText="Select currency"
-              onAction="#onSelectCurrency" GridPane.columnIndex="1"
-              GridPane.rowIndex="3"/>
-
-    <InfoDisplay gridPane="$root" onAction="#onOpenSetupHelp" rowIndex="4"
-                 text="The payments account data will be saved in a encrypted form to the Bitcoin block chain and will be used in the trade process for account verification."/>
-
-    <HBox fx:id="buttonsHBox" GridPane.columnIndex="1" GridPane.rowIndex="5" spacing="10">
-        <Button fx:id="saveButton" text="Save" onAction="#onSave" defaultButton="true" disable="true"/>
-        <GridPane.margin>
-            <Insets top="15.0" bottom="5.0"/>
-        </GridPane.margin>
-    </HBox>
-
-
-    <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="250.0"/>
-        <ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-    </rowConstraints>
-
-</GridPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java
deleted file mode 100644
index 8caa17afc4..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountView.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * 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.content.altcoin;
-
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.Wizard;
-import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.locale.CurrencyUtil;
-import io.bitsquare.util.Utilities;
-
-import javax.inject.Inject;
-
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.util.Callback;
-
-/**
- * Just temporary for giving the user a possibility to test the app via simulating the bank transfer in a IRC chat.
- */
-@FxmlView
-public class AltCoinAccountView extends ActivatableViewAndModel<GridPane, AltCoinAccountViewModel> implements Wizard.Step {
-
-    @FXML HBox buttonsHBox;
-    @FXML InputTextField ircNickNameTextField;
-    @FXML Button saveButton;
-    @FXML ComboBox<FiatAccount.Type> typesComboBox;
-    @FXML ComboBox<String> currencyComboBox;
-
-    private Wizard wizard;
-
-    @Inject
-    public AltCoinAccountView(AltCoinAccountViewModel model) {
-        super(model);
-    }
-
-    @Override
-    public void doActivate() {
-        ircNickNameTextField.setValidator(model.getNickNameValidator());
-
-        typesComboBox.setItems(model.getAllTypes());
-        typesComboBox.setConverter(model.getTypesConverter());
-        // we use a custom cell for deactivating non IRC items, later we use the standard cell and the StringConverter
-        typesComboBox.setCellFactory(new Callback<ListView<FiatAccount.Type>, ListCell<FiatAccount.Type>>() {
-            @Override
-            public ListCell<FiatAccount.Type> call(ListView<FiatAccount.Type> p) {
-                return new ListCell<FiatAccount.Type>() {
-
-                    @Override
-                    protected void updateItem(FiatAccount.Type item, boolean empty) {
-                        super.updateItem(item, empty);
-
-                        setText(model.getBankAccountType(item));
-
-                        if (item == null || empty) {
-                            setGraphic(null);
-                        }
-                        else if (item != FiatAccount.Type.IRC) {
-                            setOpacity(0.3);
-                            setDisable(true);
-                        }
-                    }
-                };
-            }
-        });
-        typesComboBox.getSelectionModel().select(0);
-
-        currencyComboBox.setItems(model.getAllCurrencyCodes());
-        currencyComboBox.setConverter(model.getCurrencyConverter());
-        // we use a custom cell for deactivating non EUR items, later we use the standard cell and the StringConverter
-        currencyComboBox.setCellFactory(new Callback<ListView<String>, ListCell<String>>() {
-            @Override
-            public ListCell<String> call(ListView<String> p) {
-                return new ListCell<String>() {
-
-                    @Override
-                    protected void updateItem(String currencyCode, boolean empty) {
-                        super.updateItem(currencyCode, empty);
-
-                        if (currencyCode == null || empty) {
-                            setGraphic(null);
-                        }
-                        else {
-                            setText(currencyCode + " (" + CurrencyUtil.getDisplayName(currencyCode) + ")");
-
-                            if (!currencyCode.equals("EUR")) {
-                                setOpacity(0.3);
-                                setDisable(true);
-                            }
-                        }
-                    }
-                };
-            }
-        });
-        currencyComboBox.getSelectionModel().select(0);
-
-        setupListeners();
-        setupBindings();
-
-        Platform.runLater(() -> Popups.openInfoPopup("Demo setup for simulating the banking transfer",
-                "For demo purposes we use a special setup so that users can simulate the banking transfer when " +
-                        "meeting in an IRC chat room.\n" +
-                        "You need to define your IRC nickname and later in the trade process you can find your " +
-                        "trading partner with his IRC nickname in the chat room and simulate the bank transfer " +
-                        "activities, which are:\n\n" +
-                        "1. Bitcoin buyer indicates that he has started the bank transfer.\n\n" +
-                        "2. Bitcoin seller confirms that he has received the national currency from the " +
-                        "bank transfer."));
-    }
-
-    @Override
-    public void setWizard(Wizard wizard) {
-        this.wizard = wizard;
-    }
-
-    @Override
-    public void hideWizardNavigation() {
-    }
-
-    @FXML
-    void onSelectType() {
-        model.setType(typesComboBox.getSelectionModel().getSelectedItem());
-    }
-
-    @FXML
-    void onSelectCurrency() {
-        model.setCurrencyCode(currencyComboBox.getSelectionModel().getSelectedItem());
-    }
-
-    @FXML
-    void onSave() {
-        boolean isValid = model.requestSaveBankAccount().isValid;
-        if (wizard != null && isValid)
-            wizard.nextStep(this);
-    }
-
-    @FXML
-    void onOpenSetupHelp() {
-        Help.openWindow(HelpId.SETUP_FIAT_ACCOUNT);
-    }
-
-    @FXML
-    void onOpenIRC() {
-        try {
-            Utilities.openWebPage("https://webchat.freenode.net/?channels=bitsquare-trading");
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            Popups.openWarningPopup("Warning", "Opening browser failed. Please check your internet " +
-                    "connection.");
-        }
-    }
-
-    private void setupListeners() {
-        model.type.addListener((ov, oldValue, newValue) -> {
-            if (newValue != null)
-                typesComboBox.getSelectionModel().select(typesComboBox.getItems().indexOf(newValue));
-            else
-                typesComboBox.getSelectionModel().clearSelection();
-        });
-
-        model.currencyCode.addListener((ov, oldValue, newValue) -> {
-            if (newValue != null)
-                currencyComboBox.getSelectionModel().select(currencyComboBox.getItems().indexOf(newValue));
-            else
-                currencyComboBox.getSelectionModel().clearSelection();
-        });
-    }
-
-    private void setupBindings() {
-        // input
-        ircNickNameTextField.textProperty().bindBidirectional(model.ircNickName);
-        saveButton.disableProperty().bind(model.saveButtonDisable);
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java
deleted file mode 100644
index fd81dd8751..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoin/AltCoinAccountViewModel.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.content.altcoin;
-
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.common.model.ActivatableWithDataModel;
-import io.bitsquare.gui.common.model.ViewModel;
-import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
-import io.bitsquare.gui.util.validation.InputValidator;
-import io.bitsquare.locale.BSResources;
-import io.bitsquare.locale.CurrencyUtil;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.ObservableList;
-import javafx.util.StringConverter;
-
-class AltCoinAccountViewModel extends ActivatableWithDataModel<AltCoinAccountDataModel> implements ViewModel {
-
-    private final InputValidator nickNameValidator;
-
-    final StringProperty ircNickName = new SimpleStringProperty();
-    final StringProperty currencyCode = new SimpleStringProperty();
-    final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true);
-    final ObjectProperty<FiatAccount.Type> type = new SimpleObjectProperty<>();
-
-    @Inject
-    public AltCoinAccountViewModel(AltCoinAccountDataModel dataModel, BankAccountNumberValidator nickNameValidator) {
-        super(dataModel);
-        this.nickNameValidator = nickNameValidator;
-
-        // input
-        ircNickName.bindBidirectional(dataModel.nickName);
-        type.bindBidirectional(dataModel.type);
-        currencyCode.bindBidirectional(dataModel.currencyCode);
-
-        dataModel.nickName.addListener((ov, oldValue, newValue) -> validateInput());
-    }
-
-
-    InputValidator.ValidationResult requestSaveBankAccount() {
-        InputValidator.ValidationResult result = validateInput();
-        if (result.isValid) {
-            dataModel.saveBankAccount();
-        }
-        return result;
-    }
-
-    StringConverter<FiatAccount.Type> getTypesConverter() {
-        return new StringConverter<FiatAccount.Type>() {
-            @Override
-            public String toString(FiatAccount.Type TypeInfo) {
-                return BSResources.get(TypeInfo.toString());
-            }
-
-            @Override
-            public FiatAccount.Type fromString(String s) {
-                return null;
-            }
-        };
-    }
-
-    String getBankAccountType(FiatAccount.Type fiatAccountType) {
-        return fiatAccountType != null ? BSResources.get(fiatAccountType.toString()) : "";
-    }
-
-    StringConverter<String> getCurrencyConverter() {
-        return new StringConverter<String>() {
-            @Override
-            public String toString(String currencyCode) {
-                return currencyCode + " (" + CurrencyUtil.getDisplayName(currencyCode) + ")";
-            }
-
-            @Override
-            public String fromString(String s) {
-                return null;
-            }
-        };
-    }
-
-
-    ObservableList<FiatAccount.Type> getAllTypes() {
-        return dataModel.allTypes;
-    }
-
-    ObservableList<String> getAllCurrencyCodes() {
-        return dataModel.allCurrencyCodes;
-    }
-
-    InputValidator getNickNameValidator() {
-        return nickNameValidator;
-    }
-
-
-    void setType(FiatAccount.Type type) {
-        dataModel.setType(type);
-        validateInput();
-    }
-
-    void setCurrencyCode(String currencyCode) {
-        dataModel.setCurrencyCode(currencyCode);
-        validateInput();
-    }
-
-
-    private InputValidator.ValidationResult validateInput() {
-        InputValidator.ValidationResult result = nickNameValidator.validate(dataModel.nickName.get());
-        if (dataModel.currencyCode.get() == null)
-            result = new InputValidator.ValidationResult(false,
-                    "You have not selected a currency");
-        if (result.isValid) {
-            if (dataModel.type.get() == null)
-                result = new InputValidator.ValidationResult(false,
-                        "You have not selected a payments method");
-        }
-
-        saveButtonDisable.set(!result.isValid);
-        return result;
-    }
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
deleted file mode 100644
index bf9ad6af23..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * 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.content.fiat;
-
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.CountryUtil;
-import io.bitsquare.locale.CurrencyUtil;
-import io.bitsquare.locale.Region;
-import io.bitsquare.user.AccountSettings;
-import io.bitsquare.user.User;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-class FiatAccountDataModel implements Activatable, DataModel {
-
-    private final User user;
-    private final AccountSettings accountSettings;
-
-    final StringProperty title = new SimpleStringProperty();
-    final StringProperty holderName = new SimpleStringProperty();
-    final StringProperty primaryID = new SimpleStringProperty();
-    final StringProperty secondaryID = new SimpleStringProperty();
-    final StringProperty primaryIDPrompt = new SimpleStringProperty();
-    final StringProperty secondaryIDPrompt = new SimpleStringProperty();
-    final StringProperty currencyCode = new SimpleStringProperty();
-    final BooleanProperty countryNotInAcceptedCountriesList = new SimpleBooleanProperty();
-    final ObjectProperty<FiatAccount.Type> type = new SimpleObjectProperty<>();
-    final ObjectProperty<Country> country = new SimpleObjectProperty<>();
-
-    final ObservableList<FiatAccount.Type> allTypes = FXCollections.observableArrayList(FiatAccount.Type
-            .getAllBankAccountTypes());
-    final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
-    final ObservableList<String> allCurrencyCodes = FXCollections.observableArrayList(CurrencyUtil
-            .getAllCurrencyCodes());
-    final ObservableList<Region> allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions());
-
-
-    @Inject
-    public FiatAccountDataModel(User user, AccountSettings accountSettings) {
-        this.user = user;
-        this.accountSettings = accountSettings;
-    }
-
-
-    @Override
-    public void activate() {
-        allFiatAccounts.setAll(user.fiatAccountsObservableList());
-    }
-
-    @Override
-    public void deactivate() {
-        // no-op
-    }
-
-
-    void saveBankAccount() {
-        FiatAccount fiatAccount = new FiatAccount(type.get(),
-                currencyCode.get(),
-                country.get(),
-                title.get(),
-                holderName.get(),
-                primaryID.get(),
-                secondaryID.get());
-        user.addFiatAccount(fiatAccount);
-        allFiatAccounts.setAll(user.fiatAccountsObservableList());
-        countryNotInAcceptedCountriesList.set(!accountSettings.getAcceptedCountries().contains(country.get()));
-        reset();
-    }
-
-    void removeBankAccount() {
-        user.removeFiatAccount(user.currentFiatAccountProperty().get());
-        allFiatAccounts.setAll(user.fiatAccountsObservableList());
-        reset();
-    }
-
-    // We ask the user if he likes to add his own bank account country to the accepted country list if he has not
-    // already added it before
-    void addCountryToAcceptedCountriesList() {
-        accountSettings.addAcceptedCountry(country.get());
-        countryNotInAcceptedCountriesList.set(false);
-    }
-
-    void selectBankAccount(FiatAccount fiatAccount) {
-        user.setCurrentFiatAccountProperty(fiatAccount);
-
-        if (fiatAccount != null) {
-            title.set(fiatAccount.nameOfBank);
-            holderName.set(fiatAccount.accountHolderName);
-            primaryID.set(fiatAccount.accountPrimaryID);
-            secondaryID.set(fiatAccount.accountSecondaryID);
-            primaryIDPrompt.set(fiatAccount.type.primaryId);
-            secondaryIDPrompt.set(fiatAccount.type.secondaryId);
-
-            type.set(fiatAccount.type);
-            country.set(fiatAccount.country);
-            currencyCode.set(fiatAccount.currencyCode);
-        }
-        else {
-            reset();
-        }
-    }
-
-
-    ObservableList<Country> getAllCountriesFor(Region selectedRegion) {
-        return FXCollections.observableArrayList(CountryUtil.getAllCountriesFor(selectedRegion));
-    }
-
-
-    void setType(FiatAccount.Type type) {
-        this.type.set(type);
-
-        if (type != null) {
-            primaryIDPrompt.set(type.primaryId);
-            secondaryIDPrompt.set(type.secondaryId);
-        }
-        else {
-            primaryIDPrompt.set(null);
-            secondaryIDPrompt.set(null);
-        }
-    }
-
-    void setCountry(Country country) {
-        this.country.set(country);
-    }
-
-    void setCurrencyCode(String currencyCode) {
-        this.currencyCode.set(currencyCode);
-    }
-
-
-    private void reset() {
-        title.set(null);
-        holderName.set(null);
-        primaryID.set(null);
-        secondaryID.set(null);
-        primaryIDPrompt.set(null);
-        secondaryIDPrompt.set(null);
-
-        type.set(null);
-        country.set(null);
-        currencyCode.set(null);
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml
deleted file mode 100644
index f4be515544..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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 io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.InputTextField?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?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.FiatAccountView" 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">
-
-    <!--
-    Setup
-    -->
-    <TitledGroupBg text="Setup your payments account" GridPane.rowSpan="8"/>
-
-    <Label text="Payments method:" GridPane.rowIndex="0">
-        <GridPane.margin>
-            <Insets top="10"/>
-        </GridPane.margin>
-    </Label>
-    <ComboBox fx:id="typesComboBox" promptText="Select payments method" onAction="#onSelectType"
-              GridPane.rowIndex="0" GridPane.columnIndex="1">
-        <GridPane.margin>
-            <Insets top="10"/>
-        </GridPane.margin>
-    </ComboBox>
-
-    <Label text="Name of Bank:" GridPane.rowIndex="1"/>
-    <InputTextField fx:id="nameOfBankTextField" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-
-    <Label text="Location of Bank:" GridPane.rowIndex="2"/>
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="2" spacing="10">
-        <ComboBox fx:id="regionComboBox" promptText="Select region"
-                  onAction="#onSelectRegion" prefWidth="150.0"/>
-        <ComboBox fx:id="countryComboBox" promptText="Select country" onAction="#onSelectCountry"
-                  visible="false" prefWidth="150.0"/>
-    </HBox>
-
-    <Label text="Your name:" GridPane.rowIndex="3"/>
-    <InputTextField fx:id="holderNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
-
-    <Label text="IBAN:" GridPane.rowIndex="4"/>
-    <InputTextField fx:id="primaryIDTextField" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
-
-    <Label text="BIC:" GridPane.rowIndex="5"/>
-    <InputTextField fx:id="secondaryIDTextField" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
-
-    <Label text="Currency:" GridPane.rowIndex="6"/>
-    <ComboBox fx:id="currencyComboBox" promptText="Select currency"
-              onAction="#onSelectCurrency" GridPane.columnIndex="1"
-              GridPane.rowIndex="6"/>
-
-    <InfoDisplay gridPane="$root" onAction="#onOpenSetupHelp" rowIndex="7"
-                 text="The payments account data will be saved in a encrypted form to the Bitcoin block chain and will be used in the trade process for account verification."/>
-
-    <HBox fx:id="buttonsHBox" GridPane.columnIndex="1" GridPane.rowIndex="8" spacing="10">
-        <Button fx:id="saveButton" text="Save" onAction="#onSave" defaultButton="true" disable="true"/>
-        <Button fx:id="completedButton" text="Continue to the next step" onAction="#onCompleted" disable="true"/>
-        <GridPane.margin>
-            <Insets top="15.0" bottom="5.0"/>
-        </GridPane.margin>
-    </HBox>
-
-    <!--
-    Manage
-    -->
-    <TitledGroupBg text="Manage payments accounts" GridPane.rowIndex="9" GridPane.rowSpan="4">
-        <padding>
-            <Insets top="40.0"/>
-        </padding>
-        <GridPane.margin>
-            <Insets bottom="-10" left="-10" right="-10" top="20"/>
-        </GridPane.margin>
-    </TitledGroupBg>
-
-    <Label text="Select payments account:" GridPane.rowIndex="9">
-        <GridPane.margin>
-            <Insets top="40"/>
-        </GridPane.margin>
-    </Label>
-    <ComboBox fx:id="selectionComboBox" onAction="#onSelectAccount" GridPane.rowIndex="9"
-              GridPane.columnIndex="1">
-        <GridPane.margin>
-            <Insets top="40"/>
-        </GridPane.margin>
-    </ComboBox>
-
-    <Label text="Remove selected account:" GridPane.rowIndex="10"/>
-    <Button fx:id="removeBankAccountButton" text="Remove selected payments account" onAction="#onRemoveAccount"
-            GridPane.columnIndex="1" GridPane.rowIndex="10" disable="true"/>
-
-    <InfoDisplay gridPane="$root" onAction="#onOpenManageAccountsHelp" rowIndex="11"
-                 text="When you change your payments accounts later you need to do the renew the registration and pay the small registration fee."/>
-
-    <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="200.0"/>
-        <ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-    </rowConstraints>
-
-</GridPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
deleted file mode 100644
index ccf1b0d264..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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.content.fiat;
-
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.Wizard;
-import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.util.validation.InputValidator;
-import io.bitsquare.locale.BSResources;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.Region;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import javafx.collections.ListChangeListener;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
-import org.controlsfx.control.action.AbstractAction;
-import org.controlsfx.control.action.Action;
-import org.controlsfx.dialog.Dialog;
-
-import static javafx.beans.binding.Bindings.createBooleanBinding;
-
-@FxmlView
-public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccountViewModel> implements Wizard.Step {
-
-    @FXML HBox buttonsHBox;
-    @FXML ComboBox<Region> regionComboBox;
-    @FXML ComboBox<Country> countryComboBox;
-    @FXML InputTextField nameOfBankTextField, holderNameTextField, primaryIDTextField, secondaryIDTextField;
-    @FXML Button saveButton, completedButton, removeBankAccountButton;
-    @FXML ComboBox<FiatAccount> selectionComboBox;
-    @FXML ComboBox<FiatAccount.Type> typesComboBox;
-    @FXML ComboBox<String> currencyComboBox;
-
-    private Wizard wizard;
-
-
-    @Inject
-    public FiatAccountView(FiatAccountViewModel model) {
-        super(model);
-    }
-
-    @Override
-    public void initialize() {
-        typesComboBox.setItems(model.getAllTypes());
-        typesComboBox.setConverter(model.getTypesConverter());
-        selectionComboBox.setConverter(model.getSelectionConverter());
-        currencyComboBox.setItems(model.getAllCurrencyCodes());
-        currencyComboBox.setConverter(model.getCurrencyConverter());
-        regionComboBox.setItems(model.getAllRegions());
-        regionComboBox.setConverter(model.getRegionConverter());
-        countryComboBox.setConverter(model.getCountryConverter());
-
-        nameOfBankTextField.setValidator(model.getBankAccountNumberValidator());
-        holderNameTextField.setValidator(model.getBankAccountNumberValidator());
-        primaryIDTextField.setValidator(model.getBankAccountNumberValidator());
-        secondaryIDTextField.setValidator(model.getBankAccountNumberValidator());
-    }
-
-    @Override
-    public void doActivate() {
-        setupListeners();
-        setupBindings();
-
-        selectionComboBox.setItems(model.getAllBankAccounts());
-    }
-
-    @Override
-    public void setWizard(Wizard wizard) {
-        this.wizard = wizard;
-    }
-
-    @Override
-    public void hideWizardNavigation() {
-        buttonsHBox.getChildren().remove(completedButton);
-    }
-
-    @FXML
-    void onSelectAccount() {
-        if (selectionComboBox.getSelectionModel().getSelectedItem() != null)
-            model.selectBankAccount(selectionComboBox.getSelectionModel().getSelectedItem());
-    }
-
-    @FXML
-    void onSelectType() {
-        model.setType(typesComboBox.getSelectionModel().getSelectedItem());
-    }
-
-    @FXML
-    void onSelectCurrency() {
-        model.setCurrencyCode(currencyComboBox.getSelectionModel().getSelectedItem());
-    }
-
-    @FXML
-    void onSelectRegion() {
-        countryComboBox.setVisible(true);
-        Region region = regionComboBox.getSelectionModel().getSelectedItem();
-        if (region != null)
-            countryComboBox.setItems(model.getAllCountriesFor(region));
-    }
-
-    @FXML
-    void onSelectCountry() {
-        Country country = countryComboBox.getSelectionModel().getSelectedItem();
-        if (country != null)
-            model.setCountry(country);
-    }
-
-    @FXML
-    void onSave() {
-        InputValidator.ValidationResult result = model.requestSaveBankAccount();
-        if (result.isValid) {
-            selectionComboBox.getSelectionModel().select(null);
-            Popups.openInfoPopup("Your payments account has been saved.",
-                    "You can add more accounts or continue to the next step.");
-        }
-    }
-
-    @FXML
-    void onCompleted() {
-        if (wizard != null)
-            wizard.nextStep(this);
-    }
-
-    @FXML
-    void onRemoveAccount() {
-        model.removeBankAccount();
-        selectionComboBox.getSelectionModel().select(null);
-    }
-
-    @FXML
-    void onOpenSetupHelp() {
-        Help.openWindow(HelpId.SETUP_FIAT_ACCOUNT);
-    }
-
-    @FXML
-    void onOpenManageAccountsHelp() {
-        Help.openWindow(HelpId.MANAGE_FIAT_ACCOUNT);
-    }
-
-
-    private void setupListeners() {
-        model.type.addListener((ov, oldValue, newValue) -> {
-            if (newValue != null)
-                typesComboBox.getSelectionModel().select(typesComboBox.getItems().indexOf(newValue));
-            else
-                typesComboBox.getSelectionModel().clearSelection();
-        });
-
-        model.currencyCode.addListener((ov, oldValue, newValue) -> {
-            if (newValue != null)
-                currencyComboBox.getSelectionModel().select(currencyComboBox.getItems().indexOf(newValue));
-            else
-                currencyComboBox.getSelectionModel().clearSelection();
-        });
-
-        model.country.addListener((ov, oldValue, newValue) -> {
-            if (newValue != null) {
-                int regionIndex = regionComboBox.getItems().indexOf(newValue.region);
-                if (regionIndex >= 0 && regionIndex < regionComboBox.getItems().size())
-                    regionComboBox.getSelectionModel().select(regionComboBox.getItems().indexOf(newValue.region));
-
-                int countryIndex = countryComboBox.getItems().indexOf(newValue);
-                if (countryIndex >= 0 && countryIndex < countryComboBox.getItems().size())
-                    countryComboBox.getSelectionModel().select(countryIndex);
-            }
-            else {
-                regionComboBox.getSelectionModel().clearSelection();
-                countryComboBox.getSelectionModel().clearSelection();
-            }
-        });
-
-        model.getCountryNotInAcceptedCountriesList().addListener((ov, oldValue, newValue) -> {
-            if (newValue) {
-                OverlayManager.blurContent();
-                List<Action> actions = new ArrayList<>();
-                actions.add(new AbstractAction(BSResources.get("shared.no")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "NO");
-                        Dialog.Actions.NO.handle(actionEvent);
-                    }
-                });
-
-                actions.add(new AbstractAction(BSResources.get("shared.yes")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "YES");
-                        Dialog.Actions.YES.handle(actionEvent);
-                    }
-                });
-
-                Action response = Popups.openConfirmPopup("Warning", null,
-                        "The country of your payments account is not included in your list of accepted countries" +
-                                ".\n\nDo you want to add it automatically?",
-                        actions);
-
-                if (Popups.isYes(response))
-                    model.addCountryToAcceptedCountriesList();
-
-                OverlayManager.removeBlurContent();
-            }
-        });
-
-        model.getAllBankAccounts().addListener((ListChangeListener<FiatAccount>) change ->
-                completedButton.setDisable(model.getAllBankAccounts().isEmpty()));
-        completedButton.setDisable(model.getAllBankAccounts().isEmpty());
-    }
-
-    private void setupBindings() {
-        // input
-        nameOfBankTextField.textProperty().bindBidirectional(model.title);
-        holderNameTextField.textProperty().bindBidirectional(model.holderName);
-        primaryIDTextField.textProperty().bindBidirectional(model.primaryID);
-        secondaryIDTextField.textProperty().bindBidirectional(model.secondaryID);
-
-        primaryIDTextField.promptTextProperty().bind(model.primaryIDPrompt);
-        secondaryIDTextField.promptTextProperty().bind(model.secondaryIDPrompt);
-        selectionComboBox.promptTextProperty().bind(model.selectionPrompt);
-        selectionComboBox.disableProperty().bind(model.selectionDisable);
-
-        saveButton.disableProperty().bind(model.saveButtonDisable);
-
-        removeBankAccountButton.disableProperty().bind(createBooleanBinding(() ->
-                        (selectionComboBox.getSelectionModel().selectedIndexProperty().get() == -1),
-                selectionComboBox.getSelectionModel().selectedIndexProperty()));
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
deleted file mode 100644
index ce25314ea1..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * 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.content.fiat;
-
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.common.model.ActivatableWithDataModel;
-import io.bitsquare.gui.common.model.ViewModel;
-import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
-import io.bitsquare.gui.util.validation.InputValidator;
-import io.bitsquare.locale.BSResources;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.CurrencyUtil;
-import io.bitsquare.locale.Region;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.util.StringConverter;
-
-class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel> implements ViewModel {
-
-    private final BankAccountNumberValidator bankAccountNumberValidator;
-
-    final StringProperty title = new SimpleStringProperty();
-    final StringProperty holderName = new SimpleStringProperty();
-    final StringProperty primaryID = new SimpleStringProperty();
-    final StringProperty secondaryID = new SimpleStringProperty();
-    final StringProperty primaryIDPrompt = new SimpleStringProperty();
-    final StringProperty secondaryIDPrompt = new SimpleStringProperty();
-    final StringProperty selectionPrompt = new SimpleStringProperty();
-    final StringProperty currencyCode = new SimpleStringProperty();
-    final BooleanProperty selectionDisable = new SimpleBooleanProperty();
-    final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true);
-    final ObjectProperty<FiatAccount.Type> type = new SimpleObjectProperty<>();
-    final ObjectProperty<Country> country = new SimpleObjectProperty<>();
-
-
-    @Inject
-    public FiatAccountViewModel(FiatAccountDataModel dataModel, BankAccountNumberValidator bankAccountNumberValidator) {
-        super(dataModel);
-        this.bankAccountNumberValidator = bankAccountNumberValidator;
-
-        // input
-        title.bindBidirectional(dataModel.title);
-        holderName.bindBidirectional(dataModel.holderName);
-        primaryID.bindBidirectional(dataModel.primaryID);
-        secondaryID.bindBidirectional(dataModel.secondaryID);
-        type.bindBidirectional(dataModel.type);
-        country.bindBidirectional(dataModel.country);
-        currencyCode.bindBidirectional(dataModel.currencyCode);
-
-        primaryIDPrompt.bind(dataModel.primaryIDPrompt);
-        secondaryIDPrompt.bind(dataModel.secondaryIDPrompt);
-
-        selectionPrompt.set("No bank account available");
-        selectionDisable.set(true);
-
-        dataModel.title.addListener((ov, oldValue, newValue) -> validateInput());
-        holderName.addListener((ov, oldValue, newValue) -> validateInput());
-        primaryID.addListener((ov, oldValue, newValue) -> validateInput());
-        secondaryID.addListener((ov, oldValue, newValue) -> validateInput());
-    }
-
-    @Override
-    public void doActivate() {
-        dataModel.allFiatAccounts.addListener((ListChangeListener<FiatAccount>) change -> applyAllBankAccounts());
-        applyAllBankAccounts();
-    }
-
-
-    InputValidator.ValidationResult requestSaveBankAccount() {
-        InputValidator.ValidationResult result = validateInput();
-        if (result.isValid) {
-            dataModel.saveBankAccount();
-        }
-        return result;
-    }
-
-    void removeBankAccount() {
-        dataModel.removeBankAccount();
-    }
-
-    void addCountryToAcceptedCountriesList() {
-        dataModel.addCountryToAcceptedCountriesList();
-    }
-
-    void selectBankAccount(FiatAccount fiatAccount) {
-        dataModel.selectBankAccount(fiatAccount);
-    }
-
-
-    StringConverter<FiatAccount.Type> getTypesConverter() {
-        return new StringConverter<FiatAccount.Type>() {
-            @Override
-            public String toString(FiatAccount.Type TypeInfo) {
-                return BSResources.get(TypeInfo.toString());
-            }
-
-            @Override
-            public FiatAccount.Type fromString(String s) {
-                return null;
-            }
-        };
-    }
-
-    StringConverter<FiatAccount> getSelectionConverter() {
-        return new StringConverter<FiatAccount>() {
-            @Override
-            public String toString(FiatAccount fiatAccount) {
-                return fiatAccount.nameOfBank;
-            }
-
-            @Override
-            public FiatAccount fromString(String s) {
-                return null;
-            }
-        };
-    }
-
-    StringConverter<String> getCurrencyConverter() {
-        return new StringConverter<String>() {
-
-            @Override
-            public String toString(String currencyCode) {
-                return currencyCode + " (" + CurrencyUtil.getDisplayName(currencyCode) + ")";
-            }
-
-
-            @Override
-            public String fromString(String s) {
-                return null;
-            }
-        };
-    }
-
-    StringConverter<Region> getRegionConverter() {
-        return new StringConverter<io.bitsquare.locale.Region>() {
-            @Override
-            public String toString(io.bitsquare.locale.Region region) {
-                return region.name;
-            }
-
-            @Override
-            public io.bitsquare.locale.Region fromString(String s) {
-                return null;
-            }
-        };
-    }
-
-    StringConverter<Country> getCountryConverter() {
-        return new StringConverter<Country>() {
-            @Override
-            public String toString(Country country) {
-                return country.name;
-            }
-
-            @Override
-            public Country fromString(String s) {
-                return null;
-            }
-        };
-    }
-
-
-    ObservableList<FiatAccount.Type> getAllTypes() {
-        return dataModel.allTypes;
-    }
-
-    ObservableList<FiatAccount> getAllBankAccounts() {
-        return dataModel.allFiatAccounts;
-    }
-
-    ObservableList<String> getAllCurrencyCodes() {
-        return dataModel.allCurrencyCodes;
-    }
-
-    ObservableList<Region> getAllRegions() {
-        return dataModel.allRegions;
-    }
-
-    BooleanProperty getCountryNotInAcceptedCountriesList() {
-        return dataModel.countryNotInAcceptedCountriesList;
-    }
-
-    ObservableList<Country> getAllCountriesFor(Region selectedRegion) {
-        return dataModel.getAllCountriesFor(selectedRegion);
-    }
-
-    BankAccountNumberValidator getBankAccountNumberValidator() {
-        return bankAccountNumberValidator;
-    }
-
-
-    void setType(FiatAccount.Type type) {
-        dataModel.setType(type);
-        validateInput();
-    }
-
-    void setCountry(Country country) {
-        dataModel.setCountry(country);
-        validateInput();
-    }
-
-    void setCurrencyCode(String currencyCode) {
-        dataModel.setCurrencyCode(currencyCode);
-        validateInput();
-    }
-
-
-    private void applyAllBankAccounts() {
-        if (dataModel.allFiatAccounts.isEmpty()) {
-            selectionPrompt.set("No bank account available");
-            selectionDisable.set(true);
-        }
-        else {
-            selectionPrompt.set("Select bank account");
-            selectionDisable.set(false);
-        }
-    }
-
-    private InputValidator.ValidationResult validateInput() {
-        InputValidator.ValidationResult result = bankAccountNumberValidator.validate(dataModel.title.get());
-        if (result.isValid) {
-            result = bankAccountNumberValidator.validate(dataModel.holderName.get());
-            if (result.isValid) {
-                result = bankAccountNumberValidator.validate(dataModel.primaryID.get());
-                if (result.isValid) {
-                    result = bankAccountNumberValidator.validate(dataModel.secondaryID.get());
-                    if (result.isValid) {
-                        if (dataModel.currencyCode.get() == null)
-                            result = new InputValidator.ValidationResult(false,
-                                    "You have not selected a currency");
-                        if (result.isValid) {
-                            if (dataModel.country.get() == null)
-                                result = new InputValidator.ValidationResult(false,
-                                        "You have not selected a country of the payments account");
-                            if (result.isValid) {
-                                if (dataModel.type.get() == null)
-                                    result = new InputValidator.ValidationResult(false,
-                                            "You have not selected a payments method");
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        saveButtonDisable.set(!result.isValid);
-        return result;
-    }
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml
index 102c5c7e7c..9ca8d7ac0f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml
@@ -17,58 +17,16 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?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.PasswordView" hgap="5.0"
-          vgap="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"
+          AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0"
           xmlns:fx="http://javafx.com/fxml">
 
-    <TitledGroupBg text="Setup password" GridPane.rowSpan="4"/>
-
-    <Label text="Enter password:">
-        <GridPane.margin>
-            <Insets top="10.0"/>
-        </GridPane.margin>
-    </Label>
-
-    <PasswordField fx:id="passwordField" promptText="Min. 8 characters" GridPane.columnIndex="1">
-        <GridPane.margin>
-            <Insets top="10.0"/>
-        </GridPane.margin>
-    </PasswordField>
-
-    <Label text="Repeat password:" GridPane.rowIndex="1"/>
-    <PasswordField fx:id="repeatedPasswordField" promptText="Repeat password" GridPane.columnIndex="1"
-                   GridPane.rowIndex="1"/>
-
-    <HBox fx:id="buttonsHBox" spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="2">
-        <Button fx:id="saveButton" text="Save password" onAction="#onSaved" disable="true" defaultButton="true"/>
-        <Button fx:id="skipButton" text="I will not use a password" onAction="#onSkipped"/>
-        <GridPane.margin>
-            <Insets bottom="5"/>
-        </GridPane.margin>
-    </HBox>
-
-    <InfoDisplay gridPane="$root" onAction="#onOpenHelp" rowIndex="3"
-                 text="Protect your wallet with a strong password. You need to enter the password any time you withdraw Bitcoin from your trading wallets. You can change the password later in the settings. Open the help menu for more information."/>
-
     <columnConstraints>
         <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="140.0"/>
         <ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
     </columnConstraints>
 
-    <rowConstraints>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-    </rowConstraints>
-
-</GridPane>
-
-
+</GridPane>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
index 9849ff3df1..27a750447b 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
@@ -17,67 +17,184 @@
 
 package io.bitsquare.gui.main.account.content.password;
 
+import io.bitsquare.btc.TradeWalletService;
+import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.util.Tuple2;
+import io.bitsquare.common.util.Tuple3;
+import io.bitsquare.crypto.ScryptUtil;
+import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.InitializableView;
-import io.bitsquare.gui.common.view.Wizard;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.gui.components.PasswordTextField;
+import io.bitsquare.gui.components.TitledGroupBg;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.util.Layout;
+import io.bitsquare.gui.util.validation.InputValidator;
+import io.bitsquare.gui.util.validation.PasswordValidator;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.layout.GridPane;
+import org.bitcoinj.core.Wallet;
+import org.bitcoinj.crypto.KeyCrypterScrypt;
 
 import javax.inject.Inject;
 
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import static io.bitsquare.gui.util.FormBuilder.*;
 
 @FxmlView
-public class PasswordView extends InitializableView<GridPane, PasswordViewModel> implements Wizard.Step {
+public class PasswordView extends ActivatableView<GridPane, Void> {
 
-    @FXML HBox buttonsHBox;
-    @FXML Button saveButton, skipButton;
-    @FXML PasswordField oldPasswordField, passwordField, repeatedPasswordField;
+    private final PasswordValidator passwordValidator;
+    private final WalletService walletService;
+    private final TradeWalletService tradeWalletService;
 
-    private Wizard wizard;
+    private PasswordTextField passwordField;
+    private PasswordTextField repeatedPasswordField;
+    private Button pwButton;
+    private TitledGroupBg headline;
+    private int gridRow = 0;
+    private Label repeatedPasswordLabel;
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor, lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private PasswordView(PasswordViewModel model) {
-        super(model);
+    private PasswordView(PasswordValidator passwordValidator, WalletService walletService, TradeWalletService tradeWalletService) {
+        this.passwordValidator = passwordValidator;
+        this.walletService = walletService;
+        this.tradeWalletService = tradeWalletService;
     }
 
     @Override
     public void initialize() {
-        passwordField.textProperty().bindBidirectional(model.passwordField);
-        repeatedPasswordField.textProperty().bindBidirectional(model.repeatedPasswordField);
+        headline = addTitledGroupBg(root, gridRow, 3, "");
+        passwordField = addLabelPasswordTextField(root, gridRow, "Enter password:", Layout.FIRST_ROW_DISTANCE).second;
+        passwordField.setValidator(passwordValidator);
+        passwordField.textProperty().addListener((observable, oldValue, newValue) -> {
+            validatePasswords();
+        });
 
-        saveButton.disableProperty().bind(model.saveButtonDisabled);
+        Tuple2<Label, PasswordTextField> tuple2 = addLabelPasswordTextField(root, ++gridRow, "Repeat password:");
+        repeatedPasswordLabel = tuple2.first;
+        repeatedPasswordField = tuple2.second;
+        repeatedPasswordField.setValidator(passwordValidator);
+        repeatedPasswordField.textProperty().addListener((observable, oldValue, newValue) -> {
+            validatePasswords();
+        });
+
+        Tuple3<Button, ProgressIndicator, Label> tuple = addButtonWithStatus(root, ++gridRow, "", 0);
+        pwButton = tuple.first;
+        ProgressIndicator progressIndicator = tuple.second;
+        Label deriveStatusLabel = tuple.third;
+        pwButton.setDisable(true);
+
+        setText();
+
+        pwButton.setOnAction(e -> {
+            pwButton.setDisable(true);
+            deriveStatusLabel.setText("Derive key from password");
+            progressIndicator.setProgress(-1);
+            progressIndicator.setVisible(true);
+
+            KeyCrypterScrypt keyCrypterScrypt;
+            Wallet wallet = walletService.getWallet();
+            if (wallet.isEncrypted())
+                keyCrypterScrypt = (KeyCrypterScrypt) wallet.getKeyCrypter();
+            else
+                keyCrypterScrypt = new KeyCrypterScrypt(ScryptUtil.SCRYPT_PARAMETERS);
+
+            ScryptUtil.deriveKeyWithScrypt(keyCrypterScrypt, passwordField.getText(), aesKey -> {
+                deriveStatusLabel.setText("");
+                progressIndicator.setVisible(false);
+
+                if (wallet.isEncrypted()) {
+                    if (wallet.checkAESKey(aesKey)) {
+                        wallet.decrypt(aesKey);
+                        tradeWalletService.setAesKey(null);
+                        new Popup()
+                                .information("Wallet successfully decrypted and password protection removed.")
+                                .show();
+                        passwordField.setText("");
+                        repeatedPasswordField.setText("");
+                    } else {
+                        new Popup()
+                                .headLine("Wrong password")
+                                .message("Please try entering your password again, carefully checking for typos or spelling errors.")
+                                .show();
+                    }
+                } else {
+                    wallet.encrypt(keyCrypterScrypt, aesKey);
+                    // we save the key for the trade wallet as we don't require passwords here
+                    tradeWalletService.setAesKey(aesKey);
+                    new Popup()
+                            .information("Wallet successfully encrypted and password protection enabled.")
+                            .show();
+                    passwordField.setText("");
+                    repeatedPasswordField.setText("");
+                }
+                setText();
+            });
+        });
+
+        addTitledGroupBg(root, ++gridRow, 1, "Information", Layout.GROUP_DISTANCE);
+        addMultilineLabel(root, gridRow,
+                "With password protection you need to enter your password when" +
+                        " withdrawing Bitcoin out of your wallet or " +
+                        "if you want to view or restore a wallet from seed words.\n" +
+                        "For the transactions used in the trade process we don't support password protection as that would make automatic offer " +
+                        "execution impossible.",
+                Layout.FIRST_ROW_AND_GROUP_DISTANCE);
+    }
+
+    private void setText() {
+        if (walletService.getWallet().isEncrypted()) {
+            pwButton.setText("Remove password");
+            headline.setText("Remove password protection for wallet");
+            repeatedPasswordField.setVisible(false);
+            repeatedPasswordField.setManaged(false);
+            repeatedPasswordLabel.setVisible(false);
+            repeatedPasswordLabel.setManaged(false);
+        } else {
+            pwButton.setText("Set password");
+            headline.setText("Set password protection for wallet");
+            repeatedPasswordField.setVisible(true);
+            repeatedPasswordField.setManaged(true);
+            repeatedPasswordLabel.setVisible(true);
+            repeatedPasswordLabel.setManaged(true);
+        }
     }
 
     @Override
-    public void setWizard(Wizard wizard) {
-        this.wizard = wizard;
+    protected void activate() {
     }
 
     @Override
-    public void hideWizardNavigation() {
-        buttonsHBox.getChildren().remove(skipButton);
+    protected void deactivate() {
     }
 
-    @FXML
-    private void onSaved() {
-        if (wizard != null && model.requestSavePassword())
-            wizard.nextStep(this);
-        else
-            log.debug(model.getErrorMessage()); // TODO use validating passwordTF
-    }
+    private void validatePasswords() {
+        passwordValidator.setExternalValidationResult(null);
+        InputValidator.ValidationResult result = passwordValidator.validate(passwordField.getText());
+        if (result.isValid) {
+            if (walletService.getWallet().isEncrypted()) {
+                pwButton.setDisable(false);
+                return;
+            } else {
+                result = passwordValidator.validate(repeatedPasswordField.getText());
 
-    @FXML
-    private void onSkipped() {
-        if (wizard != null)
-            wizard.nextStep(this);
-    }
-
-    @FXML
-    private void onOpenHelp() {
-        Help.openWindow(HelpId.SETUP_PASSWORD);
+                if (result.isValid) {
+                    if (passwordField.getText().equals(repeatedPasswordField.getText())) {
+                        pwButton.setDisable(false);
+                        return;
+                    } else {
+                        passwordValidator.setExternalValidationResult(new InputValidator.ValidationResult(false, "The 2 passwords do not match."));
+                    }
+                }
+            }
+        }
+        pwButton.setDisable(true);
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
deleted file mode 100644
index e632184618..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.content.password;
-
-import io.bitsquare.gui.common.model.ViewModel;
-import io.bitsquare.gui.util.validation.InputValidator;
-import io.bitsquare.gui.util.validation.PasswordValidator;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-class PasswordViewModel implements ViewModel {
-
-    private final PasswordValidator passwordValidator;
-
-    private String errorMessage;
-
-    final StringProperty passwordField = new SimpleStringProperty();
-    final StringProperty repeatedPasswordField = new SimpleStringProperty();
-    final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true);
-
-
-    @Inject
-    public PasswordViewModel(PasswordValidator passwordValidator) {
-        this.passwordValidator = passwordValidator;
-
-        passwordField.addListener((ov) -> saveButtonDisabled.set(!validate()));
-        repeatedPasswordField.addListener((ov) -> saveButtonDisabled.set(!validate()));
-    }
-
-
-    boolean requestSavePassword() {
-        if (validate()) {
-            savePassword(passwordField.get());
-            return true;
-        }
-        return false;
-    }
-
-    void savePassword(String password) {
-        //TODO Implement password encryption for wallet
-    }
-
-    String getErrorMessage() {
-        return errorMessage;
-    }
-
-
-    private boolean validate() {
-        InputValidator.ValidationResult result = passwordValidator.validate(passwordField.get());
-        if (result.isValid) {
-            result = passwordValidator.validate(repeatedPasswordField.get());
-            if (result.isValid) {
-                if (passwordField.get().equals(repeatedPasswordField.get()))
-                    return true;
-                else
-                    errorMessage = "The 2 passwords does not match.";
-            }
-            else {
-                errorMessage = result.errorMessage;
-            }
-        }
-        else {
-            errorMessage = result.errorMessage;
-        }
-        return false;
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
deleted file mode 100644
index c60607050b..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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.content.registration;
-
-import io.bitsquare.btc.AddressEntry;
-import io.bitsquare.btc.FeePolicy;
-import io.bitsquare.btc.WalletService;
-import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.common.model.DataModel;
-import io.bitsquare.user.User;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.InsufficientMoneyException;
-import org.bitcoinj.core.Transaction;
-
-import com.google.common.util.concurrent.FutureCallback;
-
-import com.google.inject.Inject;
-
-import javax.annotation.Nullable;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-import org.jetbrains.annotations.NotNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class RegistrationDataModel implements DataModel {
-    private static final Logger log = LoggerFactory.getLogger(RegistrationDataModel.class);
-
-    private final WalletService walletService;
-    private final User user;
-
-    private String transactionId;
-    private AddressEntry addressEntry;
-
-    final BooleanProperty isWalletFunded = new SimpleBooleanProperty();
-    final BooleanProperty payFeeSuccess = new SimpleBooleanProperty();
-    final StringProperty payFeeErrorMessage = new SimpleStringProperty();
-
-
-    @Inject
-    public RegistrationDataModel(WalletService walletService, User user) {
-
-        this.walletService = walletService;
-        this.user = user;
-
-        if (walletService != null && walletService.getWallet() != null) {
-            addressEntry = walletService.getRegistrationAddressEntry();
-            walletService.addBalanceListener(new BalanceListener(getAddressEntry().getAddress()) {
-                @Override
-                public void onBalanceChanged(@NotNull Coin balance) {
-                    updateBalance(balance);
-                }
-            });
-            updateBalance(walletService.getBalanceForAddress(getAddressEntry().getAddress()));
-        }
-    }
-
-    void payFee() {
-        FutureCallback<Transaction> callback = new FutureCallback<Transaction>() {
-            @Override
-            public void onSuccess(@Nullable Transaction transaction) {
-                log.debug("payRegistrationFee onSuccess");
-                if (transaction != null) {
-                    transactionId = transaction.getHashAsString();
-                    log.info("payRegistrationFee onSuccess tx id:" + transaction.getHashAsString());
-
-                    if (getAddressEntry() != null)
-                        user.setAccountID(getAddressEntry().toString());
-
-                    payFeeSuccess.set(true);
-                }
-            }
-
-            @Override
-            public void onFailure(@NotNull Throwable t) {
-                log.debug("payRegistrationFee onFailure");
-                payFeeErrorMessage.set("Fee payment failed with error: " + t.getMessage());
-            }
-        };
-        try {
-            walletService.payRegistrationFee(user.getStringifiedBankAccounts(), callback);
-        } catch (InsufficientMoneyException e) {
-            payFeeErrorMessage.set("Fee payment failed with error: " + e.getMessage());
-        }
-    }
-
-
-    WalletService getWalletService() {
-        return walletService;
-    }
-
-    Coin getFeeAsCoin() {
-        return FeePolicy.REGISTRATION_FEE;
-    }
-
-    String getTransactionId() {
-        return transactionId;
-    }
-
-    AddressEntry getAddressEntry() {
-        return addressEntry;
-    }
-
-
-    private void updateBalance(@NotNull Coin balance) {
-        isWalletFunded.set(balance.compareTo(getFeeAsCoin()) >= 0);
-    }
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml
deleted file mode 100644
index 00144dac5a..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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 io.bitsquare.gui.components.AddressTextField?>
-<?import io.bitsquare.gui.components.BalanceTextField?>
-<?import io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?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.RegistrationView" 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">
-
-    <TitledGroupBg text="Complete the registration" GridPane.rowSpan="4"/>
-
-    <Label text="Registration costs:" GridPane.rowIndex="0">
-        <GridPane.margin>
-            <Insets top="10.0"/>
-        </GridPane.margin>
-    </Label>
-    <TextField fx:id="feeTextField"
-               GridPane.columnIndex="1"
-               GridPane.rowIndex="0" editable="false" focusTraversable="false">
-        <GridPane.margin>
-            <Insets top="10.0"/>
-        </GridPane.margin>
-    </TextField>
-
-    <Label text="Registration wallet address:" GridPane.rowIndex="1"/>
-    <AddressTextField fx:id="addressTextField" GridPane.columnIndex="1" GridPane.rowIndex="1"
-                      focusTraversable="true"/>
-
-    <Label text="Registration wallet balance:" GridPane.rowIndex="2">
-        <GridPane.margin>
-            <Insets bottom="5.0"/>
-        </GridPane.margin>
-    </Label>
-    <BalanceTextField fx:id="balanceTextField" GridPane.columnIndex="1" GridPane.rowIndex="2"
-                      focusTraversable="false">
-        <GridPane.margin>
-            <Insets bottom="5.0"/>
-        </GridPane.margin>
-    </BalanceTextField>
-
-    <InfoDisplay gridPane="$root" onAction="#onOpenHelp" rowIndex="3"
-                 text="You need to pay a 0.0002 BTC which is needed for storing your encrypted account data in the blockchain. That will be used in the trade process for account verification."/>
-
-    <HBox spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="4">
-        <Button fx:id="payButton" text="Pay registration fee" onAction="#onPayFee" defaultButton="true"/>
-        <ProgressIndicator fx:id="paymentSpinner" progress="0" visible="false" prefHeight="24"
-                           prefWidth="24"/>
-        <Label fx:id="paymentSpinnerInfoLabel" text="Payment is in progress..." visible="false">
-            <padding>
-                <Insets top="5.0"/>
-            </padding>
-        </Label>
-        <GridPane.margin>
-            <Insets top="15.0"/>
-        </GridPane.margin>
-    </HBox>
-
-    <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="200.0"/>
-        <ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-    </rowConstraints>
-</GridPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
deleted file mode 100644
index 555ee0e0d7..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * 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.content.registration;
-
-import io.bitsquare.gui.OverlayManager;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.InitializableView;
-import io.bitsquare.gui.common.view.Wizard;
-import io.bitsquare.gui.components.AddressTextField;
-import io.bitsquare.gui.components.BalanceTextField;
-import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.locale.BSResources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
-import org.controlsfx.control.action.AbstractAction;
-import org.controlsfx.control.action.Action;
-import org.controlsfx.dialog.Dialog;
-
-@FxmlView
-public class RegistrationView extends InitializableView<GridPane, RegistrationViewModel> implements Wizard.Step {
-
-    @FXML TextField feeTextField;
-    @FXML AddressTextField addressTextField;
-    @FXML BalanceTextField balanceTextField;
-    @FXML Button payButton;
-    @FXML Label paymentSpinnerInfoLabel;
-    @FXML ProgressIndicator paymentSpinner;
-
-    private Wizard wizard;
-
-    @Inject
-    private RegistrationView(RegistrationViewModel model) {
-        super(model);
-    }
-
-    @Override
-    public void initialize() {
-        feeTextField.setText(model.getFeeAsString());
-        addressTextField.setAmountAsCoin(model.getFeeAsCoin());
-        addressTextField.setPaymentLabel(model.getPaymentLabel());
-        addressTextField.setAddress(model.getAddressAsString());
-
-        balanceTextField.setup(model.getWalletService(), model.address.get(),
-                model.getFormatter());
-
-        payButton.disableProperty().bind(model.isPayButtonDisabled);
-
-        model.requestPlaceOfferErrorMessage.addListener((o, oldValue, newValue) -> {
-            if (newValue != null) {
-                Popups.openErrorPopup(BSResources.get("shared.error"),
-                        BSResources.get("An error occurred when paying the registration fee"),
-                        newValue);
-            }
-        });
-
-        paymentSpinnerInfoLabel.visibleProperty().bind(model.isPaymentSpinnerVisible);
-
-        model.isPaymentSpinnerVisible.addListener((ov, oldValue, newValue) -> {
-            paymentSpinner.setProgress(newValue ? -1 : 0);
-            paymentSpinner.setVisible(newValue);
-        });
-
-        model.showTransactionPublishedScreen.addListener((o, oldValue, newValue) -> {
-            if (newValue) {
-                OverlayManager.blurContent();
-
-                List<Action> actions = new ArrayList<>();
-               /* actions.add(new AbstractAction(BSResources.get("shared.copyTxId")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "COPY");
-                         Utilities.copyToClipboard(presentationModel.getTransactionId());
-                    }
-                });*/
-                actions.add(new AbstractAction(BSResources.get("shared.close")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "CLOSE");
-                        if (wizard != null)
-                            wizard.nextStep(RegistrationView.this);
-                        Dialog.Actions.CLOSE.handle(actionEvent);
-                    }
-                });
-
-                Popups.openInfoPopup(BSResources.get("You have been successfully registered."),
-                        BSResources.get("Congratulation you have been successfully registered.\n\n" +
-                                " You can now start trading."),
-                        actions);
-            }
-        });
-    }
-
-    @Override
-    public void setWizard(Wizard wizard) {
-        this.wizard = wizard;
-    }
-
-    @Override
-    public void hideWizardNavigation() {
-    }
-
-    @FXML
-    private void onPayFee() {
-        model.payFee();
-    }
-
-    @FXML
-    private void onOpenHelp() {
-        Help.openWindow(HelpId.PAY_ACCOUNT_FEE);
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
deleted file mode 100644
index aafa74abd2..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.content.registration;
-
-import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.common.model.ViewModel;
-import io.bitsquare.gui.common.model.WithDataModel;
-import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.locale.BSResources;
-
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.Coin;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-
-class RegistrationViewModel extends WithDataModel<RegistrationDataModel> implements ViewModel {
-
-    final BooleanProperty isPayButtonDisabled = new SimpleBooleanProperty(true);
-    final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty();
-    final BooleanProperty showTransactionPublishedScreen = new SimpleBooleanProperty();
-    final BooleanProperty isPaymentSpinnerVisible = new SimpleBooleanProperty(false);
-
-    // That is needed for the addressTextField
-    final ObjectProperty<Address> address = new SimpleObjectProperty<>();
-    private final BSFormatter formatter;
-
-
-    @Inject
-    public RegistrationViewModel(RegistrationDataModel dataModel, BSFormatter formatter) {
-        super(dataModel);
-        this.formatter = formatter;
-
-        if (dataModel.getAddressEntry() != null) {
-            address.set(dataModel.getAddressEntry().getAddress());
-        }
-
-        dataModel.isWalletFunded.addListener((ov, oldValue, newValue) -> {
-            if (newValue)
-                validateInput();
-        });
-        validateInput();
-
-        dataModel.payFeeSuccess.addListener((ov, oldValue, newValue) -> {
-            isPayButtonDisabled.set(newValue);
-            showTransactionPublishedScreen.set(newValue);
-            isPaymentSpinnerVisible.set(false);
-        });
-
-        dataModel.payFeeErrorMessage.addListener((ov, oldValue, newValue) -> {
-            if (newValue != null) {
-                requestPlaceOfferErrorMessage.set(newValue);
-                isPaymentSpinnerVisible.set(false);
-            }
-        });
-    }
-
-    void payFee() {
-        dataModel.payFeeErrorMessage.set(null);
-        dataModel.payFeeSuccess.set(false);
-
-        isPayButtonDisabled.set(true);
-        isPaymentSpinnerVisible.set(true);
-
-        dataModel.payFee();
-    }
-
-
-    WalletService getWalletService() {
-        return dataModel.getWalletService();
-    }
-
-    BSFormatter getFormatter() {
-        return formatter;
-    }
-
-    Coin getFeeAsCoin() {
-        return dataModel.getFeeAsCoin();
-    }
-
-    String getAddressAsString() {
-        return dataModel.getAddressEntry() != null ? dataModel.getAddressEntry().getAddress().toString() : "";
-    }
-
-    String getPaymentLabel() {
-        return BSResources.get("Bitsquare account registration fee");
-    }
-
-    String getFeeAsString() {
-        return formatter.formatCoinWithCode(dataModel.getFeeAsCoin());
-    }
-
-    String getTransactionId() {
-        return dataModel.getTransactionId();
-    }
-
-
-    private void validateInput() {
-        isPayButtonDisabled.set(!(dataModel.isWalletFunded.get()));
-    }
-
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
deleted file mode 100644
index dd79ad1423..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.content.restrictions;
-
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.CountryUtil;
-import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.locale.Region;
-import io.bitsquare.user.AccountSettings;
-
-import com.google.inject.Inject;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-class RestrictionsDataModel implements Activatable, DataModel {
-
-    private final AccountSettings accountSettings;
-
-    final ObservableList<String> languageCodes = FXCollections.observableArrayList();
-    final ObservableList<Country> countries = FXCollections.observableArrayList();
-    final ObservableList<Arbitrator> arbitrators = FXCollections.observableArrayList();
-    final ObservableList<String> allLanguageCodes = FXCollections.observableArrayList(LanguageUtil
-            .getAllLanguageLocaleCodes());
-    final ObservableList<Region> allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions());
-
-
-    @Inject
-    public RestrictionsDataModel(AccountSettings accountSettings) {
-        this.accountSettings = accountSettings;
-    }
-
-    @Override
-    public void activate() {
-        countries.setAll(accountSettings.getAcceptedCountries());
-        languageCodes.setAll(accountSettings.getAcceptedLanguageLocaleCodes());
-        arbitrators.setAll(accountSettings.getAcceptedArbitrators());
-    }
-
-    @Override
-    public void deactivate() {
-    }
-
-    ObservableList<Country> getAllCountriesFor(Region selectedRegion) {
-        return FXCollections.observableArrayList(CountryUtil.getAllCountriesFor(selectedRegion));
-    }
-
-    void updateArbitratorList() {
-        arbitrators.setAll(accountSettings.getAcceptedArbitrators());
-    }
-
-    void addLanguageCode(String code) {
-        if (code != null && !languageCodes.contains(code)) {
-            languageCodes.add(code);
-            accountSettings.addAcceptedLanguageLocale(code);
-        }
-    }
-
-    void removeLanguage(String code) {
-        languageCodes.remove(code);
-        accountSettings.removeAcceptedLanguageLocale(code);
-    }
-
-    void addCountry(Country country) {
-        if (!countries.contains(country) && country != null) {
-            countries.add(country);
-            accountSettings.addAcceptedCountry(country);
-        }
-    }
-
-    ObservableList<Country> getListWithAllEuroCountries() {
-        // TODO use Set instead of List
-        // In addAcceptedCountry there is a check to no add duplicates, so it works correctly for now
-        CountryUtil.getAllEuroCountries().stream().forEach(accountSettings::addAcceptedCountry);
-        countries.setAll(accountSettings.getAcceptedCountries());
-        return countries;
-    }
-
-    void removeCountry(Country country) {
-        countries.remove(country);
-        accountSettings.removeAcceptedCountry(country);
-    }
-
-    void removeArbitrator(Arbitrator arbitrator) {
-        arbitrators.remove(arbitrator);
-        accountSettings.removeAcceptedArbitrator(arbitrator);
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml
deleted file mode 100644
index 2f7ab786b9..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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 io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?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.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"/>
-
-    <Label text="Accepted languages:" GridPane.rowIndex="0" GridPane.valignment="TOP">
-        <padding>
-            <Insets top="10"/>
-        </padding>
-    </Label>
-    <ListView fx:id="languagesListView" GridPane.columnIndex="1" GridPane.rowIndex="0" prefHeight="80.0"/>
-    <ComboBox fx:id="languageComboBox" onAction="#onAddLanguage" promptText="Add language"
-              GridPane.columnIndex="1" GridPane.rowIndex="1"
-              prefWidth="150.0"/>
-
-
-    <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">
-        <padding>
-            <Insets top="50.0"/>
-        </padding>
-        <GridPane.margin>
-            <Insets bottom="-10" left="-10" right="-10" top="30"/>
-        </GridPane.margin>
-    </TitledGroupBg>
-
-    <Label text="Accepted countries:" GridPane.rowIndex="3" GridPane.valignment="TOP">
-        <GridPane.margin>
-            <Insets top="50"/>
-        </GridPane.margin>
-    </Label>
-    <ListView fx:id="countriesListView" GridPane.columnIndex="1" GridPane.rowIndex="3" prefHeight="80.0"
-            >
-        <GridPane.margin>
-            <Insets top="40"/>
-        </GridPane.margin>
-    </ListView>
-
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="4" spacing="10">
-        <ComboBox fx:id="regionComboBox" onAction="#onSelectRegion" promptText="Select region"
-                  prefWidth="150.0"/>
-        <ComboBox fx:id="countryComboBox" onAction="#onAddCountry" promptText="Add country" visible="false"
-                  prefWidth="150.0"/>
-        <Button fx:id="addAllEuroCountriesButton" text="Add Euro countries" onAction="#onAddAllEuroCountries"
-                prefWidth="150.0" visible="false"/>
-    </HBox>
-
-    <InfoDisplay gridPane="$root" onAction="#onOpenCountriesHelp" rowIndex="5"
-                 text="Restrict trades with these payments account countries."/>
-
-
-    <!--
-    arbitrators
-     -->
-    <TitledGroupBg text="Add arbitrators" GridPane.rowIndex="6" GridPane.rowSpan="3">
-        <padding>
-            <Insets top="50.0"/>
-        </padding>
-        <GridPane.margin>
-            <Insets bottom="-10" left="-10" right="-10" top="30"/>
-        </GridPane.margin>
-    </TitledGroupBg>
-    <Label text="Accepted arbitrators:" GridPane.rowIndex="6" GridPane.valignment="TOP">
-        <GridPane.margin>
-            <Insets top="50"/>
-        </GridPane.margin>
-    </Label>
-    <ListView fx:id="arbitratorsListView" GridPane.columnIndex="1" GridPane.rowIndex="6" prefHeight="80.0">
-        <GridPane.margin>
-            <Insets top="40"/>
-        </GridPane.margin>
-    </ListView>
-    <Button text="Add arbitrator" onAction="#onOpenArbitratorScreen" GridPane.columnIndex="1"
-            GridPane.rowIndex="7"/>
-
-    <InfoDisplay gridPane="$root" onAction="#onOpenArbitratorsHelp" rowIndex="8"
-                 text="You need to choose at least 3 arbitrators."/>
-
-    <Button fx:id="completedButton" text="Completed" onAction="#onCompleted" disable="true" GridPane.columnIndex="1"
-            GridPane.rowIndex="9"
-            defaultButton="true">
-        <GridPane.margin>
-            <Insets top="20.0"/>
-        </GridPane.margin>
-    </Button>
-
-    <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="140.0"/>
-        <ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="SOMETIMES"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-
-        <RowConstraints vgrow="SOMETIMES"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-
-        <RowConstraints vgrow="SOMETIMES"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-
-        <RowConstraints vgrow="NEVER"/>
-
-    </rowConstraints>
-
-</GridPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
deleted file mode 100644
index fbf616f4cd..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * 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.content.restrictions;
-
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
-import io.bitsquare.gui.common.view.Wizard;
-import io.bitsquare.gui.main.account.arbitrator.browser.BrowserView;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.LanguageUtil;
-import io.bitsquare.locale.Region;
-
-import javax.inject.Inject;
-
-import javafx.fxml.FXML;
-import javafx.scene.*;
-import javafx.scene.control.*;
-import javafx.scene.image.*;
-import javafx.scene.layout.*;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import javafx.util.Callback;
-import javafx.util.StringConverter;
-
-@FxmlView
-public class RestrictionsView extends ActivatableViewAndModel<GridPane, RestrictionsViewModel> implements Wizard.Step {
-
-    @FXML ListView<String> languagesListView;
-    @FXML ListView<Country> countriesListView;
-    @FXML ListView<Arbitrator> arbitratorsListView;
-    @FXML ComboBox<String> languageComboBox;
-    @FXML ComboBox<Region> regionComboBox;
-    @FXML ComboBox<Country> countryComboBox;
-    @FXML Button completedButton, addAllEuroCountriesButton;
-
-    private Wizard wizard;
-
-    private final ViewLoader viewLoader;
-    private final Stage primaryStage;
-
-    @Inject
-    private RestrictionsView(RestrictionsViewModel model, CachingViewLoader viewLoader, Stage primaryStage) {
-        super(model);
-        this.viewLoader = viewLoader;
-        this.primaryStage = primaryStage;
-    }
-
-    @Override
-    public void initialize() {
-        initLanguage();
-        initCountry();
-        initArbitrators();
-
-        completedButton.disableProperty().bind(model.doneButtonDisable);
-    }
-
-    @Override
-    public void doActivate() {
-        languagesListView.setItems(model.getLanguageCodes());
-        countriesListView.setItems(model.getCountryList());
-        arbitratorsListView.setItems(model.getArbitratorList());
-    }
-
-    @Override
-    public void setWizard(Wizard wizard) {
-        this.wizard = wizard;
-    }
-
-    @Override
-    public void hideWizardNavigation() {
-        root.getChildren().remove(completedButton);
-    }
-
-    @FXML
-    private void onAddLanguage() {
-        model.addLanguage(languageComboBox.getSelectionModel().getSelectedItem());
-        languageComboBox.getSelectionModel().clearSelection();
-    }
-
-    @FXML
-    private void onSelectRegion() {
-        countryComboBox.setVisible(true);
-        Region region = regionComboBox.getSelectionModel().getSelectedItem();
-        countryComboBox.setItems(model.getAllCountriesFor(region));
-
-        addAllEuroCountriesButton.setVisible(region.code.equals("EU"));
-    }
-
-    @FXML
-    private void onAddCountry() {
-        model.addCountry(countryComboBox.getSelectionModel().getSelectedItem());
-        countryComboBox.getSelectionModel().clearSelection();
-    }
-
-    @FXML
-    private void onAddAllEuroCountries() {
-        countriesListView.setItems(model.getListWithAllEuroCountries());
-    }
-
-    @FXML
-    private void onOpenArbitratorScreen() {
-        View view = viewLoader.load(BrowserView.class);
-        showStage(view);
-    }
-
-
-    @FXML
-    private void onCompleted() {
-        if (wizard != null)
-            wizard.nextStep(this);
-    }
-
-    @FXML
-    private void onOpenLanguagesHelp() {
-        Help.openWindow(HelpId.SETUP_RESTRICTION_LANGUAGES);
-    }
-
-    @FXML
-    private void onOpenCountriesHelp() {
-        Help.openWindow(HelpId.SETUP_RESTRICTION_COUNTRIES);
-    }
-
-    @FXML
-    private void onOpenArbitratorsHelp() {
-        Help.openWindow(HelpId.SETUP_RESTRICTION_ARBITRATORS);
-    }
-
-    private void showStage(View view) {
-        final Stage stage = new Stage();
-        stage.setTitle("Arbitrator selection");
-        stage.setMinWidth(800);
-        stage.setMinHeight(500);
-        stage.setWidth(800);
-        stage.setHeight(600);
-        stage.setX(primaryStage.getX() + 50);
-        stage.setY(primaryStage.getY() + 50);
-        stage.initModality(Modality.WINDOW_MODAL);
-        stage.initOwner(primaryStage);
-        Scene scene = new Scene((Parent) view.getRoot(), 800, 600);
-        stage.setScene(scene);
-        stage.setOnHidden(windowEvent -> {
-            if (view instanceof BrowserView)
-                updateArbitratorList();
-        });
-        stage.show();
-    }
-
-    void updateArbitratorList() {
-        model.updateArbitratorList();
-        arbitratorsListView.setItems(model.getArbitratorList());
-    }
-
-    private void initLanguage() {
-        languagesListView.setCellFactory(new Callback<ListView<String>, ListCell<String>>() {
-            @Override
-            public ListCell<String> call(ListView<String> list) {
-                return new ListCell<String>() {
-                    final Label label = new Label();
-                    final ImageView icon = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON);
-                    final Button removeButton = new Button("", icon);
-                    final AnchorPane pane = new AnchorPane(label, removeButton);
-
-                    {
-                        label.setLayoutY(5);
-                        removeButton.setId("icon-button");
-                        AnchorPane.setRightAnchor(removeButton, 0d);
-                    }
-
-                    @Override
-                    public void updateItem(final String item, boolean empty) {
-                        super.updateItem(item, empty);
-                        if (item != null && !empty) {
-                            label.setText(LanguageUtil.getDisplayName(item));
-                            removeButton.setOnAction(actionEvent -> removeLanguage(item));
-                            setGraphic(pane);
-                        }
-                        else {
-                            setGraphic(null);
-                        }
-                    }
-                };
-            }
-        });
-
-        languageComboBox.setItems(model.getAllLanguageCodes());
-        languageComboBox.setConverter(new StringConverter<String>() {
-            @Override
-            public String toString(String code) {
-                return LanguageUtil.getDisplayName(code);
-            }
-
-            @Override
-            public String fromString(String s) {
-                return null;
-            }
-        });
-    }
-
-    private void initCountry() {
-        regionComboBox.setItems(model.getAllRegions());
-        regionComboBox.setConverter(new StringConverter<io.bitsquare.locale.Region>() {
-            @Override
-            public String toString(io.bitsquare.locale.Region region) {
-                return region.name;
-            }
-
-            @Override
-            public io.bitsquare.locale.Region fromString(String s) {
-                return null;
-            }
-        });
-
-        countriesListView.setCellFactory(new Callback<ListView<Country>, ListCell<Country>>() {
-            @Override
-            public ListCell<Country> call(ListView<Country> list) {
-                return new ListCell<Country>() {
-                    final Label label = new Label();
-                    final ImageView icon = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON);
-                    final Button removeButton = new Button("", icon);
-                    final AnchorPane pane = new AnchorPane(label, removeButton);
-
-                    {
-                        label.setLayoutY(5);
-                        removeButton.setId("icon-button");
-                        AnchorPane.setRightAnchor(removeButton, 0d);
-                    }
-
-                    @Override
-                    public void updateItem(final Country country, boolean empty) {
-                        super.updateItem(country, empty);
-                        if (country != null && !empty) {
-                            label.setText(country.name);
-                            removeButton.setOnAction(actionEvent -> removeCountry(country));
-                            setGraphic(pane);
-                        }
-                        else {
-                            setGraphic(null);
-                        }
-                    }
-                };
-            }
-        });
-
-        countryComboBox.setConverter(new StringConverter<Country>() {
-            @Override
-            public String toString(Country country) {
-                return country.name;
-            }
-
-            @Override
-            public Country fromString(String s) {
-                return null;
-            }
-        });
-    }
-
-    private void initArbitrators() {
-        arbitratorsListView.setCellFactory(new Callback<ListView<Arbitrator>, ListCell<Arbitrator>>() {
-            @Override
-            public ListCell<Arbitrator> call(ListView<Arbitrator> list) {
-                return new ListCell<Arbitrator>() {
-                    final Label label = new Label();
-                    final ImageView icon = ImageUtil.getImageViewById(ImageUtil.REMOVE_ICON);
-                    final Button removeButton = new Button("", icon);
-                    final AnchorPane pane = new AnchorPane(label, removeButton);
-
-                    {
-                        label.setLayoutY(5);
-                        removeButton.setId("icon-button");
-                        AnchorPane.setRightAnchor(removeButton, 0d);
-                    }
-
-                    @Override
-                    public void updateItem(final Arbitrator item, boolean empty) {
-                        super.updateItem(item, empty);
-                        if (item != null && !empty) {
-                            label.setText(item.getName());
-                            removeButton.setOnAction(actionEvent -> removeArbitrator(item));
-                            setGraphic(pane);
-                        }
-                        else {
-                            setGraphic(null);
-                        }
-                    }
-                };
-            }
-        });
-    }
-
-    private void removeLanguage(String locale) {
-        model.removeLanguage(locale);
-    }
-
-    private void removeCountry(Country country) {
-        model.removeCountry(country);
-    }
-
-    private void removeArbitrator(Arbitrator arbitrator) {
-        model.removeArbitrator(arbitrator);
-    }
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
deleted file mode 100644
index ac7df0d16a..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.content.restrictions;
-
-import io.bitsquare.arbitration.Arbitrator;
-import io.bitsquare.gui.common.model.ActivatableWithDataModel;
-import io.bitsquare.gui.common.model.ViewModel;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.Region;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.collections.ObservableList;
-
-class RestrictionsViewModel extends ActivatableWithDataModel<RestrictionsDataModel> implements ViewModel {
-
-    final BooleanProperty doneButtonDisable = new SimpleBooleanProperty(true);
-
-
-    @Inject
-    public RestrictionsViewModel(RestrictionsDataModel dataModel) {
-        super(dataModel);
-    }
-
-
-    @Override
-    public void doActivate() {
-        updateDoneButtonDisableState();
-    }
-
-    void addLanguage(String locale) {
-        dataModel.addLanguageCode(locale);
-        updateDoneButtonDisableState();
-    }
-
-    void removeLanguage(String locale) {
-        dataModel.removeLanguage(locale);
-        updateDoneButtonDisableState();
-    }
-
-    void addCountry(Country country) {
-        dataModel.addCountry(country);
-        updateDoneButtonDisableState();
-    }
-
-    void removeCountry(Country country) {
-        dataModel.removeCountry(country);
-        updateDoneButtonDisableState();
-    }
-
-    void removeArbitrator(Arbitrator arbitrator) {
-        dataModel.removeArbitrator(arbitrator);
-        updateDoneButtonDisableState();
-    }
-
-    void updateArbitratorList() {
-        dataModel.updateArbitratorList();
-        updateDoneButtonDisableState();
-    }
-
-
-    ObservableList<Country> getListWithAllEuroCountries() {
-        return dataModel.getListWithAllEuroCountries();
-    }
-
-    ObservableList<Country> getAllCountriesFor(Region selectedRegion) {
-        return dataModel.getAllCountriesFor(selectedRegion);
-    }
-
-    ObservableList<String> getLanguageCodes() {
-        return dataModel.languageCodes;
-    }
-
-    ObservableList<Region> getAllRegions() {
-        return dataModel.allRegions;
-    }
-
-    ObservableList<String> getAllLanguageCodes() {
-        return dataModel.allLanguageCodes;
-    }
-
-    ObservableList<Country> getCountryList() {
-        return dataModel.countries;
-    }
-
-    ObservableList<Arbitrator> getArbitratorList() {
-        return dataModel.arbitrators;
-    }
-
-
-    //TODO Revert size() > -1 to 0(2 later). For mock testing disabled arbitratorList test
-    private void updateDoneButtonDisableState() {
-        boolean isValid = dataModel.languageCodes != null && dataModel.languageCodes.size() > 0 &&
-                dataModel.countries != null && dataModel.countries.size() > 0 &&
-                dataModel.arbitrators != null && dataModel.arbitrators.size() > -1;
-        doneButtonDisable.set(!isValid);
-    }
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml
index 86df0e6cd1..2cf46aed82 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml
@@ -17,51 +17,16 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?import javafx.geometry.Insets?>
-<?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.SeedWordsView" hgap="5.0"
-          vgap="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"
+          AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0"
           xmlns:fx="http://javafx.com/fxml">
 
-    <TitledGroupBg text="Backup your wallet seed words" GridPane.rowSpan="4"/>
-
-    <Label text="Wallet seed words:" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.valignment="TOP">
-        <GridPane.margin>
-            <Insets top="7.0"/>
-        </GridPane.margin>
-    </Label>
-    <TextArea fx:id="seedWordsTextArea" GridPane.columnIndex="1" GridPane.rowIndex="1" wrapText="true"
-              prefHeight="80">
-        <font>
-            <Font size="16.0"/>
-        </font>
-    </TextArea>
-    <Button fx:id="completedButton" text="I have made my backup" onAction="#onCompleted"
-            GridPane.columnIndex="1" GridPane.rowIndex="2"
-            defaultButton="true">
-        <GridPane.margin>
-            <Insets bottom="5"/>
-        </GridPane.margin>
-    </Button>
-    <InfoDisplay gridPane="$root" onAction="#onOpenHelp" rowIndex="3"
-                 text="You can recreate your wallet our of these words when you lose your wallet. Backup it on paper to have better protection against online theft. Open the help menu for more information."/>
-
     <columnConstraints>
         <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="140.0"/>
         <ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
     </columnConstraints>
 
-    <rowConstraints>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-    </rowConstraints>
-
-</GridPane>
\ No newline at end of file
+</GridPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
index 817cf5bfbd..e9efa00070 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
@@ -17,55 +17,212 @@
 
 package io.bitsquare.gui.main.account.content.seedwords;
 
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import io.bitsquare.app.BitsquareApp;
+import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.InitializableView;
-import io.bitsquare.gui.common.view.Wizard;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.gui.util.Layout;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.control.Button;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.GridPane;
+import org.bitcoinj.core.Context;
+import org.bitcoinj.core.Wallet;
+import org.bitcoinj.crypto.KeyCrypter;
+import org.bitcoinj.crypto.MnemonicCode;
+import org.bitcoinj.crypto.MnemonicException;
+import org.bitcoinj.wallet.DeterministicSeed;
 
 import javax.inject.Inject;
+import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.List;
 
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import static io.bitsquare.gui.util.FormBuilder.*;
+import static javafx.beans.binding.Bindings.createBooleanBinding;
 
 @FxmlView
-public class SeedWordsView extends InitializableView<GridPane, SeedWordsViewModel> implements Wizard.Step {
+public class SeedWordsView extends ActivatableView<GridPane, Void> {
+    private final WalletService walletService;
+    private final WalletPasswordPopup walletPasswordPopup;
 
-    @FXML Button completedButton;
-    @FXML TextArea seedWordsTextArea;
+    private Button restoreButton;
+    private TextArea seedWordsTextArea;
+    private DatePicker datePicker;
 
-    private Wizard wizard;
+    private int gridRow = 0;
+    private DeterministicSeed keyChainSeed;
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor, lifecycle
+    ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private SeedWordsView(SeedWordsViewModel model) {
-        super(model);
+    private SeedWordsView(WalletService walletService, WalletPasswordPopup walletPasswordPopup) {
+        this.walletService = walletService;
+        this.walletPasswordPopup = walletPasswordPopup;
     }
 
     @Override
-    public void initialize() {
-        seedWordsTextArea.setText(model.seedWords.get());
+    protected void initialize() {
+        addTitledGroupBg(root, gridRow, 3, "Backup or restore your wallet seed words");
+        seedWordsTextArea = addLabelTextArea(root, gridRow, "Wallet seed words:", "", Layout.FIRST_ROW_DISTANCE).second;
+        seedWordsTextArea.setPrefHeight(60);
+        datePicker = addLabelDatePicker(root, ++gridRow, "Creation Date:").second;
+        restoreButton = addButton(root, ++gridRow, "Restore wallet");
+
+        addTitledGroupBg(root, ++gridRow, 1, "Information", Layout.GROUP_DISTANCE);
+        addMultilineLabel(root, gridRow, "Please write down you wallet seed words and the creation date.\n" +
+                        "You can recover your wallet with those words and the date in emergency case.",
+                Layout.FIRST_ROW_AND_GROUP_DISTANCE);
     }
 
     @Override
-    public void setWizard(Wizard wizard) {
-        this.wizard = wizard;
+    public void activate() {
+        seedWordsTextArea.getStyleClass().remove("validation_error");
+        datePicker.getStyleClass().remove("validation_error");
+
+        DeterministicSeed keyChainSeed = walletService.getWallet().getKeyChainSeed();
+        if (keyChainSeed.isEncrypted()) {
+            restoreButton.setDisable(true);
+            seedWordsTextArea.setDisable(true);
+            datePicker.setDisable(true);
+            askForPassword();
+        } else {
+            showSeedScreen(keyChainSeed);
+        }
     }
 
     @Override
-    public void hideWizardNavigation() {
-        root.getChildren().remove(completedButton);
+    protected void deactivate() {
+        seedWordsTextArea.setText("");
+        datePicker.setValue(null);
+        restoreButton.disableProperty().unbind();
+        seedWordsTextArea.getStyleClass().remove("validation_error");
+        datePicker.getStyleClass().remove("validation_error");
     }
 
-    @FXML
-    private void onCompleted() {
-        if (wizard != null)
-            wizard.nextStep(this);
+
+    private void askForPassword() {
+        walletPasswordPopup.show().onAesKey(aesKey -> {
+            Wallet wallet = walletService.getWallet();
+            KeyCrypter keyCrypter = wallet.getKeyCrypter();
+            keyChainSeed = wallet.getKeyChainSeed();
+            DeterministicSeed decryptedSeed = keyChainSeed.decrypt(keyCrypter, "", aesKey);
+            showSeedScreen(decryptedSeed);
+        });
     }
 
-    @FXML
-    private void onOpenHelp() {
-        Help.openWindow(HelpId.SETUP_SEED_WORDS);
-    }
-}
+    private void showSeedScreen(DeterministicSeed seed) {
+        seedWordsTextArea.setDisable(false);
+        datePicker.setDisable(false);
+        List<String> mnemonicCode = seed.getMnemonicCode();
+        if (mnemonicCode != null)
+            seedWordsTextArea.setText(Joiner.on(" ").join(mnemonicCode));
+        LocalDate creationDate = Instant.ofEpochSecond(seed.getCreationTimeSeconds()).atZone(ZoneId.systemDefault()).toLocalDate();
+        datePicker.setValue(creationDate);
+        restoreButton.setOnAction(e -> onRestore());
 
+        BooleanProperty seedWordsEdited = new SimpleBooleanProperty();
+        BooleanProperty seedWordsValid = new SimpleBooleanProperty(true);
+        seedWordsValid.addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                seedWordsTextArea.getStyleClass().remove("validation_error");
+            } else {
+                seedWordsTextArea.getStyleClass().add("validation_error");
+            }
+        });
+        seedWordsTextArea.textProperty().addListener((observable, oldValue, newValue) -> {
+            seedWordsEdited.set(true);
+            try {
+                MnemonicCode codec = new MnemonicCode();
+                codec.check(Splitter.on(" ").splitToList(newValue));
+                seedWordsValid.set(true);
+            } catch (IOException | MnemonicException e) {
+                seedWordsValid.set(false);
+            }
+
+            if (creationDate.equals(datePicker.getValue()))
+                datePicker.setValue(null);
+        });
+
+        BooleanProperty dateValid = new SimpleBooleanProperty(true);
+        dateValid.addListener((observable, oldValue, newValue) -> {
+            if (newValue)
+                datePicker.getStyleClass().remove("validation_error");
+            else
+                datePicker.getStyleClass().add("validation_error");
+        });
+        datePicker.valueProperty().addListener((observable, oldValue, newValue) -> {
+            dateValid.set(newValue != null && !newValue.isAfter(LocalDate.now()));
+        });
+
+        restoreButton.disableProperty().bind(createBooleanBinding(() -> !seedWordsValid.get() || !dateValid.get() || !seedWordsEdited.get(),
+                seedWordsValid, dateValid, seedWordsEdited));
+    }
+
+    private void onRestore() {
+        Wallet wallet = walletService.getWallet();
+        if (wallet.getBalance(Wallet.BalanceType.AVAILABLE).value > 0) {
+            new Popup()
+                    .headLine("Wallet is not empty")
+                    .warning("You must empty this wallet out before attempting to restore an older one, as mixing wallets " +
+                            "together can lead to invalidated backups.\n\n" +
+                            "Please finalize your trades, close all your open offers and go to the Funds section to withdraw your Bitcoin.\n" +
+                            "In case you cannot access your Bitcoin you can use the emergency tool to empty the wallet.\n" +
+                            "To open that emergency tool press cmd + e.")
+                    .show();
+        } else if (wallet.isEncrypted()) {
+            new Popup()
+                    .headLine("Wallet is encrypted")
+                    .information("After restore, the wallet will no longer be encrypted and you must set a new password.")
+                    .closeButtonText("I understand")
+                    .onClose(() -> doRestore()).show();
+        } else {
+            doRestore();
+        }
+    }
+
+    private void doRestore() {
+        log.info("Attempting wallet restore using seed '{}' from date {}", seedWordsTextArea.getText(), datePicker.getValue());
+        long date = datePicker.getValue().atStartOfDay().toEpochSecond(ZoneOffset.UTC);
+        DeterministicSeed seed = new DeterministicSeed(Splitter.on(" ").splitToList(seedWordsTextArea.getText()), null, "", date);
+        Context ctx = Context.get();
+        new Thread(() -> {
+            Context.propagate(ctx);
+            walletService.restoreSeedWords(seed,
+                    () -> UserThread.execute(() -> {
+                        log.debug("Wallet restored with seed words");
+
+                        new Popup()
+                                .information("Wallet restored successfully with the new seed words.\n\n" +
+                                        "You need to restart now the application.")
+                                .closeButtonText("Restart")
+                                .onClose(() -> BitsquareApp.restartDownHandler.run()).show();
+                    }),
+                    throwable -> UserThread.execute(() -> {
+                        log.error(throwable.getMessage());
+                        new Popup()
+                                .headLine("Wrong password")
+                                .warning("Please try entering your password again, carefully checking for typos or spelling errors.")
+                                .show();
+
+                        new Popup()
+                                .error("An error occurred when restoring the wallet with seed words.\n" +
+                                        "Error message: " + throwable.getMessage())
+                                .show();
+                    }));
+        }, "Restore wallet thread").start();
+    }
+}
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
deleted file mode 100644
index 5d6e1c8c0c..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.content.seedwords;
-
-import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.common.model.ViewModel;
-import io.bitsquare.gui.util.BSFormatter;
-
-import com.google.inject.Inject;
-
-import java.util.List;
-
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-class SeedWordsViewModel implements ViewModel {
-
-    final StringProperty seedWords = new SimpleStringProperty();
-
-    @Inject
-    public SeedWordsViewModel(WalletService walletService, BSFormatter formatter) {
-        if (walletService.getWallet() != null) {
-            List<String> mnemonicCode = walletService.getWallet().getKeyChainSeed().getMnemonicCode();
-            if (mnemonicCode != null) {
-                seedWords.set(formatter.mnemonicCodeToString(mnemonicCode));
-            }
-        }
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
index 6b297922e6..eeac9cf4d0 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
@@ -17,33 +17,29 @@
 
 package io.bitsquare.gui.main.account.settings;
 
-import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
-import io.bitsquare.gui.common.view.ViewPath;
-import io.bitsquare.gui.common.view.Wizard;
-import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.account.AccountView;
-import io.bitsquare.gui.main.account.content.changepassword.ChangePasswordView;
-import io.bitsquare.gui.main.account.content.fiat.FiatAccountView;
-import io.bitsquare.gui.main.account.content.registration.RegistrationView;
-import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
-import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
-import io.bitsquare.gui.util.Colors;
-
-import javax.inject.Inject;
-
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.scene.paint.*;
-
 import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
+import io.bitsquare.gui.Navigation;
+import io.bitsquare.gui.common.view.*;
+import io.bitsquare.gui.main.MainView;
+import io.bitsquare.gui.main.account.AccountView;
+import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView;
+import io.bitsquare.gui.main.account.content.backup.BackupView;
+import io.bitsquare.gui.main.account.content.password.PasswordView;
+import io.bitsquare.gui.main.account.content.paymentsaccount.PaymentAccountView;
+import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
+import io.bitsquare.gui.util.Colors;
+import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Paint;
+
+import javax.inject.Inject;
 
 @FxmlView
 public class AccountSettingsView extends ActivatableViewAndModel {
@@ -51,7 +47,8 @@ public class AccountSettingsView extends ActivatableViewAndModel {
     private final ViewLoader viewLoader;
     private final Navigation navigation;
 
-    private MenuItem seedWords, password, restrictions, fiatAccount, registration;
+    // private MenuItem registration;
+    private MenuItem password, seedWords, backup, paymentAccount, arbitratorSelection;
     private Navigation.Listener listener;
 
     @FXML private VBox leftVBox;
@@ -73,21 +70,22 @@ public class AccountSettingsView extends ActivatableViewAndModel {
         };
 
         ToggleGroup toggleGroup = new ToggleGroup();
-        seedWords = new MenuItem(navigation, toggleGroup, "Wallet seed", SeedWordsView.class);
-        password = new MenuItem(navigation, toggleGroup, "Wallet password", ChangePasswordView.class);
-        restrictions = new MenuItem(navigation, toggleGroup, "Arbitrator selection", RestrictionsView.class);
-        fiatAccount = new MenuItem(navigation, toggleGroup, "Payments account(s)", FiatAccountView.class);
-        registration = new MenuItem(navigation, toggleGroup, "Renew your account", RegistrationView.class);
+        password = new MenuItem(navigation, toggleGroup, "Wallet password", PasswordView.class, AwesomeIcon.UNLOCK_ALT);
+        seedWords = new MenuItem(navigation, toggleGroup, "Wallet seed", SeedWordsView.class, AwesomeIcon.KEY);
+        backup = new MenuItem(navigation, toggleGroup, "Backup", BackupView.class, AwesomeIcon.CLOUD_DOWNLOAD);
+        paymentAccount = new MenuItem(navigation, toggleGroup, "Payments account(s)", PaymentAccountView.class, AwesomeIcon.MONEY);
+        arbitratorSelection = new MenuItem(navigation, toggleGroup, "Arbitrator selection", ArbitratorSelectionView.class, AwesomeIcon.USER_MD);
+        // registration = new MenuItem(navigation, toggleGroup, "Renew your account", RegistrationView.class, AwesomeIcon.BRIEFCASE);
 
-        leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration);
+        leftVBox.getChildren().addAll(password, seedWords, backup, paymentAccount, arbitratorSelection);
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         navigation.addListener(listener);
         ViewPath viewPath = navigation.getCurrentPath();
         if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2) {
-            navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, SeedWordsView.class);
+            navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, PasswordView.class);
         }
         else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) {
             loadView(viewPath.get(3));
@@ -95,28 +93,37 @@ public class AccountSettingsView extends ActivatableViewAndModel {
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         navigation.removeListener(listener);
     }
 
     private void loadView(Class<? extends View> viewClass) {
+       /* if (viewClass.equals(PaymentAccountView.class)) {
+            PaymentAccountView view = new PaymentAccountView();
+            content.getChildren().setAll(view.getRoot());
+            paymentAccount.setSelected(true);
+        }
+        else {*/
         View view = viewLoader.load(viewClass);
         content.getChildren().setAll(view.getRoot());
         if (view instanceof Wizard.Step)
             ((Wizard.Step) view).hideWizardNavigation();
 
-        if (view instanceof SeedWordsView) seedWords.setSelected(true);
-        else if (view instanceof ChangePasswordView) password.setSelected(true);
-        else if (view instanceof RestrictionsView) restrictions.setSelected(true);
-        else if (view instanceof FiatAccountView) fiatAccount.setSelected(true);
-        else if (view instanceof RegistrationView) registration.setSelected(true);
+
+        if (view instanceof PasswordView) password.setSelected(true);
+        else if (view instanceof SeedWordsView) seedWords.setSelected(true);
+        else if (view instanceof BackupView) backup.setSelected(true);
+        else if (view instanceof PaymentAccountView) paymentAccount.setSelected(true);
+        else if (view instanceof ArbitratorSelectionView) arbitratorSelection.setSelected(true);
+        // else if (view instanceof RegistrationView) registration.setSelected(true);
+        //}
     }
 }
 
 
 class MenuItem extends ToggleButton {
 
-    MenuItem(Navigation navigation, ToggleGroup toggleGroup, String title, Class<? extends View> viewClass) {
+    MenuItem(Navigation navigation, ToggleGroup toggleGroup, String title, Class<? extends View> viewClass, AwesomeIcon awesomeIcon) {
 
         setToggleGroup(toggleGroup);
         setText(title);
@@ -126,14 +133,12 @@ class MenuItem extends ToggleButton {
         setAlignment(Pos.CENTER_LEFT);
 
         Label icon = new Label();
-        icon.setTextFill(Paint.valueOf("#999"));
-        if (viewClass == SeedWordsView.class)
-            AwesomeDude.setIcon(icon, AwesomeIcon.INFO_SIGN);
-        else if (viewClass == RegistrationView.class)
-            AwesomeDude.setIcon(icon, AwesomeIcon.BRIEFCASE);
-        else
-            AwesomeDude.setIcon(icon, AwesomeIcon.EDIT_SIGN);
-
+        AwesomeDude.setIcon(icon, awesomeIcon);
+        icon.setTextFill(Paint.valueOf("#333"));
+        icon.setPadding(new Insets(0, 5, 0, 0));
+        icon.setAlignment(Pos.CENTER);
+        icon.setMinWidth(25);
+        icon.setMaxWidth(25);
         setGraphic(icon);
 
         setOnAction((event) ->
@@ -146,7 +151,7 @@ class MenuItem extends ToggleButton {
             }
             else {
                 setId("account-settings-item-background-active");
-                icon.setTextFill(Paint.valueOf("#999"));
+                icon.setTextFill(Paint.valueOf("#333"));
             }
         });
 
@@ -157,7 +162,7 @@ class MenuItem extends ToggleButton {
             }
             else {
                 setId("account-settings-item-background-active");
-                icon.setTextFill(Paint.valueOf("#999"));
+                icon.setTextFill(Paint.valueOf("#333"));
             }
         });
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
index 6a211463ef..d8156c5946 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
@@ -18,27 +18,22 @@
 package io.bitsquare.gui.main.account.setup;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.common.view.ActivatableView;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
-import io.bitsquare.gui.common.view.Wizard;
+import io.bitsquare.gui.common.view.*;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.account.content.fiat.FiatAccountView;
+import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView;
 import io.bitsquare.gui.main.account.content.password.PasswordView;
-import io.bitsquare.gui.main.account.content.registration.RegistrationView;
-import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
+import io.bitsquare.gui.main.account.content.paymentsaccount.PaymentAccountView;
 import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 import io.bitsquare.gui.main.offer.BuyOfferView;
-
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
-import javafx.scene.control.*;
-import javafx.scene.image.*;
-import javafx.scene.layout.*;
+import javafx.scene.control.Label;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+
+import javax.inject.Inject;
 
 @FxmlView
 public class AccountSetupWizard extends ActivatableView implements Wizard {
@@ -46,7 +41,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
     @FXML VBox leftVBox;
     @FXML AnchorPane content;
 
-    private WizardItem seedWords, password, fiatAccount, restrictions, registration;
+    private WizardItem seedWords, password, fiatAccount, restrictions;
     private Navigation.Listener listener;
 
     private final ViewLoader viewLoader;
@@ -72,49 +67,38 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
             else if (viewClass == PasswordView.class) {
                 seedWords.onCompleted();
                 password.show();
-            }
-            else if (viewClass == RestrictionsView.class) {
+            } else if (viewClass == ArbitratorSelectionView.class) {
                 seedWords.onCompleted();
                 password.onCompleted();
                 restrictions.show();
-            }
-            else if (viewClass == FiatAccountView.class) {
+            } else if (viewClass == PaymentAccountView.class) {
                 seedWords.onCompleted();
                 password.onCompleted();
                 restrictions.onCompleted();
                 fiatAccount.show();
             }
-            else if (viewClass == RegistrationView.class) {
-                seedWords.onCompleted();
-                password.onCompleted();
-                restrictions.onCompleted();
-                fiatAccount.onCompleted();
-                registration.show();
-            }
         };
 
         seedWords = new WizardItem(SeedWordsView.class,
                 "Backup wallet seed", "Write down the seed word for your wallet");
         password = new WizardItem(PasswordView.class,
                 "Setup password", "Protect your wallet with a password");
-        restrictions = new WizardItem(RestrictionsView.class,
+        restrictions = new WizardItem(ArbitratorSelectionView.class,
                 "Select arbitrators", "Select which arbitrators you want to use for trading");
-        fiatAccount = new WizardItem(FiatAccountView.class,
+        fiatAccount = new WizardItem(PaymentAccountView.class,
                 " Setup Payments account(s)", "You need to setup at least one payment account");
-        registration = new WizardItem(RegistrationView.class,
-                "Register your account", "The registration in the Blockchain requires a payment of 0.0002 BTC");
 
-        leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration);
+        leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount);
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
         navigation.addListener(listener);
         seedWords.show();
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         navigation.removeListener(listener);
     }
 
@@ -127,17 +111,11 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
         else if (currentStep instanceof PasswordView) {
             password.onCompleted();
             restrictions.show();
-        }
-        else if (currentStep instanceof RestrictionsView) {
+        } else if (currentStep instanceof ArbitratorSelectionView) {
             restrictions.onCompleted();
             fiatAccount.show();
-        }
-        else if (currentStep instanceof FiatAccountView) {
+        } else if (currentStep instanceof PaymentAccountView) {
             fiatAccount.onCompleted();
-            registration.show();
-        }
-        else if (currentStep instanceof RegistrationView) {
-            registration.onCompleted();
 
             if (navigation.getReturnPath() != null)
                 navigation.navigateTo(navigation.getReturnPath());
@@ -146,7 +124,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
         }
     }
 
-    protected void loadView(Class<? extends View> viewClass) {
+    private void loadView(Class<? extends View> viewClass) {
         View view = viewLoader.load(viewClass);
         content.getChildren().setAll(view.getRoot());
         if (view instanceof Wizard.Step)
diff --git a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
index 4aa32bbf8a..36a7bb90e5 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
@@ -19,7 +19,8 @@
 
 <?import io.bitsquare.gui.components.TitledGroupBg?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.*?>
 <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.debug.DebugView"
           hgap="5.0" vgap="5.0"
@@ -38,7 +39,15 @@
             <Insets top="10"/>
         </GridPane.margin>
     </Label>
-    <ComboBox fx:id="taskComboBox" onAction="#onSelectTask" promptText="Select task" GridPane.rowIndex="0" GridPane.columnIndex="1">
+    <ComboBox fx:id="taskComboBox1" onAction="#onSelectTask1" promptText="Select task" GridPane.rowIndex="0"
+              GridPane.columnIndex="1">
+        <GridPane.margin>
+            <Insets top="10"/>
+        </GridPane.margin>
+    </ComboBox>
+
+    <ComboBox fx:id="taskComboBox2" onAction="#onSelectTask2" promptText="Select task" GridPane.rowIndex="1"
+              GridPane.columnIndex="1">
         <GridPane.margin>
             <Insets top="10"/>
         </GridPane.margin>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
index 4a407fd46d..c96b9911d0 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
@@ -30,53 +30,32 @@ import io.bitsquare.trade.protocol.placeoffer.tasks.BroadcastCreateOfferFeeTx;
 import io.bitsquare.trade.protocol.placeoffer.tasks.CreateOfferFeeTx;
 import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer;
 import io.bitsquare.trade.protocol.trade.BuyerAsOffererProtocol;
+import io.bitsquare.trade.protocol.trade.BuyerAsTakerProtocol;
+import io.bitsquare.trade.protocol.trade.SellerAsOffererProtocol;
 import io.bitsquare.trade.protocol.trade.SellerAsTakerProtocol;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessDepositTxInputsRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessFinalizePayoutTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendPayDepositRequest;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SendPayoutTxFinalizedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndFinalizePayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.VerifyAndSignContract;
-import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
-import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignContract;
-import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessPayDepositRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessPayoutTxFinalizedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SendDepositTxInputsRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SendFinalizePayoutTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SendPublishDepositTxRequest;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.*;
+import io.bitsquare.trade.protocol.trade.tasks.offerer.*;
+import io.bitsquare.trade.protocol.trade.tasks.seller.*;
 import io.bitsquare.trade.protocol.trade.tasks.shared.CommitPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.shared.InitWaitPeriodForOpenDispute;
 import io.bitsquare.trade.protocol.trade.tasks.shared.SetupPayoutTxLockTimeReachedListener;
-import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx;
-import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
-import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
-import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOffererAccount;
-
-import java.util.Arrays;
-
-import javax.inject.Inject;
-
+import io.bitsquare.trade.protocol.trade.tasks.shared.SignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.taker.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.ComboBox;
 import javafx.util.StringConverter;
 
+import javax.inject.Inject;
+import java.util.Arrays;
+
 @FxmlView
 public class DebugView extends InitializableView {
 
 
-    @FXML ComboBox<Class> taskComboBox;
+    @FXML
+    ComboBox<Class> taskComboBox1, taskComboBox2;
 
     @Inject
     public DebugView() {
@@ -84,7 +63,7 @@ public class DebugView extends InitializableView {
 
     @Override
     public void initialize() {
-        final ObservableList<Class> items = FXCollections.observableArrayList(Arrays.asList(
+        final ObservableList<Class> items1 = FXCollections.observableArrayList(Arrays.asList(
                         /*---- Protocol ----*/
                         OfferAvailabilityProtocol.class,
                         GetPeerAddress.class,
@@ -104,15 +83,18 @@ public class DebugView extends InitializableView {
                         
                         /*---- Protocol ----*/
                         BuyerAsOffererProtocol.class,
-                        ProcessDepositTxInputsRequest.class,
-                        CreateDepositTxInputs.class,
-                        SendPayDepositRequest.class,
-
-                        ProcessPublishDepositTxRequest.class,
+                        ProcessPayDepositRequest.class,
+                        VerifyArbitrationSelection.class,
                         VerifyTakerAccount.class,
-                        VerifyAndSignContract.class,
-                        SignAndPublishDepositTx.class,
-                        SendDepositTxPublishedMessage.class,
+                        CreateAndSignContract.class,
+                        CreateAndSignDepositTxAsBuyer.class,
+                        LoadTakeOfferFeeTx.class,
+                        InitWaitPeriodForOpenDispute.class,
+                        SetupDepositBalanceListener.class,
+                        SendPublishDepositTxRequest.class,
+
+                        ProcessDepositTxPublishedMessage.class,
+                        AddDepositTxToWallet.class,
 
                         VerifyTakeOfferFeePayment.class,
                         SendFiatTransferStartedMessage.class,
@@ -127,18 +109,17 @@ public class DebugView extends InitializableView {
 
                         /*---- Protocol ----*/
                         SellerAsTakerProtocol.class,
+                        SelectArbitrator.class,
                         CreateTakeOfferFeeTx.class,
                         BroadcastTakeOfferFeeTx.class,
-                        SendDepositTxInputsRequest.class,
+                        CreateDepositTxInputsAsSeller.class,
+                        SendPayDepositRequest.class,
 
-                        ProcessPayDepositRequest.class,
+                        ProcessPublishDepositTxRequest.class,
                         VerifyOffererAccount.class,
-                        CreateAndSignContract.class,
-                        CreateAndSignDepositTx.class,
-                        SendPublishDepositTxRequest.class,
-
-                        ProcessDepositTxPublishedMessage.class,
-                        CommitDepositTx.class,
+                        VerifyAndSignContract.class,
+                        SignAndPublishDepositTxAsSeller.class,
+                        SendDepositTxPublishedMessage.class,
 
                         ProcessFiatTransferStartedMessage.class,
 
@@ -148,14 +129,87 @@ public class DebugView extends InitializableView {
 
                         ProcessPayoutTxFinalizedMessage.class,
                         CommitPayoutTx.class,
-                        SetupPayoutTxLockTimeReachedListener.class
+                        SetupPayoutTxLockTimeReachedListener.class,
+                        Boolean.class /* used as seperator*/
+                )
+        );
+        final ObservableList<Class> items2 = FXCollections.observableArrayList(Arrays.asList(
+                        /*---- Protocol ----*/
+                        BuyerAsTakerProtocol.class,
+                        SelectArbitrator.class,
+                        CreateTakeOfferFeeTx.class,
+                        BroadcastTakeOfferFeeTx.class,
+                        CreateDepositTxInputsAsSeller.class,
+                        SendPayDepositRequest.class,
+
+                        ProcessPublishDepositTxRequest.class,
+                        VerifyOffererAccount.class,
+                        VerifyAndSignContract.class,
+                        SignAndPublishDepositTxAsSeller.class,
+                        SendDepositTxPublishedMessage.class,
+
+                        VerifyOfferFeePayment.class,
+                        SignPayoutTx.class,
+                        SendFiatTransferStartedMessage.class,
+
+                        ProcessFinalizePayoutTxRequest.class,
+                        SignAndFinalizePayoutTx.class,
+                        CommitPayoutTx.class,
+                        SendPayoutTxFinalizedMessage.class,
+                        SetupPayoutTxLockTimeReachedListener.class,
+                        Boolean.class, /* used as seperator*/
+                        
+                        
+                         /*---- Protocol ----*/
+                        SellerAsOffererProtocol.class,
+                        ProcessPayDepositRequest.class,
+                        VerifyArbitrationSelection.class,
+                        VerifyTakerAccount.class,
+                        InitWaitPeriodForOpenDispute.class,
+                        CreateAndSignContract.class,
+                        CreateAndSignDepositTxAsBuyer.class,
+                        SetupDepositBalanceListener.class,
+                        SendPublishDepositTxRequest.class,
+
+                        ProcessDepositTxPublishedMessage.class,
+                        AddDepositTxToWallet.class,
+
+                        ProcessFiatTransferStartedMessage.class,
+
+                        VerifyTakeOfferFeePayment.class,
+                        SignPayoutTx.class,
+                        SendFinalizePayoutTxRequest.class,
+
+                        ProcessPayoutTxFinalizedMessage.class,
+                        CommitPayoutTx.class,
+                        SetupPayoutTxLockTimeReachedListener.class,
+                        Boolean.class /* used as seperator*/
                 )
         );
 
+        taskComboBox1.setVisibleRowCount(items1.size());
+        taskComboBox1.setItems(items1);
+        taskComboBox1.setConverter(new StringConverter<Class>() {
+            @Override
+            public String toString(Class item) {
+                if (item.getSimpleName().contains("Protocol"))
+                    return "--- " + item.getSimpleName() + " ---";
+                else if (item.getSimpleName().contains("Boolean"))
+                    return "";
+                else
+                    return item.getSimpleName();
+            }
 
-        taskComboBox.setVisibleRowCount(items.size());
-        taskComboBox.setItems(items);
-        taskComboBox.setConverter(new StringConverter<Class>() {
+            @Override
+            public Class fromString(String s) {
+                return null;
+            }
+        });
+
+
+        taskComboBox2.setVisibleRowCount(items2.size());
+        taskComboBox2.setItems(items2);
+        taskComboBox2.setConverter(new StringConverter<Class>() {
             @Override
             public String toString(Class item) {
                 if (item.getSimpleName().contains("Protocol"))
@@ -174,11 +228,21 @@ public class DebugView extends InitializableView {
     }
 
     @FXML
-    void onSelectTask() {
-        Class item = taskComboBox.getSelectionModel().getSelectedItem();
+    void onSelectTask1() {
+        Class item = taskComboBox1.getSelectionModel().getSelectedItem();
         if (!item.getSimpleName().contains("Protocol")) {
             Task.taskToIntercept = item;
         }
     }
+
+    @FXML
+    void onSelectTask2() {
+        Class item = taskComboBox2.getSelectionModel().getSelectedItem();
+        if (!item.getSimpleName().contains("Protocol")) {
+            Task.taskToIntercept = item;
+        }
+    }
+
+
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
index 51135ab6ac..b6855385cf 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
@@ -16,14 +16,15 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Tab?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.layout.AnchorPane?>
 <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">
 
-    <Tab fx:id="reservedTab" text="Reserved for trades" closable="false"/>
+    <Tab fx:id="reservedTab" text="Reserved for trades" closable="false"></Tab>
     <Tab fx:id="withdrawalTab" text="Open for withdrawal" closable="false"/>
     <Tab fx:id="transactionsTab" text="Transactions" closable="false"/>
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
index d80c33bca1..7948fd03aa 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
@@ -17,23 +17,24 @@
 
 package io.bitsquare.gui.main.funds;
 
+import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
+import io.bitsquare.gui.common.view.*;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.funds.reserved.ReservedView;
 import io.bitsquare.gui.main.funds.transactions.TransactionsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
-
-import javax.inject.Inject;
-
+import io.bitsquare.gui.popups.FirstTimePopup;
+import io.bitsquare.gui.popups.WebViewPopup;
+import io.bitsquare.user.PopupId;
+import io.bitsquare.user.Preferences;
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+
+import javax.inject.Inject;
 
 @FxmlView
 public class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
@@ -46,11 +47,13 @@ public class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
 
     private final ViewLoader viewLoader;
     private final Navigation navigation;
+    private Preferences preferences;
 
     @Inject
-    public FundsView(CachingViewLoader viewLoader, Navigation navigation) {
+    public FundsView(CachingViewLoader viewLoader, Navigation navigation, Preferences preferences) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
+        this.preferences = preferences;
     }
 
     @Override
@@ -71,7 +74,7 @@ public class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
         navigation.addListener(navigationListener);
 
@@ -81,10 +84,13 @@ public class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
             navigation.navigateTo(MainView.class, FundsView.class, WithdrawalView.class);
         else if (root.getSelectionModel().getSelectedItem() == transactionsTab)
             navigation.navigateTo(MainView.class, FundsView.class, TransactionsView.class);
+
+        if (preferences.getShowAgainMap().get(PopupId.TRADE_WALLET) && !BitsquareApp.DEV_MODE)
+            new FirstTimePopup(preferences).url(WebViewPopup.getLocalUrl("tradeWallet.html")).show();
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
         navigation.removeListener(navigationListener);
         currentTab = null;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java
index 743a8a3cfa..a4d0f4a057 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java
@@ -23,23 +23,24 @@ import io.bitsquare.btc.listeners.AddressConfidenceListener;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
-
+import io.bitsquare.trade.Tradable;
+import io.bitsquare.trade.Trade;
+import javafx.scene.control.Label;
+import javafx.scene.control.Tooltip;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.TransactionConfidence;
-
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.control.*;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ReservedListItem {
-    private final StringProperty addressString = new SimpleStringProperty();
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
     private final BalanceListener balanceListener;
 
     private final Label balanceLabel;
 
+    private final Tradable tradable;
     private final AddressEntry addressEntry;
 
     private final WalletService walletService;
@@ -49,14 +50,15 @@ public class ReservedListItem {
     private final ConfidenceProgressIndicator progressIndicator;
 
     private final Tooltip tooltip;
-
+    private final String addressString;
     private Coin balance;
 
-    public ReservedListItem(AddressEntry addressEntry, WalletService walletService, BSFormatter formatter) {
+    public ReservedListItem(Tradable tradable, AddressEntry addressEntry, WalletService walletService, BSFormatter formatter) {
+        this.tradable = tradable;
         this.addressEntry = addressEntry;
         this.walletService = walletService;
         this.formatter = formatter;
-        this.addressString.set(getAddress().toString());
+        addressString = addressEntry.getAddressString();
 
         // confidence
         progressIndicator = new ConfidenceProgressIndicator();
@@ -96,7 +98,34 @@ public class ReservedListItem {
     private void updateBalance(Coin balance) {
         this.balance = balance;
         if (balance != null) {
-            balanceLabel.setText(formatter.formatCoin(balance));
+            if (tradable instanceof Trade) {
+                Trade trade = (Trade) tradable;
+                Trade.Phase phase = trade.getState().getPhase();
+                switch (phase) {
+                    case PREPARATION:
+                    case TAKER_FEE_PAID:
+                        balanceLabel.setText(formatter.formatCoinWithCode(balance) + " locked in deposit");
+                        break;
+                    case DEPOSIT_PAID:
+                    case FIAT_SENT:
+                    case FIAT_RECEIVED:
+                        // TODO show amount locked
+                        balanceLabel.setText("Locked in deposit");
+                        break;
+                    case PAYOUT_PAID:
+                        balanceLabel.setText(formatter.formatCoinWithCode(balance) + " in wallet");
+                        break;
+                    case WITHDRAWN:
+                        log.error("Invalid state at updateBalance (WITHDRAWN)");
+                        balanceLabel.setText(formatter.formatCoinWithCode(balance) + " already withdrawn");
+                        break;
+                    case DISPUTE:
+                        balanceLabel.setText(formatter.formatCoinWithCode(balance) + " locked because of open ticket");
+                        break;
+                }
+
+            } else
+                balanceLabel.setText(formatter.formatCoin(balance));
         }
     }
 
@@ -128,23 +157,18 @@ public class ReservedListItem {
 
     public final String getLabel() {
         switch (addressEntry.getContext()) {
-            case REGISTRATION_FEE:
-                return "Registration fee";
             case TRADE:
-                checkNotNull(addressEntry.getOfferId());
-                return "Offer ID: " + addressEntry.getOfferId();
-            case ARBITRATOR_DEPOSIT:
+                if (tradable instanceof Trade)
+                    return "Trade ID: " + addressEntry.getShortOfferId();
+                else
+                    return "Offer ID: " + addressEntry.getShortOfferId();
+            case ARBITRATOR:
                 return "Arbitration deposit";
         }
         return "";
     }
 
-
-    public final StringProperty addressStringProperty() {
-        return this.addressString;
-    }
-
-    Address getAddress() {
+    private Address getAddress() {
         return addressEntry.getAddress();
     }
 
@@ -167,4 +191,8 @@ public class ReservedListItem {
     public Coin getBalance() {
         return balance;
     }
+
+    public String getAddressString() {
+        return addressString;
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml
index c45f61260f..b53b799908 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml
@@ -18,26 +18,20 @@
   -->
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.cell.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.VBox?>
 <VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.reserved.ReservedView"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
-        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+        <Insets bottom="0.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
 
     <TableView fx:id="table" VBox.vgrow="ALWAYS">
         <columns>
             <TableColumn text="Label" fx:id="labelColumn" minWidth="100" sortable="false"/>
-            <TableColumn text="Address" fx:id="addressColumn" minWidth="240" sortable="false">
-                <cellValueFactory>
-                    <PropertyValueFactory property="addressString"/>
-                </cellValueFactory>
-            </TableColumn>
+            <TableColumn text="Address" fx:id="addressColumn" minWidth="240" sortable="false"/>
             <TableColumn text="Balance" fx:id="balanceColumn" minWidth="50" sortable="false"/>
-            <TableColumn text="Copy" fx:id="copyColumn" minWidth="30" sortable="false"/>
-            <TableColumn text="Status" fx:id="confidenceColumn" minWidth="30" sortable="false"/>
+            <TableColumn text="Confirmations" fx:id="confidenceColumn" minWidth="30" sortable="false"/>
         </columns>
     </TableView>
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
index dd144aa788..7bfe52d425 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
@@ -19,49 +19,57 @@ package io.bitsquare.gui.main.funds.reserved;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
+import io.bitsquare.gui.popups.OfferDetailsPopup;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.popups.TradeDetailsPopup;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.gui.util.GUIUtil;
+import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
+import io.bitsquare.trade.offer.OpenOffer;
 import io.bitsquare.trade.offer.OpenOfferManager;
-
-import org.bitcoinj.core.Coin;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.inject.Inject;
-
+import io.bitsquare.user.Preferences;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
 import javafx.util.Callback;
+import org.bitcoinj.core.Coin;
 
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
+import javax.inject.Inject;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @FxmlView
-public class ReservedView extends ActivatableViewAndModel {
-
+public class ReservedView extends ActivatableView<VBox, Void> {
     @FXML TableView<ReservedListItem> table;
-    @FXML TableColumn<ReservedListItem, ReservedListItem> labelColumn, addressColumn, balanceColumn, copyColumn,
-            confidenceColumn;
+    @FXML
+    TableColumn<ReservedListItem, ReservedListItem> labelColumn, addressColumn, balanceColumn, confidenceColumn;
 
     private final WalletService walletService;
     private final TradeManager tradeManager;
-    private OpenOfferManager openOfferManager;
+    private final OpenOfferManager openOfferManager;
+    private final Preferences preferences;
     private final BSFormatter formatter;
+    private final OfferDetailsPopup offerDetailsPopup;
+    private final TradeDetailsPopup tradeDetailsPopup;
     private final ObservableList<ReservedListItem> addressList = FXCollections.observableArrayList();
 
     @Inject
-    private ReservedView(WalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, BSFormatter formatter) {
+    private ReservedView(WalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, Preferences preferences,
+                         BSFormatter formatter, OfferDetailsPopup offerDetailsPopup, TradeDetailsPopup tradeDetailsPopup) {
         this.walletService = walletService;
         this.tradeManager = tradeManager;
         this.openOfferManager = openOfferManager;
+        this.preferences = preferences;
         this.formatter = formatter;
+        this.offerDetailsPopup = offerDetailsPopup;
+        this.tradeDetailsPopup = tradeDetailsPopup;
     }
 
 
@@ -71,13 +79,13 @@ public class ReservedView extends ActivatableViewAndModel {
         table.setPlaceholder(new Label("No funded are reserved in open offers or trades"));
 
         setLabelColumnCellFactory();
+        setAddressColumnCellFactory();
         setBalanceColumnCellFactory();
-        setCopyColumnCellFactory();
         setConfidenceColumnCellFactory();
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         fillList();
         table.setItems(addressList);
 
@@ -90,22 +98,27 @@ public class ReservedView extends ActivatableViewAndModel {
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         addressList.forEach(ReservedListItem::cleanup);
     }
 
 
     private void fillList() {
+        addressList.forEach(ReservedListItem::cleanup);
         addressList.clear();
-        addressList.addAll(Stream.concat(openOfferManager.getOpenOffers().stream(), tradeManager.getPendingTrades().stream())
-                .map(tradable -> new ReservedListItem(walletService.getAddressEntry(tradable.getOffer().getId()), walletService, formatter))
+        addressList.addAll(Stream.concat(openOfferManager.getOpenOffers().stream(), tradeManager.getTrades().stream())
+                .map(tradable -> new ReservedListItem(tradable, walletService.getAddressEntryByOfferId(tradable.getOffer().getId()), walletService, formatter))
                 .collect(Collectors.toList()));
+    }
 
-        // List<AddressEntry> addressEntryList = walletService.getAddressEntryList();
-      /*  addressList.addAll(addressEntryList.stream()
-                .filter(e -> walletService.getBalanceForAddress(e.getAddress()).isPositive())
-                .map(anAddressEntryList -> new ReservedListItem(anAddressEntryList, walletService, formatter))
-                .collect(Collectors.toList()));*/
+    private void openBlockExplorer(ReservedListItem item) {
+        try {
+            Utilities.openWebPage(preferences.getBlockChainExplorer().addressUrl + item.getAddressString());
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            new Popup().warning("Opening browser failed. Please check your internet " +
+                    "connection.").show();
+        }
     }
 
     private void setLabelColumnCellFactory() {
@@ -127,13 +140,18 @@ public class ReservedView extends ActivatableViewAndModel {
 
                         if (item != null && !empty) {
                             hyperlink = new Hyperlink(item.getLabel());
-                            hyperlink.setId("id-link");
                             if (item.getAddressEntry().getOfferId() != null) {
                                 Tooltip tooltip = new Tooltip(item.getAddressEntry().getOfferId());
                                 Tooltip.install(hyperlink, tooltip);
 
-                                hyperlink.setOnAction(event -> log.info("Show trade details " + item.getAddressEntry
-                                        ().getOfferId()));
+                                hyperlink.setOnAction(event -> {
+                                    Optional<Trade> tradeOptional = tradeManager.getTradeById(item.getAddressEntry().getOfferId());
+                                    Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOfferById(item.getAddressEntry().getOfferId());
+                                    if (tradeOptional.isPresent())
+                                        tradeDetailsPopup.show(tradeOptional.get());
+                                    else if (openOfferOptional.isPresent())
+                                        offerDetailsPopup.show(openOfferOptional.get().getOffer());
+                                });
                             }
                             setGraphic(hyperlink);
                         }
@@ -147,6 +165,36 @@ public class ReservedView extends ActivatableViewAndModel {
         });
     }
 
+    private void setAddressColumnCellFactory() {
+        addressColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
+        addressColumn.setCellFactory(
+                new Callback<TableColumn<ReservedListItem, ReservedListItem>, TableCell<ReservedListItem,
+                        ReservedListItem>>() {
+
+                    @Override
+                    public TableCell<ReservedListItem, ReservedListItem> call(TableColumn<ReservedListItem,
+                            ReservedListItem> column) {
+                        return new TableCell<ReservedListItem, ReservedListItem>() {
+                            private Hyperlink hyperlink;
+
+                            @Override
+                            public void updateItem(final ReservedListItem item, boolean empty) {
+                                super.updateItem(item, empty);
+
+                                if (item != null && !empty) {
+                                    hyperlink = new Hyperlink(item.getAddressString());
+                                    hyperlink.setOnAction(event -> openBlockExplorer(item));
+                                    setGraphic(hyperlink);
+                                } else {
+                                    setGraphic(null);
+                                    setId(null);
+                                }
+                            }
+                        };
+                    }
+                });
+    }
+
     private void setBalanceColumnCellFactory() {
         balanceColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
         balanceColumn.setCellFactory(
@@ -167,43 +215,6 @@ public class ReservedView extends ActivatableViewAndModel {
                 });
     }
 
-    private void setCopyColumnCellFactory() {
-        copyColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
-        copyColumn.setCellFactory(
-                new Callback<TableColumn<ReservedListItem, ReservedListItem>, TableCell<ReservedListItem,
-                        ReservedListItem>>() {
-
-                    @Override
-                    public TableCell<ReservedListItem, ReservedListItem> call(TableColumn<ReservedListItem,
-                            ReservedListItem> column) {
-                        return new TableCell<ReservedListItem, ReservedListItem>() {
-                            final Label copyIcon = new Label();
-
-                            {
-                                copyIcon.getStyleClass().add("copy-icon");
-                                AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
-                                Tooltip.install(copyIcon, new Tooltip("Copy address to clipboard"));
-                            }
-
-                            @Override
-                            public void updateItem(final ReservedListItem item, boolean empty) {
-                                super.updateItem(item, empty);
-
-                                if (item != null && !empty) {
-                                    setGraphic(copyIcon);
-                                    copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(item
-                                            .addressStringProperty().get()));
-
-                                }
-                                else {
-                                    setGraphic(null);
-                                }
-                            }
-                        };
-                    }
-                });
-    }
-
     private void setConfidenceColumnCellFactory() {
         confidenceColumn.setCellValueFactory((addressListItem) ->
                 new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
index e0dc1aba6d..b504d12f2a 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
@@ -18,17 +18,17 @@
   -->
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.cell.*?>
+<?import javafx.scene.control.cell.PropertyValueFactory?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.VBox?>
 <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"/>
+        <Insets bottom="0.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
     <TableView fx:id="table" VBox.vgrow="ALWAYS">
         <columns>
-            <TableColumn text="Date" fx:id="dateColumn" minWidth="100" sortable="false">
+            <TableColumn text="Date/Time" fx:id="dateColumn" minWidth="100" sortable="false">
                 <cellValueFactory>
                     <PropertyValueFactory property="date"/>
                 </cellValueFactory>
@@ -45,7 +45,7 @@
                 </cellValueFactory>
             </TableColumn>
 
-            <TableColumn text="Status" fx:id="confidenceColumn" minWidth="30" sortable="false"/>
+            <TableColumn text="Confirmations" fx:id="confidenceColumn" minWidth="30" sortable="false"/>
         </columns>
     </TableView>
 </VBox>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
index 865771476d..d359cc4f0c 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
@@ -18,28 +18,27 @@
 package io.bitsquare.gui.main.funds.transactions;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.Popups;
+import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.util.Utilities;
-
-import org.bitcoinj.core.Transaction;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
+import io.bitsquare.user.Preferences;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
 import javafx.util.Callback;
+import org.bitcoinj.core.Transaction;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @FxmlView
-public class TransactionsView extends ActivatableViewAndModel {
+public class TransactionsView extends ActivatableView<VBox, Void> {
 
     @FXML TableView<TransactionsListItem> table;
     @FXML TableColumn<TransactionsListItem, TransactionsListItem> dateColumn, addressColumn, amountColumn, typeColumn,
@@ -49,11 +48,13 @@ public class TransactionsView extends ActivatableViewAndModel {
 
     private final WalletService walletService;
     private final BSFormatter formatter;
+    private final Preferences preferences;
 
     @Inject
-    private TransactionsView(WalletService walletService, BSFormatter formatter) {
+    private TransactionsView(WalletService walletService, BSFormatter formatter, Preferences preferences) {
         this.walletService = walletService;
         this.formatter = formatter;
+        this.preferences = preferences;
     }
 
     @Override
@@ -66,7 +67,7 @@ public class TransactionsView extends ActivatableViewAndModel {
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         List<Transaction> transactions = walletService.getWallet().getRecentTransactions(10000, true);
         transactionsListItems = FXCollections.observableArrayList();
         transactionsListItems.addAll(transactions.stream().map(transaction ->
@@ -76,7 +77,7 @@ public class TransactionsView extends ActivatableViewAndModel {
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         transactionsListItems.forEach(TransactionsListItem::cleanup);
     }
 
@@ -85,12 +86,11 @@ public class TransactionsView extends ActivatableViewAndModel {
         log.debug("openTxDetails " + item);
 
         try {
-            // TODO get the url form the app preferences
-            Utilities.openWebPage("https://www.biteasy.com/testnet/addresses/" + item.getAddressString());
+            Utilities.openWebPage(preferences.getBlockChainExplorer().addressUrl + item.getAddressString());
         } catch (Exception e) {
             log.error(e.getMessage());
-            Popups.openWarningPopup("Warning", "Opening browser failed. Please check your internet " +
-                    "connection.");
+            new Popup().warning("Opening browser failed. Please check your internet " +
+                    "connection.").show();
         }
     }
 
@@ -112,7 +112,6 @@ public class TransactionsView extends ActivatableViewAndModel {
 
                                 if (item != null && !empty) {
                                     hyperlink = new Hyperlink(item.getAddressString());
-                                    hyperlink.setId("id-link");
                                     hyperlink.setOnAction(event -> openTxDetails(item));
                                     setGraphic(hyperlink);
                                 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
index 0b9ca39899..b3b9cb864b 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
@@ -23,19 +23,13 @@ import io.bitsquare.btc.listeners.AddressConfidenceListener;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
-
+import javafx.scene.control.Label;
+import javafx.scene.control.Tooltip;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.TransactionConfidence;
 
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.control.*;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class WithdrawalListItem {
-    private final StringProperty addressString = new SimpleStringProperty();
     private final BalanceListener balanceListener;
 
     private final Label balanceLabel;
@@ -51,12 +45,13 @@ public class WithdrawalListItem {
     private final Tooltip tooltip;
 
     private Coin balance;
+    private final String addressString;
 
     public WithdrawalListItem(AddressEntry addressEntry, WalletService walletService, BSFormatter formatter) {
         this.addressEntry = addressEntry;
         this.walletService = walletService;
         this.formatter = formatter;
-        this.addressString.set(getAddress().toString());
+        addressString = addressEntry.getAddressString();
 
         // confidence
         progressIndicator = new ConfidenceProgressIndicator();
@@ -128,23 +123,15 @@ public class WithdrawalListItem {
 
     public final String getLabel() {
         switch (addressEntry.getContext()) {
-            case REGISTRATION_FEE:
-                return "Registration fee";
             case TRADE:
-                checkNotNull(addressEntry.getOfferId());
-                return "Offer ID: " + addressEntry.getOfferId();
-            case ARBITRATOR_DEPOSIT:
-                return "Arbitration deposit";
+                return "Offer ID: " + addressEntry.getShortOfferId();
+            case ARBITRATOR:
+                return "Arbitration fee";
         }
         return "";
     }
 
-
-    public final StringProperty addressStringProperty() {
-        return this.addressString;
-    }
-
-    Address getAddress() {
+    private Address getAddress() {
         return addressEntry.getAddress();
     }
 
@@ -167,4 +154,8 @@ public class WithdrawalListItem {
     public Coin getBalance() {
         return balance;
     }
+
+    public String getAddressString() {
+        return addressString;
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
index a4f9e8a52d..4e61e63e66 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
@@ -19,7 +19,7 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.control.cell.*?>
+<?import javafx.scene.control.cell.PropertyValueFactory?>
 <?import javafx.scene.layout.*?>
 <VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.withdrawal.WithdrawalView"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
@@ -36,8 +36,7 @@
                 </cellValueFactory>
             </TableColumn>
             <TableColumn text="Balance" fx:id="balanceColumn" minWidth="50" sortable="false"/>
-            <TableColumn text="Copy" fx:id="copyColumn" minWidth="30" sortable="false"/>
-            <TableColumn text="Status" fx:id="confidenceColumn" minWidth="30" sortable="false"/>
+            <TableColumn text="Confirmations" fx:id="confidenceColumn" minWidth="30" sortable="false"/>
         </columns>
     </TableView>
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
index 85f0aa47d6..481481dda4 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
@@ -17,75 +17,89 @@
 
 package io.bitsquare.gui.main.funds.withdrawal;
 
+import com.google.common.util.concurrent.FutureCallback;
+import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.btc.AddressEntry;
 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.common.view.ActivatableViewAndModel;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.Popups;
+import io.bitsquare.gui.popups.OfferDetailsPopup;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.popups.WalletPasswordPopup;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.gui.util.GUIUtil;
 import io.bitsquare.gui.util.validation.BtcAddressValidator;
-import io.bitsquare.gui.util.validation.BtcValidator;
+import io.bitsquare.trade.Tradable;
+import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
+import io.bitsquare.trade.closed.ClosedTradableManager;
+import io.bitsquare.trade.failed.FailedTradesManager;
+import io.bitsquare.trade.offer.OpenOffer;
 import io.bitsquare.trade.offer.OpenOfferManager;
-
-import org.bitcoinj.core.AddressFormatException;
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.InsufficientMoneyException;
-import org.bitcoinj.core.Transaction;
-
-import com.google.common.util.concurrent.FutureCallback;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.inject.Inject;
-
+import io.bitsquare.user.Preferences;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
 import javafx.util.Callback;
-
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
-
-import org.controlsfx.control.action.Action;
-
+import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.InsufficientMoneyException;
+import org.bitcoinj.core.Transaction;
 import org.jetbrains.annotations.NotNull;
+import org.spongycastle.crypto.params.KeyParameter;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @FxmlView
-public class WithdrawalView extends ActivatableViewAndModel {
+public class WithdrawalView extends ActivatableView<VBox, Void> {
 
     @FXML Button withdrawButton;
     @FXML TableView<WithdrawalListItem> table;
     @FXML TextField withdrawFromTextField, withdrawToTextField, amountTextField;
-    @FXML TableColumn<WithdrawalListItem, WithdrawalListItem> labelColumn, addressColumn, balanceColumn, copyColumn,
-            confidenceColumn;
+    @FXML
+    TableColumn<WithdrawalListItem, WithdrawalListItem> labelColumn, addressColumn, balanceColumn, confidenceColumn;
 
     private final WalletService walletService;
-    private TradeManager tradeManager;
-    private OpenOfferManager openOfferManager;
+    private final TradeManager tradeManager;
+    private final ClosedTradableManager closedTradableManager;
+    private final FailedTradesManager failedTradesManager;
+    private final OpenOfferManager openOfferManager;
     private final BSFormatter formatter;
+    private final Preferences preferences;
     private final BtcAddressValidator btcAddressValidator;
-    private final BtcValidator btcValidator;
+    private final WalletPasswordPopup walletPasswordPopup;
+    private final OfferDetailsPopup offerDetailsPopup;
+    private final TradeDetailsPopup tradeDetailsPopup;
     private final ObservableList<WithdrawalListItem> addressList = FXCollections.observableArrayList();
 
     @Inject
-    private WithdrawalView(WalletService walletService, TradeManager tradeManager, OpenOfferManager openOfferManager, BSFormatter formatter,
-                           BtcAddressValidator btcAddressValidator, BtcValidator btcValidator) {
+    private WithdrawalView(WalletService walletService, TradeManager tradeManager, ClosedTradableManager closedTradableManager,
+                           FailedTradesManager failedTradesManager, OpenOfferManager openOfferManager, BSFormatter formatter, Preferences preferences,
+                           BtcAddressValidator btcAddressValidator, WalletPasswordPopup walletPasswordPopup,
+                           OfferDetailsPopup offerDetailsPopup, TradeDetailsPopup tradeDetailsPopup) {
         this.walletService = walletService;
         this.tradeManager = tradeManager;
+        this.closedTradableManager = closedTradableManager;
+        this.failedTradesManager = failedTradesManager;
         this.openOfferManager = openOfferManager;
         this.formatter = formatter;
+        this.preferences = preferences;
         this.btcAddressValidator = btcAddressValidator;
-        this.btcValidator = btcValidator;
+        this.walletPasswordPopup = walletPasswordPopup;
+        this.offerDetailsPopup = offerDetailsPopup;
+        this.tradeDetailsPopup = tradeDetailsPopup;
     }
 
 
@@ -95,19 +109,34 @@ public class WithdrawalView extends ActivatableViewAndModel {
         table.setPlaceholder(new Label("No funds for withdrawal available"));
 
         setLabelColumnCellFactory();
+        setAddressColumnCellFactory();
         setBalanceColumnCellFactory();
-        setCopyColumnCellFactory();
         setConfidenceColumnCellFactory();
+
+        if (BitsquareApp.DEV_MODE)
+            withdrawToTextField.setText("mwajQdfYnve1knXnmv7JdeiVpeogTsck6S");
     }
 
     private boolean areInputsValid() {
         return btcAddressValidator.validate(withdrawFromTextField.getText()).and(
-                btcAddressValidator.validate(withdrawToTextField.getText())).and(
-                btcValidator.validate(amountTextField.getText())).isValid;
+                btcAddressValidator.validate(withdrawToTextField.getText())).isValid;
+    }
+
+    private void openTxDetails(WithdrawalListItem item) {
+        // TODO Open popup with details view
+        log.debug("openTxDetails " + item);
+
+        try {
+            Utilities.openWebPage(preferences.getBlockChainExplorer().addressUrl + item.getAddressString());
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            new Popup().warning("Opening browser failed. Please check your internet " +
+                    "connection.").show();
+        }
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         withdrawButton.disableProperty().bind(Bindings.createBooleanBinding(() -> !areInputsValid(),
                 withdrawFromTextField.textProperty(), amountTextField.textProperty(), withdrawToTextField.textProperty()));
         table.getSelectionModel().selectedItemProperty().addListener((observableValue, oldValue, newValue) -> {
@@ -137,7 +166,7 @@ public class WithdrawalView extends ActivatableViewAndModel {
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         addressList.forEach(WithdrawalListItem::cleanup);
         withdrawButton.disableProperty().unbind();
     }
@@ -163,51 +192,62 @@ public class WithdrawalView extends ActivatableViewAndModel {
                 }
             };
 
-            Action response = Popups.openConfirmPopup(
-                    "Withdrawal request", "Confirm your request",
-                    "Your withdrawal request:\n\n" + "Amount: " + amountTextField.getText() + " BTC\n" + "Sending" +
-                            " address: " + withdrawFromTextField.getText() + "\n" + "Receiving address: " +
-                            withdrawToTextField.getText() + "\n" + "Transaction fee: " +
-                            formatter.formatCoinWithCode(FeePolicy.TX_FEE) + "\n" +
-                            "You receive in total: " +
-                            formatter.formatCoinWithCode(amount.subtract(FeePolicy.TX_FEE)) + " BTC\n\n" +
-                            "Are you sure you withdraw that amount?");
-
-            Popups.removeBlurContent();
-            if (Popups.isOK(response)) {
-                try {
-                    walletService.sendFunds(withdrawFromTextField.getText(), withdrawToTextField.getText(),
-                            amount, callback);
-                    fillList();
-                } catch (AddressFormatException e) {
-                    Popups.openErrorPopup("Address invalid",
-                            "The address is not correct. Please check the address format.");
-
-                } catch (InsufficientMoneyException e) {
-                    Popups.openInsufficientMoneyPopup();
-                } catch (IllegalArgumentException e) {
-                    Popups.openErrorPopup("Wrong inputs", "Please check the inputs.");
-                }
+            if (BitsquareApp.DEV_MODE) {
+                doWithdraw(amount, callback);
+            } else {
+                new Popup().headLine("Confirm your withdrawal request").message("Amount: " + amountTextField.getText() + " " +
+                        "BTC\n" +
+                        "Sending" +
+                        " address: " + withdrawFromTextField.getText() + "\n" + "Receiving address: " +
+                        withdrawToTextField.getText() + "\n" + "Transaction fee: " +
+                        formatter.formatCoinWithCode(FeePolicy.TX_FEE) + "\n" +
+                        "Receivers amount: " +
+                        formatter.formatCoinWithCode(amount.subtract(FeePolicy.TX_FEE)) + " BTC\n\n" +
+                        "Are you sure you withdraw that amount?")
+                        .onAction(() -> {
+                            doWithdraw(amount, callback);
+                        })
+                        .show();
             }
         }
         else {
-            Popups.openErrorPopup("Insufficient amount",
-                    "The amount to transfer is lower the the transaction fee and the min. possible tx value.");
+            new Popup().error("The amount to transfer is lower the the transaction fee and the min. possible tx value.").show();
+        }
+    }
+
+    private void doWithdraw(Coin amount, FutureCallback<Transaction> callback) {
+        if (walletService.getWallet().isEncrypted())
+            walletPasswordPopup.show().onAesKey(aesKey -> sendFunds(amount, aesKey, callback));
+        else
+            sendFunds(amount, null, callback);
+        fillList();
+    }
+
+    private void sendFunds(Coin amount, KeyParameter aesKey, FutureCallback<Transaction> callback) {
+        try {
+            walletService.sendFunds(withdrawFromTextField.getText(), withdrawToTextField.getText(), amount, aesKey, callback);
+        } catch (AddressFormatException e) {
+            new Popup().error("The address is not correct. Please check the address format.").show();
+        } catch (InsufficientMoneyException e) {
+            log.warn(e.getMessage());
+            new Popup().error("You don't have enough fund in your wallet.").show();
         }
 
         withdrawFromTextField.setText("");
         withdrawFromTextField.setPromptText("Select a source address from the table");
         amountTextField.setText("");
         amountTextField.setPromptText("");
-        withdrawToTextField.setText("");
+        if (!BitsquareApp.DEV_MODE)
+            withdrawToTextField.setText("");
         withdrawToTextField.setPromptText("");
     }
 
     private void fillList() {
         addressList.clear();
+
         List<AddressEntry> addressEntryList = walletService.getAddressEntryList();
 
-        List<String> reservedTrades = Stream.concat(openOfferManager.getOpenOffers().stream(), tradeManager.getPendingTrades().stream())
+        List<String> reservedTrades = Stream.concat(openOfferManager.getOpenOffers().stream(), tradeManager.getTrades().stream())
                 .map(tradable -> tradable.getOffer().getId())
                 .collect(Collectors.toList());
 
@@ -237,13 +277,11 @@ public class WithdrawalView extends ActivatableViewAndModel {
 
                         if (item != null && !empty) {
                             hyperlink = new Hyperlink(item.getLabel());
-                            hyperlink.setId("id-link");
                             if (item.getAddressEntry().getOfferId() != null) {
-                                Tooltip tooltip = new Tooltip(item.getAddressEntry().getOfferId());
+                                Tooltip tooltip = new Tooltip(item.getAddressEntry().getShortOfferId());
                                 Tooltip.install(hyperlink, tooltip);
 
-                                hyperlink.setOnAction(event -> log.info("Show trade details " + item.getAddressEntry
-                                        ().getOfferId()));
+                                hyperlink.setOnAction(event -> openDetails(item));
                             }
                             setGraphic(hyperlink);
                         }
@@ -257,6 +295,36 @@ public class WithdrawalView extends ActivatableViewAndModel {
         });
     }
 
+    private void setAddressColumnCellFactory() {
+        addressColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
+        addressColumn.setCellFactory(
+                new Callback<TableColumn<WithdrawalListItem, WithdrawalListItem>, TableCell<WithdrawalListItem,
+                        WithdrawalListItem>>() {
+
+                    @Override
+                    public TableCell<WithdrawalListItem, WithdrawalListItem> call(TableColumn<WithdrawalListItem,
+                            WithdrawalListItem> column) {
+                        return new TableCell<WithdrawalListItem, WithdrawalListItem>() {
+                            private Hyperlink hyperlink;
+
+                            @Override
+                            public void updateItem(final WithdrawalListItem item, boolean empty) {
+                                super.updateItem(item, empty);
+
+                                if (item != null && !empty) {
+                                    hyperlink = new Hyperlink(item.getAddressString());
+                                    hyperlink.setOnAction(event -> openTxDetails(item));
+                                    setGraphic(hyperlink);
+                                } else {
+                                    setGraphic(null);
+                                    setId(null);
+                                }
+                            }
+                        };
+                    }
+                });
+    }
+
     private void setBalanceColumnCellFactory() {
         balanceColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
         balanceColumn.setCellFactory(
@@ -277,43 +345,6 @@ public class WithdrawalView extends ActivatableViewAndModel {
                 });
     }
 
-    private void setCopyColumnCellFactory() {
-        copyColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
-        copyColumn.setCellFactory(
-                new Callback<TableColumn<WithdrawalListItem, WithdrawalListItem>, TableCell<WithdrawalListItem,
-                        WithdrawalListItem>>() {
-
-                    @Override
-                    public TableCell<WithdrawalListItem, WithdrawalListItem> call(TableColumn<WithdrawalListItem,
-                            WithdrawalListItem> column) {
-                        return new TableCell<WithdrawalListItem, WithdrawalListItem>() {
-                            final Label copyIcon = new Label();
-
-                            {
-                                copyIcon.getStyleClass().add("copy-icon");
-                                AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY);
-                                Tooltip.install(copyIcon, new Tooltip("Copy address to clipboard"));
-                            }
-
-                            @Override
-                            public void updateItem(final WithdrawalListItem item, boolean empty) {
-                                super.updateItem(item, empty);
-
-                                if (item != null && !empty) {
-                                    setGraphic(copyIcon);
-                                    copyIcon.setOnMouseClicked(e -> GUIUtil.copyToClipboard(item
-                                            .addressStringProperty().get()));
-
-                                }
-                                else {
-                                    setGraphic(null);
-                                }
-                            }
-                        };
-                    }
-                });
-    }
-
     private void setConfidenceColumnCellFactory() {
         confidenceColumn.setCellValueFactory((addressListItem) ->
                 new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
@@ -342,6 +373,20 @@ public class WithdrawalView extends ActivatableViewAndModel {
                 });
     }
 
+    private void openDetails(WithdrawalListItem item) {
+        String offerId = item.getAddressEntry().getOfferId();
+        Optional<Tradable> tradableOptional = closedTradableManager.getTradableById(offerId);
+        if (tradableOptional.isPresent()) {
+            Tradable tradable = tradableOptional.get();
+            if (tradable instanceof Trade) {
+                tradeDetailsPopup.show((Trade) tradable);
+            } else if (tradable instanceof OpenOffer) {
+                offerDetailsPopup.show(tradable.getOffer());
+            }
+        } else {
+            failedTradesManager.getTradeById(offerId).ifPresent(trade -> tradeDetailsPopup.show(trade));
+        }
+    }
 }
 
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/help/Help.java b/gui/src/main/java/io/bitsquare/gui/main/help/Help.java
index b5f9d904d9..7727592dfc 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/help/Help.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/help/Help.java
@@ -17,9 +17,8 @@
 
 package io.bitsquare.gui.main.help;
 
-import io.bitsquare.gui.components.Popups;
-import io.bitsquare.util.Utilities;
-
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.gui.popups.Popup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,8 +36,8 @@ public class Help {
             Utilities.openWebPage("https://github.com/bitsquare/bitsquare/wiki/User-Guide");
         } catch (Exception e) {
             log.error(e.getMessage());
-            Popups.openWarningPopup("Warning", "Opening browser failed. Please check your internet " +
-                    "connection.");
+            new Popup().warning("Opening browser failed. Please check your internet " +
+                    "connection.").show();
         }
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml b/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
deleted file mode 100644
index 692da362df..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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.*?>
-<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">
-    <Tab text="Overview" closable="false">
-        <VBox spacing="20">
-            <padding>
-                <Insets left="20" top="20" right="20"/>
-            </padding>
-            <Label text="Overview not implemented yet. It will contain latest activities, market and price information and notifications."/>
-        </VBox>
-    </Tab>
-</TabPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java
deleted file mode 100644
index 70cdcbcfad..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.home;
-
-import io.bitsquare.gui.common.view.AbstractView;
-import io.bitsquare.gui.common.view.FxmlView;
-
-// home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home,
-// probably overview, event history, news, charts,... -> low prio
-@FxmlView
-public class HomeView extends AbstractView {
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml b/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
deleted file mode 100644
index 493a586df2..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.*?>
-<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">
-
-    <Tab text="Message" closable="false">
-        <VBox spacing="20">
-            <padding>
-                <Insets left="20" top="20" right="20"/>
-            </padding>
-            <Label text="Messages not implemented yet. It will contain communication tools with arbitrators, mailbox for trade messages if client was offline and notifications."/>
-        </VBox>
-    </Tab>
-</TabPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
deleted file mode 100644
index 2f5f34457f..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.msg;
-
-import io.bitsquare.gui.common.view.AbstractView;
-import io.bitsquare.gui.common.view.FxmlView;
-
-// will be probably only used for arbitration communication, will be renamed and the icon changed
-@FxmlView
-public class MsgView extends AbstractView {
-}
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
index 019dd2af25..8516c1a071 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
@@ -17,6 +17,7 @@
 
 package io.bitsquare.gui.main.offer;
 
+import io.bitsquare.common.UserThread;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.common.view.ActivatableView;
 import io.bitsquare.gui.common.view.View;
@@ -26,18 +27,16 @@ import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.offer.createoffer.CreateOfferView;
 import io.bitsquare.gui.main.offer.offerbook.OfferBookView;
 import io.bitsquare.gui.main.offer.takeoffer.TakeOfferView;
+import io.bitsquare.locale.CurrencyUtil;
+import io.bitsquare.locale.TradeCurrency;
 import io.bitsquare.trade.offer.Offer;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.utils.Fiat;
+import javafx.collections.ListChangeListener;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.layout.AnchorPane;
 
 import java.util.List;
 
-import javafx.application.Platform;
-import javafx.collections.ListChangeListener;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
 public abstract class OfferView extends ActivatableView<TabPane, Void> {
 
     private OfferBookView offerBookView;
@@ -46,8 +45,6 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
     private AnchorPane createOfferPane;
     private AnchorPane takeOfferPane;
     private Navigation.Listener listener;
-    private Coin amount;
-    private Fiat price;
     private Offer offer;
 
     private final ViewLoader viewLoader;
@@ -55,6 +52,7 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
     private final Offer.Direction direction;
     private Tab createOfferTab;
     private Tab takeOfferTab;
+    private TradeCurrency tradeCurrency;
 
     protected OfferView(ViewLoader viewLoader, Navigation navigation) {
         this.viewLoader = viewLoader;
@@ -73,11 +71,11 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
     @Override
     protected void activate() {
         // We need to remove open validation error popups
-        // Platform.runLater needed as focus-out event is called after selectedIndexProperty changed
+        // UserThread.execute needed as focus-out event is called after selectedIndexProperty changed
         // TODO Find a way to do that in the InputTextField directly, but a tab change does not trigger any event...
         TabPane tabPane = root;
         tabPane.getSelectionModel().selectedIndexProperty()
-                .addListener((observableValue, oldValue, newValue) -> Platform.runLater(InputTextField::hideErrorMessageDisplay));
+                .addListener((observableValue, oldValue, newValue) -> UserThread.execute(InputTextField::hideErrorMessageDisplay));
 
         // We want to get informed when a tab get closed
         tabPane.getTabs().addListener((ListChangeListener<Tab>) change -> {
@@ -91,6 +89,8 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
             }
         });
 
+        tradeCurrency = CurrencyUtil.getDefaultFiatCurrency();
+
         navigation.addListener(listener);
         navigation.navigateTo(MainView.class, this.getClass(), OfferBookView.class);
     }
@@ -100,15 +100,11 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
         navigation.removeListener(listener);
     }
 
-    public void createOffer(Coin amount, Fiat price) {
-        this.amount = amount;
-        this.price = price;
+    public void createOffer() {
         navigation.navigateTo(MainView.class, this.getClass(), CreateOfferView.class);
     }
 
-    public void takeOffer(Coin amount, Fiat price, Offer offer) {
-        this.amount = amount;
-        this.price = price;
+    public void takeOffer(Offer offer) {
         this.offer = offer;
         navigation.navigateTo(MainView.class, this.getClass(), TakeOfferView.class);
     }
@@ -128,17 +124,14 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
 
             OfferActionHandler offerActionHandler = new OfferActionHandler() {
                 @Override
-                public void createOffer(Coin amount, Fiat price) {
-                    OfferView.this.amount = amount;
-                    OfferView.this.price = price;
+                public void onCreateOffer(TradeCurrency tradeCurrency) {
+                    OfferView.this.tradeCurrency = tradeCurrency;
                     OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(),
                             CreateOfferView.class);
                 }
 
                 @Override
-                public void takeOffer(Coin amount, Fiat price, Offer offer) {
-                    OfferView.this.amount = amount;
-                    OfferView.this.price = price;
+                public void onTakeOffer(Offer offer) {
                     OfferView.this.offer = offer;
                     OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(),
                             TakeOfferView.class);
@@ -153,12 +146,11 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
             // CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times
             // in different graphs
             createOfferView = (CreateOfferView) view;
-            createOfferView.initWithData(direction, amount, price);
-            createOfferPane = ((CreateOfferView) view).getRoot();
+            createOfferView.initWithData(direction, tradeCurrency);
+            createOfferPane = createOfferView.getRoot();
             createOfferTab = new Tab("Create offer");
-            createOfferView.setCloseHandler(() -> {
-                tabPane.getTabs().remove(createOfferTab);
-            });
+            // close handler from close on create offer action
+            createOfferView.setCloseHandler(() -> tabPane.getTabs().remove(createOfferTab));
             createOfferTab.setContent(createOfferPane);
             tabPane.getTabs().add(createOfferTab);
             tabPane.getSelectionModel().select(createOfferTab);
@@ -168,12 +160,11 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
             // CreateOffer and TakeOffer must not be cached by ViewLoader as we cannot use a view multiple times
             // in different graphs
             takeOfferView = (TakeOfferView) view;
-            takeOfferView.initWithData(amount, offer);
+            takeOfferView.initWithData(offer);
             takeOfferPane = ((TakeOfferView) view).getRoot();
             takeOfferTab = new Tab("Take offer");
-            takeOfferView.setCloseHandler(() -> {
-                tabPane.getTabs().remove(takeOfferTab);
-            });
+            // close handler from close on take offer action
+            takeOfferView.setCloseHandler(() -> tabPane.getTabs().remove(takeOfferTab));
             takeOfferTab.setContent(takeOfferPane);
             tabPane.getTabs().add(takeOfferTab);
             tabPane.getSelectionModel().select(takeOfferTab);
@@ -182,7 +173,10 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
 
 
     private void onCreateOfferViewRemoved() {
-        createOfferView = null;
+        if (createOfferView != null) {
+            createOfferView.onClose();
+            createOfferView = null;
+        }
         offerBookView.enableCreateOfferButton();
 
         // update the navigation state
@@ -190,16 +184,19 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
     }
 
     private void onTakeOfferViewRemoved() {
-        takeOfferView = null;
+        if (takeOfferView != null) {
+            takeOfferView.onClose();
+            takeOfferView = null;
+        }
 
         // update the navigation state
         navigation.navigateTo(MainView.class, this.getClass(), OfferBookView.class);
     }
 
     public interface OfferActionHandler {
-        void createOffer(Coin amount, Fiat price);
+        void onCreateOffer(TradeCurrency tradeCurrency);
 
-        void takeOffer(Coin amount, Fiat price, Offer offer);
+        void onTakeOffer(Offer offer);
     }
 
     public interface CloseHandler {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
index e13d6e7511..7ff5591ae5 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
@@ -17,79 +17,70 @@
 
 package io.bitsquare.gui.main.offer.createoffer;
 
+import com.google.inject.Inject;
 import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
+import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.gui.common.model.ActivatableDataModel;
+import io.bitsquare.gui.popups.WalletPasswordPopup;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.Country;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.payment.PaymentAccount;
+import io.bitsquare.payment.SepaAccount;
+import io.bitsquare.trade.handlers.TransactionResultHandler;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.offer.OpenOfferManager;
-import io.bitsquare.user.AccountSettings;
 import io.bitsquare.user.Preferences;
 import io.bitsquare.user.User;
-
+import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.SetChangeListener;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
 import org.bitcoinj.utils.Fiat;
-
-import com.google.inject.Inject;
-
-import java.util.UUID;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
 import org.jetbrains.annotations.NotNull;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * Domain for that UI element.
  * Note that the create offer domain has a deeper scope in the application domain (TradeManager).
  * That model is just responsible for the domain specific parts displayed needed in that UI element.
  */
-class CreateOfferDataModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(CreateOfferDataModel.class);
-
-
+class CreateOfferDataModel extends ActivatableDataModel {
     private final OpenOfferManager openOfferManager;
     private final WalletService walletService;
-    private final AccountSettings accountSettings;
+    private final TradeWalletService tradeWalletService;
     private final Preferences preferences;
     private final User user;
+    private final Address address;
+    private final KeyRing keyRing;
+    private final WalletPasswordPopup walletPasswordPopup;
     private final BSFormatter formatter;
     private final String offerId;
     private final AddressEntry addressEntry;
-    final ObjectProperty<Coin> offerFeeAsCoin = new SimpleObjectProperty<>();
-    final ObjectProperty<Coin> networkFeeAsCoin = new SimpleObjectProperty<>();
-    final ObjectProperty<Coin> securityDepositAsCoin = new SimpleObjectProperty<>();
+    private final Coin offerFeeAsCoin;
+    private final Coin networkFeeAsCoin;
+    private final Coin securityDepositAsCoin;
     private final BalanceListener balanceListener;
-    private final ChangeListener<FiatAccount> currentFiatAccountListener;
+    private final SetChangeListener<PaymentAccount> paymentAccountsChangeListener;
 
     private Offer.Direction direction;
 
-    final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty();
-    final StringProperty transactionId = new SimpleStringProperty();
-    final StringProperty bankAccountCurrency = new SimpleStringProperty();
-    final StringProperty bankAccountCounty = new SimpleStringProperty();
-    final StringProperty bankAccountType = new SimpleStringProperty();
-    final StringProperty fiatCode = new SimpleStringProperty();
+    private TradeCurrency tradeCurrency;
+
+    final StringProperty tradeCurrencyCode = new SimpleStringProperty();
     final StringProperty btcCode = new SimpleStringProperty();
 
-    final BooleanProperty requestPlaceOfferSuccess = new SimpleBooleanProperty();
     final BooleanProperty isWalletFunded = new SimpleBooleanProperty();
     final BooleanProperty useMBTC = new SimpleBooleanProperty();
 
@@ -99,9 +90,9 @@ class CreateOfferDataModel implements Activatable, DataModel {
     final ObjectProperty<Fiat> volumeAsFiat = new SimpleObjectProperty<>();
     final ObjectProperty<Coin> totalToPayAsCoin = new SimpleObjectProperty<>();
 
-    final ObservableList<Country> acceptedCountries = FXCollections.observableArrayList();
-    final ObservableList<String> acceptedLanguageCodes = FXCollections.observableArrayList();
-    final ObservableList<Arbitrator> acceptedArbitrators = FXCollections.observableArrayList();
+    final ObservableList<PaymentAccount> paymentAccounts = FXCollections.observableArrayList();
+
+    private PaymentAccount paymentAccount;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -110,23 +101,24 @@ class CreateOfferDataModel implements Activatable, DataModel {
 
 
     @Inject
-    CreateOfferDataModel(OpenOfferManager openOfferManager, WalletService walletService,
-                         AccountSettings accountSettings, Preferences preferences, User user, BSFormatter formatter) {
+    CreateOfferDataModel(OpenOfferManager openOfferManager, WalletService walletService, TradeWalletService tradeWalletService,
+                         Preferences preferences, User user, KeyRing keyRing, P2PService p2PService,
+                         WalletPasswordPopup walletPasswordPopup, BSFormatter formatter) {
         this.openOfferManager = openOfferManager;
         this.walletService = walletService;
-        this.accountSettings = accountSettings;
+        this.tradeWalletService = tradeWalletService;
         this.preferences = preferences;
         this.user = user;
+        this.keyRing = keyRing;
+        this.walletPasswordPopup = walletPasswordPopup;
         this.formatter = formatter;
-        this.offerId = UUID.randomUUID().toString();
 
-        addressEntry = walletService.getAddressEntry(offerId);
-
-        offerFeeAsCoin.set(FeePolicy.CREATE_OFFER_FEE);
-        networkFeeAsCoin.set(FeePolicy.TX_FEE);
-
-        // we need to set it here already as it is used before activate
-        securityDepositAsCoin.set(accountSettings.getSecurityDeposit());
+        address = p2PService.getAddress();
+        offerId = UUID.randomUUID().toString();
+        addressEntry = walletService.getAddressEntryByOfferId(offerId);
+        offerFeeAsCoin = FeePolicy.CREATE_OFFER_FEE;
+        networkFeeAsCoin = FeePolicy.TX_FEE;
+        securityDepositAsCoin = FeePolicy.SECURITY_DEPOSIT;
 
         balanceListener = new BalanceListener(getAddressEntry().getAddress()) {
             @Override
@@ -135,32 +127,24 @@ class CreateOfferDataModel implements Activatable, DataModel {
             }
         };
 
-        currentFiatAccountListener = (observable, oldValue, newValue) -> {
-            applyBankAccount(newValue);
-        };
+        paymentAccountsChangeListener = change -> paymentAccounts.setAll(user.getPaymentAccounts());
     }
 
+
     @Override
-    public void activate() {
+    protected void activate() {
         addBindings();
         addListeners();
 
-        // might be changed after screen change
-        if (accountSettings != null) {
-            // set it here again to cover the case of an securityDeposit change after a screen change
-            securityDepositAsCoin.set(accountSettings.getSecurityDeposit());
-
-            acceptedCountries.setAll(accountSettings.getAcceptedCountries());
-            acceptedLanguageCodes.setAll(accountSettings.getAcceptedLanguageLocaleCodes());
-            acceptedArbitrators.setAll(accountSettings.getAcceptedArbitrators());
-        }
-
+        paymentAccounts.setAll(user.getPaymentAccounts());
         updateBalance(walletService.getBalanceForAddress(getAddressEntry().getAddress()));
-        applyBankAccount(user.currentFiatAccountProperty().get());
+
+        if (direction == Offer.Direction.BUY)
+            calculateTotalToPay();
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         removeBindings();
         removeListeners();
     }
@@ -175,13 +159,12 @@ class CreateOfferDataModel implements Activatable, DataModel {
 
     private void addListeners() {
         walletService.addBalanceListener(balanceListener);
-        user.currentFiatAccountProperty().addListener(currentFiatAccountListener);
-
+        user.getPaymentAccountsAsObservable().addListener(paymentAccountsChangeListener);
     }
 
     private void removeListeners() {
         walletService.removeBalanceListener(balanceListener);
-        user.currentFiatAccountProperty().removeListener(currentFiatAccountListener);
+        user.getPaymentAccountsAsObservable().removeListener(paymentAccountsChangeListener);
     }
 
 
@@ -189,8 +172,14 @@ class CreateOfferDataModel implements Activatable, DataModel {
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    void initWithData(Offer.Direction direction) {
+    void initWithData(Offer.Direction direction, TradeCurrency tradeCurrency) {
         this.direction = direction;
+        this.tradeCurrency = tradeCurrency;
+
+        tradeCurrencyCode.set(tradeCurrency.getCode());
+        PaymentAccount account = user.findFirstPaymentAccountWithCurrency(tradeCurrency);
+        if (account != null)
+            paymentAccount = account;
     }
 
 
@@ -198,18 +187,47 @@ class CreateOfferDataModel implements Activatable, DataModel {
     // UI actions
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    void onPlaceOffer() {
-        // data validation is done in the trade domain
-        openOfferManager.onPlaceOffer(offerId,
+    Offer getOffer() {
+        long fiatPrice = priceAsFiat.get() != null ? priceAsFiat.get().getValue() : 0L;
+        long amount = amountAsCoin.get() != null ? amountAsCoin.get().getValue() : 0L;
+        long minAmount = minAmountAsCoin.get() != null ? minAmountAsCoin.get().getValue() : 0L;
+
+        List<String> acceptedCountryCodes = null;
+        if (paymentAccount instanceof SepaAccount)
+            acceptedCountryCodes = ((SepaAccount) paymentAccount).getAcceptedCountryCodes();
+
+        // That is optional and set to null if not supported (AltCoins, OKPay,...)
+        Country country = paymentAccount.getCountry();
+
+        return new Offer(offerId,
+                address,
+                keyRing.getPubKeyRing(),
                 direction,
-                priceAsFiat.get(),
-                amountAsCoin.get(),
-                minAmountAsCoin.get(),
-                (transaction) -> {
-                    transactionId.set(transaction.getHashAsString());
-                    requestPlaceOfferSuccess.set(true);
-                },
-                requestPlaceOfferErrorMessage::set
+                fiatPrice,
+                amount,
+                minAmount,
+                paymentAccount.getPaymentMethod().getId(),
+                tradeCurrencyCode.get(),
+                country,
+                paymentAccount.getId(),
+                user.getAcceptedArbitratorAddresses(),
+                acceptedCountryCodes);
+    }
+
+    void onPlaceOffer(Offer offer, TransactionResultHandler resultHandler) {
+        if (walletService.getWallet().isEncrypted() && tradeWalletService.getAesKey() == null) {
+            walletPasswordPopup.show().onAesKey(aesKey -> {
+                tradeWalletService.setAesKey(aesKey);
+                doPlaceOffer(offer, resultHandler);
+            });
+        } else {
+            doPlaceOffer(offer, resultHandler);
+        }
+    }
+
+    private void doPlaceOffer(Offer offer, TransactionResultHandler resultHandler) {
+        openOfferManager.onPlaceOffer(offer,
+                resultHandler
         );
     }
 
@@ -218,6 +236,21 @@ class CreateOfferDataModel implements Activatable, DataModel {
     }
 
 
+    public void onPaymentAccountSelected(PaymentAccount paymentAccount) {
+        if (paymentAccount != null)
+            this.paymentAccount = paymentAccount;
+    }
+
+    public void onCurrencySelected(TradeCurrency tradeCurrency) {
+        if (tradeCurrency != null) {
+            this.tradeCurrency = tradeCurrency;
+            tradeCurrencyCode.set(tradeCurrency.getCode());
+
+            paymentAccount.setSelectedTradeCurrency(tradeCurrency);
+        }
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -234,10 +267,6 @@ class CreateOfferDataModel implements Activatable, DataModel {
         return direction;
     }
 
-    WalletService getWalletService() {
-        return walletService;
-    }
-
     String getOfferId() {
         return offerId;
     }
@@ -250,6 +279,17 @@ class CreateOfferDataModel implements Activatable, DataModel {
         return preferences.getDisplaySecurityDepositInfo();
     }
 
+    public TradeCurrency getTradeCurrency() {
+        return tradeCurrency;
+    }
+
+    public PaymentAccount getPaymentAccount() {
+        return paymentAccount;
+    }
+
+    boolean hasAcceptedArbitrators() {
+        return user.getAcceptedArbitrators().size() > 0;
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Utils
@@ -277,11 +317,11 @@ class CreateOfferDataModel implements Activatable, DataModel {
     }
 
     void calculateTotalToPay() {
-        if (securityDepositAsCoin.get() != null) {
+        if (securityDepositAsCoin != null) {
             if (direction == Offer.Direction.BUY)
-                totalToPayAsCoin.set(offerFeeAsCoin.get().add(networkFeeAsCoin.get()).add(securityDepositAsCoin.get()));
+                totalToPayAsCoin.set(offerFeeAsCoin.add(networkFeeAsCoin).add(securityDepositAsCoin));
             else
-                totalToPayAsCoin.set(offerFeeAsCoin.get().add(networkFeeAsCoin.get()).add(securityDepositAsCoin.get()).add(amountAsCoin.get()));
+                totalToPayAsCoin.set(offerFeeAsCoin.add(networkFeeAsCoin).add(securityDepositAsCoin).add(amountAsCoin.get()));
         }
     }
 
@@ -289,13 +329,27 @@ class CreateOfferDataModel implements Activatable, DataModel {
         isWalletFunded.set(totalToPayAsCoin.get() != null && balance.compareTo(totalToPayAsCoin.get()) >= 0);
     }
 
-    private void applyBankAccount(FiatAccount fiatAccount) {
-        if (fiatAccount != null) {
-            bankAccountType.set(fiatAccount.type.toString());
-            bankAccountCurrency.set(fiatAccount.currencyCode);
-            bankAccountCounty.set(fiatAccount.country.name);
+    public Coin getOfferFeeAsCoin() {
+        return offerFeeAsCoin;
+    }
 
-            fiatCode.set(fiatAccount.currencyCode);
-        }
+    public Coin getNetworkFeeAsCoin() {
+        return networkFeeAsCoin;
+    }
+
+    public Coin getSecurityDepositAsCoin() {
+        return securityDepositAsCoin;
+    }
+
+    public List<Arbitrator> getArbitrators() {
+        return user.getAcceptedArbitrators();
+    }
+
+    public void setShowPlaceOfferConfirmation(boolean selected) {
+        preferences.setShowPlaceOfferConfirmation(selected);
+    }
+
+    public boolean getShowPlaceOfferConfirmation() {
+        return preferences.getShowPlaceOfferConfirmation();
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml
index 198f95093e..60c1951435 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml
@@ -17,267 +17,7 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.AddressTextField?>
-<?import io.bitsquare.gui.components.BalanceTextField?>
-<?import io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.InputTextField?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?import javafx.scene.layout.AnchorPane?>
 <AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.offer.createoffer.CreateOfferView"
             xmlns:fx="http://javafx.com/fxml">
-
-    <ScrollPane fx:id="scrollPane" onScroll="#onScroll" hbarPolicy="NEVER" vbarPolicy="NEVER" fitToWidth="true" fitToHeight="true"
-                AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
-                AnchorPane.bottomAnchor="0.0">
-
-        <!--suppress JavaFxUnresolvedFxIdReference -->
-        <GridPane fx:id="gridPane" hgap="5.0" vgap="5.0">
-            <padding>
-                <Insets bottom="-10.0" left="25.0" top="30.0" right="25"/>
-            </padding>
-
-            <!--
-            Amount/Price group
-             -->
-            <TitledGroupBg fx:id="priceAmountPane" text="%createOffer.amountPriceBox.title"
-                           GridPane.rowSpan="3" GridPane.columnSpan="3"/>
-
-            <VBox alignment="CENTER" spacing="6" GridPane.rowSpan="2">
-                <GridPane.margin>
-                    <Insets bottom="10.0" left="10.0" right="10.0" top="20.0"/>
-                </GridPane.margin>
-                <ImageView fx:id="imageView" pickOnBounds="true"/>
-                <Label fx:id="buyLabel" id="direction-icon-label"
-                       alignment="CENTER">
-                    <padding>
-                        <Insets top="-5.0"/>
-                    </padding>
-                </Label>
-            </VBox>
-
-            <HBox GridPane.columnIndex="1" alignment="CENTER_LEFT" spacing="5">
-                <GridPane.margin>
-                    <Insets right="10.0" top="20.0"/>
-                </GridPane.margin>
-                <VBox spacing="4">
-                    <Label fx:id="amountToTradeLabel" id="input-description-label" text="%createOffer.amountPriceBox.amountDescription"
-                           prefWidth="170"/>
-                    <HBox>
-                        <InputTextField fx:id="amountTextField" id="text-input-with-currency-text-field"
-                                        promptText="%createOffer.amount.prompt" prefWidth="170"
-                                        alignment="CENTER_RIGHT"/>
-                        <Label fx:id="amountBtcLabel" id="currency-info-label"/>
-                    </HBox>
-                </VBox>
-                <Label text="x">
-                    <font>
-                        <Font name="Helvetica-Bold" size="20.0"/>
-                    </font>
-                    <padding>
-                        <Insets top="14.0" left="3" right="3"/>
-                    </padding>
-                </Label>
-
-                <VBox spacing="4">
-                    <Label fx:id="priceDescriptionLabel" id="input-description-label" prefWidth="170"/>
-                    <HBox>
-                        <InputTextField fx:id="priceTextField" id="text-input-with-currency-text-field"
-                                        promptText="%createOffer.price.prompt" prefWidth="170"
-                                        alignment="CENTER_RIGHT"/>
-                        <Label fx:id="priceFiatLabel" id="currency-info-label" alignment="CENTER"/>
-                    </HBox>
-                </VBox>
-
-                <Label text="=">
-                    <font>
-                        <Font name="Helvetica-Bold" size="20.0"/>
-                    </font>
-                    <padding>
-                        <Insets top="14.0" left="2" right="2"/>
-                    </padding>
-                </Label>
-
-                <VBox spacing="4">
-                    <Label fx:id="volumeDescriptionLabel" id="input-description-label" prefWidth="170"/>
-                    <HBox>
-                        <InputTextField fx:id="volumeTextField" id="text-input-with-currency-text-field"
-                                        prefWidth="170" alignment="CENTER_RIGHT"/>
-                        <Label fx:id="volumeFiatLabel" id="currency-info-label"/>
-                    </HBox>
-                </VBox>
-            </HBox>
-
-            <VBox GridPane.columnIndex="1" GridPane.rowIndex="1" spacing="4">
-                <GridPane.margin>
-                    <Insets right="10.0" top="5.0" bottom="5.0"/>
-                </GridPane.margin>
-                <Label id="input-description-label" text="%createOffer.amountPriceBox.minAmountDescription"
-                       prefWidth="170.0"/>
-                <HBox>
-                    <InputTextField fx:id="minAmountTextField" id="text-input-with-currency-text-field"
-                                    promptText="%createOffer.minAmount.prompt" alignment="CENTER_RIGHT"
-                                    prefWidth="170.0"/>
-                    <Label fx:id="minAmountBtcLabel" id="currency-info-label"/>
-                </HBox>
-            </VBox>
-
-            <InfoDisplay fx:id="amountPriceBoxInfo" gridPane="$gridPane" onAction="#onOpenGeneralHelp" rowIndex="2"/>
-
-            <Button fx:id="showPaymentInfoScreenButton" text="%createOffer.amountPriceBox.next" id="show-details-button"
-                    GridPane.columnIndex="1" GridPane.rowIndex="3" defaultButton="true"
-                    onAction="#onShowPayFundsScreen">
-                <GridPane.margin>
-                    <Insets top="15.0"/>
-                </GridPane.margin>
-            </Button>
-
-            <!--
-            Pay funds group
-            -->
-            <TitledGroupBg fx:id="payFundsPane" text="%createOffer.fundsBox.title" GridPane.rowIndex="4"
-                           GridPane.rowSpan="4" GridPane.columnSpan="3" visible="false"/>
-
-            <HBox GridPane.rowIndex="4" spacing="4" alignment="CENTER_RIGHT">
-                <Label fx:id="totalToPayLabel" text="%createOffer.fundsBox.totalsNeeded" visible="false"/>
-                <Label fx:id="totalToPayInfoIconLabel" visible="false"/>
-                <GridPane.margin>
-                    <Insets top="10.0"/>
-                </GridPane.margin>
-            </HBox>
-            <TextField fx:id="totalToPayTextField" promptText="%createOffer.fundsBox.totalsNeeded.prompt"
-                       GridPane.columnIndex="1" GridPane.rowIndex="4"
-                       editable="false" focusTraversable="false" visible="false">
-                <GridPane.margin>
-                    <Insets top="10.0"/>
-                </GridPane.margin>
-            </TextField>
-
-            <Label fx:id="addressLabel" text="%createOffer.fundsBox.address" GridPane.rowIndex="5" visible="false"/>
-            <AddressTextField fx:id="addressTextField" GridPane.columnIndex="1" GridPane.rowIndex="5"
-                              focusTraversable="true" visible="false"/>
-
-            <Label fx:id="balanceLabel" text="%createOffer.fundsBox.balance" GridPane.rowIndex="6" visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </Label>
-            <BalanceTextField fx:id="balanceTextField" GridPane.columnIndex="1" GridPane.rowIndex="6"
-                              focusTraversable="false" visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </BalanceTextField>
-
-            <InfoDisplay fx:id="fundsBoxInfoDisplay" gridPane="$gridPane" onAction="#onOpenFundingHelp" rowIndex="7"
-                         text="%createOffer.fundsBox.info" visible="false"/>
-
-            <HBox spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="8">
-                <Button fx:id="showAdvancedSettingsButton" text="%createOffer.fundsBox.showAdvanced"
-                        onAction="#onToggleShowAdvancedSettings" visible="false"/>
-                <Button fx:id="placeOfferButton" text="%createOffer.fundsBox.placeOffer" visible="false"
-                        defaultButton="true"
-                        onAction="#onPlaceOffer"/>
-                <ProgressIndicator fx:id="placeOfferSpinner" progress="0" visible="false" prefHeight="24"
-                                   prefWidth="24"/>
-                <Label fx:id="placeOfferSpinnerInfoLabel" text="%createOffer.fundsBox.placeOfferSpinnerInfo"
-                       visible="false">
-                    <padding>
-                        <Insets top="5.0"/>
-                    </padding>
-                </Label>
-                <GridPane.margin>
-                    <Insets bottom="30" top="15.0"/>
-                </GridPane.margin>
-            </HBox>
-
-            <!--
-            Advanced settings group
-            -->
-            <TitledGroupBg fx:id="showDetailsPane" text="%createOffer.advancedBox.title" GridPane.columnSpan="3"
-                           GridPane.rowIndex="9" GridPane.rowSpan="7" visible="false"/>
-
-            <HBox GridPane.rowIndex="9" spacing="4" alignment="CENTER_RIGHT">
-                <Label fx:id="acceptedCountriesLabel" text="%createOffer.advancedBox.countries" visible="false"/>
-                <Label fx:id="acceptedCountriesLabelIcon" visible="false"/>
-                <GridPane.margin>
-                    <Insets top="0.0"/>
-                </GridPane.margin>
-            </HBox>
-            <TextField fx:id="acceptedCountriesTextField" GridPane.columnIndex="1" GridPane.rowIndex="9"
-                       visible="false"
-                       mouseTransparent="true" editable="false" focusTraversable="false"/>
-
-            <HBox GridPane.rowIndex="10" spacing="4" alignment="CENTER_RIGHT">
-                <Label fx:id="acceptedLanguagesLabel" text="%createOffer.advancedBox.languages" visible="false"/>
-                <Label fx:id="acceptedLanguagesLabelIcon" visible="false"/>
-            </HBox>
-            <TextField fx:id="acceptedLanguagesTextField" GridPane.columnIndex="1" GridPane.rowIndex="10"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false"/>
-
-            <HBox GridPane.rowIndex="11" spacing="4" alignment="CENTER_RIGHT">
-                <Label fx:id="acceptedArbitratorsLabel" text="%createOffer.advancedBox.arbitrators" visible="false"/>
-                <Label fx:id="acceptedArbitratorsLabelIcon" visible="false"/>
-            </HBox>
-            <TextField fx:id="acceptedArbitratorsTextField" GridPane.columnIndex="1" GridPane.rowIndex="11"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false"/>
-
-            <Label fx:id="bankAccountTypeLabel" text="%createOffer.advancedBox.txType" GridPane.rowIndex="12"
-                   visible="false"/>
-            <TextField fx:id="bankAccountTypeTextField" GridPane.columnIndex="1" GridPane.rowIndex="12"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false"/>
-
-            <Label fx:id="bankAccountCurrencyLabel" text="%createOffer.advancedBox.currency" GridPane.rowIndex="13"
-                   visible="false"/>
-            <TextField fx:id="bankAccountCurrencyTextField" GridPane.rowIndex="13" GridPane.columnIndex="1"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false"/>
-
-            <Label fx:id="bankAccountCountyLabel" text="%createOffer.advancedBox.county" GridPane.rowIndex="14"
-                   visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </Label>
-            <TextField fx:id="bankAccountCountyTextField" GridPane.rowIndex="14" GridPane.columnIndex="1"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </TextField>
-
-            <InfoDisplay fx:id="advancedInfoDisplay" gridPane="$gridPane" onAction="#onOpenAdvancedSettingsHelp"
-                         rowIndex="15" visible="false"
-                         text="%createOffer.advancedBox.info">
-            </InfoDisplay>
-
-            <columnConstraints>
-                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
-                <ColumnConstraints hgrow="ALWAYS"/>
-            </columnConstraints>
-
-            <rowConstraints>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints minHeight="35"/>
-            </rowConstraints>
-
-        </GridPane>
-    </ScrollPane>
 </AnchorPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
index afe0d0ecaa..fbf3327785 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
@@ -17,92 +17,76 @@
 
 package io.bitsquare.gui.main.offer.createoffer;
 
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.app.BitsquareApp;
+import io.bitsquare.common.util.Tuple2;
+import io.bitsquare.common.util.Tuple3;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.AddressTextField;
 import io.bitsquare.gui.components.BalanceTextField;
-import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.account.AccountView;
-import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
+import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView;
 import io.bitsquare.gui.main.account.settings.AccountSettingsView;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.main.offer.OfferView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView;
-import io.bitsquare.gui.util.ImageUtil;
+import io.bitsquare.gui.popups.OfferDetailsPopup;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.util.BSFormatter;
+import io.bitsquare.gui.util.FormBuilder;
+import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.payment.PaymentAccount;
 import io.bitsquare.trade.offer.Offer;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.utils.Fiat;
-
-import java.util.ArrayList;
-import java.util.List;
+import javafx.beans.value.ChangeListener;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.*;
+import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import javafx.scene.text.Font;
+import javafx.stage.Window;
+import javafx.util.StringConverter;
+import org.controlsfx.control.PopOver;
 
 import javax.inject.Inject;
 
-import javafx.beans.value.ChangeListener;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.geometry.Point2D;
-import javafx.geometry.VPos;
-import javafx.scene.control.*;
-import javafx.scene.image.*;
-import javafx.scene.layout.*;
-import javafx.stage.Window;
-
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
-
-import org.controlsfx.control.PopOver;
-import org.controlsfx.control.action.AbstractAction;
-import org.controlsfx.control.action.Action;
-import org.controlsfx.dialog.Dialog;
-
+import static io.bitsquare.gui.util.FormBuilder.*;
 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.
 @FxmlView
 public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateOfferViewModel> {
 
     private final Navigation navigation;
+    private final BSFormatter formatter;
+    private final OfferDetailsPopup offerDetailsPopup;
 
-    @FXML ScrollPane scrollPane;
-    @FXML ImageView imageView;
-    @FXML AddressTextField addressTextField;
-    @FXML BalanceTextField balanceTextField;
-    @FXML ProgressIndicator placeOfferSpinner;
-    @FXML InfoDisplay amountPriceBoxInfo, advancedInfoDisplay, fundsBoxInfoDisplay;
-    @FXML TitledGroupBg priceAmountPane, payFundsPane, showDetailsPane;
-    @FXML Button showPaymentInfoScreenButton, showAdvancedSettingsButton, placeOfferButton;
-    @FXML InputTextField amountTextField, minAmountTextField, priceTextField, volumeTextField;
-    @FXML TextField acceptedArbitratorsTextField, totalToPayTextField, bankAccountTypeTextField,
-            bankAccountCurrencyTextField, bankAccountCountyTextField, acceptedCountriesTextField,
-            acceptedLanguagesTextField;
-    @FXML Label buyLabel, amountToTradeLabel, addressLabel, balanceLabel, totalToPayLabel, totalToPayInfoIconLabel, bankAccountTypeLabel,
-            bankAccountCurrencyLabel, bankAccountCountyLabel, acceptedCountriesLabel, acceptedCountriesLabelIcon,
-            acceptedLanguagesLabel, acceptedLanguagesLabelIcon, acceptedArbitratorsLabel,
-            acceptedArbitratorsLabelIcon, amountBtcLabel, priceFiatLabel, volumeFiatLabel, minAmountBtcLabel,
-            priceDescriptionLabel, volumeDescriptionLabel,
-            placeOfferSpinnerInfoLabel;
+    private ScrollPane scrollPane;
+    private GridPane gridPane;
+    private ImageView imageView;
+    private AddressTextField addressTextField;
+    private BalanceTextField balanceTextField;
+    private ProgressIndicator placeOfferSpinner;
+    private TitledGroupBg payFundsPane;
+    private Button showPaymentButton, placeOfferButton;
+    private InputTextField amountTextField, minAmountTextField, priceTextField, volumeTextField;
+    private TextField totalToPayTextField, currencyTextField;
+    private Label buyLabel, amountDescriptionLabel, addressLabel, balanceLabel, totalToPayLabel, totalToPayInfoIconLabel, amountBtcLabel, priceCurrencyLabel,
+            volumeCurrencyLabel, minAmountBtcLabel, priceDescriptionLabel, volumeDescriptionLabel, placeOfferSpinnerInfoLabel, currencyTextFieldLabel,
+            currencyComboBoxLabel;
+    private ComboBox<PaymentAccount> paymentAccountsComboBox;
+    private ComboBox<TradeCurrency> currencyComboBox;
 
-    private ImageView expand;
-    private ImageView collapse;
     private PopOver totalToPayInfoPopover;
-    private boolean detailsVisible;
-    private boolean advancedScreenInited;
 
     private OfferView.CloseHandler closeHandler;
 
@@ -113,9 +97,13 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
     private ChangeListener<Boolean> showWarningInvalidBtcDecimalPlacesListener;
     private ChangeListener<Boolean> showWarningInvalidFiatDecimalPlacesPlacesListener;
     private ChangeListener<Boolean> showWarningAdjustedVolumeListener;
-    private ChangeListener<String> requestPlaceOfferErrorMessageListener;
+    private ChangeListener<String> errorMessageListener;
     private ChangeListener<Boolean> isPlaceOfferSpinnerVisibleListener;
     private ChangeListener<Boolean> showTransactionPublishedScreen;
+    private EventHandler<ActionEvent> paymentAccountsComboBoxSelectionHandler;
+    private EventHandler<ActionEvent> currencyComboBoxSelectionHandler;
+
+    private int gridRow = 0;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -123,64 +111,204 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private CreateOfferView(CreateOfferViewModel model, Navigation navigation) {
+    private CreateOfferView(CreateOfferViewModel model, Navigation navigation, BSFormatter formatter, OfferDetailsPopup offerDetailsPopup) {
         super(model);
 
         this.navigation = navigation;
+        this.formatter = formatter;
+        this.offerDetailsPopup = offerDetailsPopup;
     }
 
     @Override
     protected void initialize() {
+        addScrollPane();
+        addGridPane();
+        addPaymentGroup();
+        addAmountPriceGroup();
+        addFundingGroup();
+
         createListeners();
 
-        balanceTextField.setup(model.getWalletService(), model.address.get(), model.getFormatter());
-        volumeTextField.setPromptText(BSResources.get("createOffer.volume.prompt", model.fiatCode.get()));
+        balanceTextField.setup(model.address.get(), model.getFormatter());
+        paymentAccountsComboBox.setConverter(new StringConverter<PaymentAccount>() {
+            @Override
+            public String toString(PaymentAccount paymentAccount) {
+                return paymentAccount.getAccountName() + " (" + paymentAccount.getSingleTradeCurrency().getCode() + ", " +
+                        BSResources.get(paymentAccount.getPaymentMethod().getId()) + ")";
+            }
+
+            @Override
+            public PaymentAccount fromString(String s) {
+                return null;
+            }
+        });
     }
 
     @Override
-    protected void doActivate() {
+    protected void activate() {
         addBindings();
         addListeners();
+
+        buyLabel.setText(model.getDirectionLabel());
+        amountDescriptionLabel.setText(model.getAmountDescription());
+        addressTextField.setAddress(model.getAddressAsString());
+        addressTextField.setPaymentLabel(model.getPaymentLabel());
+
+        paymentAccountsComboBox.setItems(model.getPaymentAccounts());
+        paymentAccountsComboBox.getSelectionModel().select(model.getPaymentAccount());
+
+        onPaymentAccountsComboBoxSelected();
     }
 
     @Override
-    protected void doDeactivate() {
+    protected void deactivate() {
         removeBindings();
         removeListeners();
     }
 
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // API
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void initWithData(Offer.Direction direction, TradeCurrency tradeCurrency) {
+        model.initWithData(direction, tradeCurrency);
+
+        if (direction == Offer.Direction.BUY) {
+            imageView.setId("image-buy-large");
+        } else {
+            imageView.setId("image-sell-large");
+            // only needed for sell
+            totalToPayTextField.setPromptText(BSResources.get("createOffer.fundsBox.totalsNeeded.prompt"));
+        }
+    }
+
+    // called form parent as the view does not get notified when the tab is closed
+    public void onClose() {
+        // we use model.requestPlaceOfferSuccess to not react on close caused by placeOffer
+        if (model.dataModel.isWalletFunded.get() && !model.requestPlaceOfferSuccess.get())
+            new Popup().warning("You have already funds paid in.\nIn the <Funds/Open for withdrawal> section you can withdraw those funds.").show();
+    }
+
+    public void setCloseHandler(OfferView.CloseHandler closeHandler) {
+        this.closeHandler = closeHandler;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // UI actions
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private void onPlaceOffer() {
+        Offer offer = model.getOffer();
+        if (model.getShowPlaceOfferConfirmation()) {
+            offerDetailsPopup.onPlaceOffer(o -> model.onPlaceOffer(o)).show(offer);
+        } else {
+            if (model.hasAcceptedArbitrators()) {
+                model.onPlaceOffer(offer);
+            } else {
+                new Popup().warning("You have no arbitrator selected.\n" +
+                        "Please select at least one arbitrator.").show();
+
+                navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, ArbitratorSelectionView.class);
+            }
+        }
+    }
+
+    private void onShowFundsScreen() {
+        if (!BitsquareApp.DEV_MODE) {
+            if (model.getDisplaySecurityDepositInfo()) {
+                new Popup().information("To ensure that both traders behave fair they need to pay a security deposit.\n\n" +
+                        "The deposit will stay in your local trading wallet until the offer gets accepted by another trader.\n" +
+                        "It will be refunded to you after the trade has successfully completed.").show();
+
+                model.onSecurityDepositInfoDisplayed();
+            }
+        }
+
+        showPaymentButton.setVisible(false);
+
+        payFundsPane.setVisible(true);
+        totalToPayLabel.setVisible(true);
+        totalToPayInfoIconLabel.setVisible(true);
+        totalToPayTextField.setVisible(true);
+        addressLabel.setVisible(true);
+        addressTextField.setVisible(true);
+        balanceLabel.setVisible(true);
+        balanceTextField.setVisible(true);
+
+        setupTotalToPayInfoIconLabel();
+
+        model.onShowPayFundsScreen();
+    }
+
+    private void onPaymentAccountsComboBoxSelected() {
+        PaymentAccount paymentAccount = paymentAccountsComboBox.getSelectionModel().getSelectedItem();
+        if (paymentAccount != null) {
+            currencyComboBox.setVisible(paymentAccount.hasMultipleCurrencies());
+            if (paymentAccount.hasMultipleCurrencies()) {
+                currencyComboBox.setItems(FXCollections.observableArrayList(paymentAccount.getTradeCurrencies()));
+
+                // we select combobox following the user currency, if user currency not available in account, we select first
+                TradeCurrency tradeCurrency = model.getTradeCurrency();
+                if (paymentAccount.getTradeCurrencies().contains(tradeCurrency))
+                    currencyComboBox.getSelectionModel().select(tradeCurrency);
+                else
+                    currencyComboBox.getSelectionModel().select(paymentAccount.getTradeCurrencies().get(0));
+
+                model.onPaymentAccountSelected(paymentAccount);
+            } else {
+                currencyTextField.setText(paymentAccount.getSingleTradeCurrency().getCodeAndName());
+                model.onPaymentAccountSelected(paymentAccount);
+                model.onCurrencySelected(paymentAccount.getSingleTradeCurrency());
+            }
+        } else {
+            currencyComboBox.setVisible(false);
+            currencyTextField.setText("");
+        }
+    }
+
+    private void onCurrencyComboBoxSelected() {
+        model.onCurrencySelected(currencyComboBox.getSelectionModel().getSelectedItem());
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Navigation
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private void close() {
+        if (closeHandler != null)
+            closeHandler.close();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Bindings, Listeners
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+
     private void addBindings() {
         amountBtcLabel.textProperty().bind(model.btcCode);
-        priceFiatLabel.textProperty().bind(model.fiatCode);
-        volumeFiatLabel.textProperty().bind(model.fiatCode);
+        priceCurrencyLabel.textProperty().bind(createStringBinding(() ->
+                model.tradeCurrencyCode.get() + "/" + model.btcCode.get(), model.btcCode, model.tradeCurrencyCode));
+        volumeCurrencyLabel.textProperty().bind(model.tradeCurrencyCode);
         minAmountBtcLabel.textProperty().bind(model.btcCode);
 
         priceDescriptionLabel.textProperty().bind(createStringBinding(() ->
-                BSResources.get("createOffer.amountPriceBox.priceDescription", model.fiatCode.get()), model.fiatCode));
+                BSResources.get("createOffer.amountPriceBox.priceDescription", model.tradeCurrencyCode.get()), model.tradeCurrencyCode));
 
-        volumeDescriptionLabel.textProperty().bind(createStringBinding(() -> model.volumeDescriptionLabel.get(), model.fiatCode, model.volumeDescriptionLabel));
+        volumeDescriptionLabel.textProperty().bind(createStringBinding(model.volumeDescriptionLabel::get, model.tradeCurrencyCode, model
+                .volumeDescriptionLabel));
 
-        buyLabel.textProperty().bind(model.directionLabel);
-        amountToTradeLabel.textProperty().bind(model.amountToTradeLabel);
         amountTextField.textProperty().bindBidirectional(model.amount);
         minAmountTextField.textProperty().bindBidirectional(model.minAmount);
         priceTextField.textProperty().bindBidirectional(model.price);
         volumeTextField.textProperty().bindBidirectional(model.volume);
-        amountPriceBoxInfo.textProperty().bind(model.amountPriceBoxInfo);
+        volumeTextField.promptTextProperty().bind(model.volumePromptLabel);
 
         totalToPayTextField.textProperty().bind(model.totalToPay);
-
         addressTextField.amountAsCoinProperty().bind(model.totalToPayAsCoin);
-        addressTextField.paymentLabelProperty().bind(model.paymentLabel);
-        addressTextField.addressProperty().bind(model.addressAsString);
-
-        bankAccountTypeTextField.textProperty().bind(model.bankAccountType);
-        bankAccountCurrencyTextField.textProperty().bind(model.bankAccountCurrency);
-        bankAccountCountyTextField.textProperty().bind(model.bankAccountCounty);
-
-        acceptedCountriesTextField.textProperty().bind(model.acceptedCountries);
-        acceptedLanguagesTextField.textProperty().bind(model.acceptedLanguages);
-        acceptedArbitratorsTextField.textProperty().bind(model.acceptedArbitrators);
 
         // Validation
         amountTextField.validationResultProperty().bind(model.amountValidationResult);
@@ -193,32 +321,31 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         placeOfferButton.disableProperty().bind(model.isPlaceOfferButtonDisabled);
 
         placeOfferSpinnerInfoLabel.visibleProperty().bind(model.isPlaceOfferSpinnerVisible);
+
+        // payment account
+        currencyComboBox.prefWidthProperty().bind(paymentAccountsComboBox.widthProperty());
+        currencyComboBox.managedProperty().bind(currencyComboBox.visibleProperty());
+        currencyComboBoxLabel.visibleProperty().bind(currencyComboBox.visibleProperty());
+        currencyComboBoxLabel.managedProperty().bind(currencyComboBox.visibleProperty());
+        currencyTextField.visibleProperty().bind(currencyComboBox.visibleProperty().not());
+        currencyTextField.managedProperty().bind(currencyComboBox.visibleProperty().not());
+        currencyTextFieldLabel.visibleProperty().bind(currencyComboBox.visibleProperty().not());
+        currencyTextFieldLabel.managedProperty().bind(currencyComboBox.visibleProperty().not());
     }
 
     private void removeBindings() {
         amountBtcLabel.textProperty().unbind();
-        priceFiatLabel.textProperty().unbind();
-        volumeFiatLabel.textProperty().unbind();
+        priceCurrencyLabel.textProperty().unbind();
+        volumeCurrencyLabel.textProperty().unbind();
         minAmountBtcLabel.textProperty().unbind();
         priceDescriptionLabel.textProperty().unbind();
         volumeDescriptionLabel.textProperty().unbind();
-        buyLabel.textProperty().unbind();
-        amountToTradeLabel.textProperty().unbind();
         amountTextField.textProperty().unbindBidirectional(model.amount);
         minAmountTextField.textProperty().unbindBidirectional(model.minAmount);
         priceTextField.textProperty().unbindBidirectional(model.price);
         volumeTextField.textProperty().unbindBidirectional(model.volume);
-        amountPriceBoxInfo.textProperty().unbind();
         totalToPayTextField.textProperty().unbind();
         addressTextField.amountAsCoinProperty().unbind();
-        addressTextField.paymentLabelProperty().unbind();
-        addressTextField.addressProperty().unbind();
-        bankAccountTypeTextField.textProperty().unbind();
-        bankAccountCurrencyTextField.textProperty().unbind();
-        bankAccountCountyTextField.textProperty().unbind();
-        acceptedCountriesTextField.textProperty().unbind();
-        acceptedLanguagesTextField.textProperty().unbind();
-        acceptedArbitratorsTextField.textProperty().unbind();
         amountTextField.validationResultProperty().unbind();
         minAmountTextField.validationResultProperty().unbind();
         priceTextField.validationResultProperty().unbind();
@@ -226,6 +353,15 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         placeOfferButton.visibleProperty().unbind();
         placeOfferButton.disableProperty().unbind();
         placeOfferSpinnerInfoLabel.visibleProperty().unbind();
+        currencyComboBox.managedProperty().unbind();
+        currencyComboBoxLabel.visibleProperty().unbind();
+        currencyComboBoxLabel.managedProperty().unbind();
+        currencyTextField.visibleProperty().unbind();
+        currencyTextField.managedProperty().unbind();
+        currencyTextFieldLabel.visibleProperty().unbind();
+        currencyTextFieldLabel.managedProperty().unbind();
+        currencyComboBox.prefWidthProperty().unbind();
+        volumeTextField.promptTextProperty().unbind();
     }
 
     private void createListeners() {
@@ -233,6 +369,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
             model.onFocusOutAmountTextField(oldValue, newValue, amountTextField.getText());
             amountTextField.setText(model.amount.get());
         };
+
         minAmountFocusedListener = (o, oldValue, newValue) -> {
             model.onFocusOutMinAmountTextField(oldValue, newValue, minAmountTextField.getText());
             minAmountTextField.setText(model.minAmount.get());
@@ -247,35 +384,38 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         };
         showWarningInvalidBtcDecimalPlacesListener = (o, oldValue, newValue) -> {
             if (newValue) {
-                Popups.openWarningPopup(BSResources.get("shared.warning"), BSResources.get("createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces"));
+                new Popup().warning(BSResources.get("createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces")).show();
                 model.showWarningInvalidBtcDecimalPlaces.set(false);
             }
         };
         showWarningInvalidFiatDecimalPlacesPlacesListener = (o, oldValue, newValue) -> {
             if (newValue) {
-                Popups.openWarningPopup(BSResources.get("shared.warning"), BSResources.get("createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces"));
+                new Popup().warning(BSResources.get("createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces")).show();
                 model.showWarningInvalidFiatDecimalPlaces.set(false);
             }
         };
         showWarningAdjustedVolumeListener = (o, oldValue, newValue) -> {
             if (newValue) {
-                Popups.openWarningPopup(BSResources.get("shared.warning"), BSResources.get("createOffer.amountPriceBox.warning.adjustedVolume"));
+                new Popup().warning(BSResources.get("createOffer.amountPriceBox.warning.adjustedVolume")).show();
                 model.showWarningAdjustedVolume.set(false);
                 volumeTextField.setText(model.volume.get());
             }
         };
-        requestPlaceOfferErrorMessageListener = (o, oldValue, newValue) -> {
-            if (newValue != null) {
-                Popups.openErrorPopup(BSResources.get("shared.error"), BSResources.get("createOffer.amountPriceBox.error.message",
-                        model.requestPlaceOfferErrorMessage.get()));
-                Popups.removeBlurContent();
-            }
+        errorMessageListener = (o, oldValue, newValue) -> {
+            if (newValue != null)
+                new Popup().error(BSResources.get("createOffer.amountPriceBox.error.message", model.errorMessage.get()) +
+                        "\n\nThere have no funds left your wallet yet.\n" +
+                        "Please try to restart you application and check your network connection to see if you can resolve the issue.")
+                        .show();
         };
         isPlaceOfferSpinnerVisibleListener = (ov, oldValue, newValue) -> {
             placeOfferSpinner.setProgress(newValue ? -1 : 0);
             placeOfferSpinner.setVisible(newValue);
         };
 
+        paymentAccountsComboBoxSelectionHandler = e -> onPaymentAccountsComboBoxSelected();
+        currencyComboBoxSelectionHandler = e -> onCurrencyComboBoxSelected();
+
         showTransactionPublishedScreen = (o, oldValue, newValue) -> {
             if (BitsquareApp.DEV_MODE) {
                 newValue = false;
@@ -283,36 +423,11 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
                 navigation.navigateTo(MainView.class, PortfolioView.class, OpenOffersView.class);
             }
 
-            if (newValue) {
-                OverlayManager.blurContent();
-
-                // Dialogs are a bit limited. There is no callback for the InformationDialog button click, so we added
-                // our own actions.
-                List<Action> actions = new ArrayList<>();
-              /*  actions.add(new AbstractAction(BSResources.get("shared.copyTxId")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "COPY");
-                        Utilities.copyToClipboard(model.transactionId.get());
-                    }
-                });*/
-                actions.add(new AbstractAction(BSResources.get("shared.close")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "CLOSE");
-                        try {
-                            close();
-                            navigation.navigateTo(MainView.class, PortfolioView.class, OpenOffersView.class);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        Dialog.Actions.CLOSE.handle(actionEvent);
-                    }
-                });
-                Popups.openInfoPopup(BSResources.get("createOffer.success.headline"),
-                        BSResources.get("createOffer.success.info"),
-                        actions);
-            }
+            if (newValue)
+                new Popup().headLine(BSResources.get("createOffer.success.headline"))
+                        .message(BSResources.get("createOffer.success.info"))
+                        .onClose(() -> close())
+                        .show();
         };
     }
 
@@ -327,10 +442,14 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         model.showWarningInvalidBtcDecimalPlaces.addListener(showWarningInvalidBtcDecimalPlacesListener);
         model.showWarningInvalidFiatDecimalPlaces.addListener(showWarningInvalidFiatDecimalPlacesPlacesListener);
         model.showWarningAdjustedVolume.addListener(showWarningAdjustedVolumeListener);
-        model.requestPlaceOfferErrorMessage.addListener(requestPlaceOfferErrorMessageListener);
+        model.errorMessage.addListener(errorMessageListener);
         model.isPlaceOfferSpinnerVisible.addListener(isPlaceOfferSpinnerVisibleListener);
 
-        model.showTransactionPublishedScreen.addListener(showTransactionPublishedScreen);
+        model.requestPlaceOfferSuccess.addListener(showTransactionPublishedScreen);
+
+        // UI actions
+        paymentAccountsComboBox.setOnAction(paymentAccountsComboBoxSelectionHandler);
+        currencyComboBox.setOnAction(currencyComboBoxSelectionHandler);
     }
 
     private void removeListeners() {
@@ -344,222 +463,221 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         model.showWarningInvalidBtcDecimalPlaces.removeListener(showWarningInvalidBtcDecimalPlacesListener);
         model.showWarningInvalidFiatDecimalPlaces.removeListener(showWarningInvalidFiatDecimalPlacesPlacesListener);
         model.showWarningAdjustedVolume.removeListener(showWarningAdjustedVolumeListener);
-        model.requestPlaceOfferErrorMessage.removeListener(requestPlaceOfferErrorMessageListener);
+        model.errorMessage.removeListener(errorMessageListener);
         model.isPlaceOfferSpinnerVisible.removeListener(isPlaceOfferSpinnerVisibleListener);
 
-        model.showTransactionPublishedScreen.removeListener(showTransactionPublishedScreen);
+        model.requestPlaceOfferSuccess.removeListener(showTransactionPublishedScreen);
+
+        // UI actions
+        paymentAccountsComboBox.setOnAction(null);
+        currencyComboBox.setOnAction(null);
     }
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // API
+    // Build UI elements
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void initWithData(Offer.Direction direction, Coin amount, Fiat price) {
-        model.initWithData(direction, amount, price);
-
-        if (direction == Offer.Direction.BUY)
-            imageView.setId("image-buy-large");
-        else
-            imageView.setId("image-sell-large");
-    }
-
-    public void setCloseHandler(OfferView.CloseHandler closeHandler) {
-        this.closeHandler = closeHandler;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // UI actions
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @FXML
-    void onPlaceOffer() {
-        model.onPlaceOffer();
-    }
-
-    @FXML
-    void onScroll() {
-        InputTextField.hideErrorMessageDisplay();
-    }
-
-    @FXML
-    void onShowPayFundsScreen() {
-        if (!BitsquareApp.DEV_MODE) {
-            if (model.getDisplaySecurityDepositInfo()) {
-                OverlayManager.blurContent();
-                List<Action> actions = new ArrayList<>();
-                actions.add(new AbstractAction(BSResources.get("shared.close")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "CLOSE");
-                        Dialog.Actions.CLOSE.handle(actionEvent);
-                    }
-                });
-                Popups.openInfoPopup("To ensure that both traders behave fair they need to pay a security deposit.",
-                        "The deposit will stay in your local trading wallet until the offer gets accepted by " +
-                                "another trader. " +
-                                "\nIt will be refunded to you after the trade has successfully completed.",
-                        actions);
-
-                model.onSecurityDepositInfoDisplayed();
-            }
-        }
-
-
-        priceAmountPane.setInactive();
-
-        showPaymentInfoScreenButton.setVisible(false);
-
-        payFundsPane.setVisible(true);
-        totalToPayLabel.setVisible(true);
-        totalToPayInfoIconLabel.setVisible(true);
-        totalToPayTextField.setVisible(true);
-        addressLabel.setVisible(true);
-        addressTextField.setVisible(true);
-        balanceLabel.setVisible(true);
-        balanceTextField.setVisible(true);
-        fundsBoxInfoDisplay.setVisible(true);
-
-        // for irc demo
-        //showAdvancedSettingsButton.setVisible(true);
-        showAdvancedSettingsButton.setManaged(false);
-
-        if (expand == null) {
-            expand = ImageUtil.getImageViewById(ImageUtil.EXPAND);
-            collapse = ImageUtil.getImageViewById(ImageUtil.COLLAPSE);
-        }
-        showAdvancedSettingsButton.setGraphic(expand);
-
-        setupTotalToPayInfoIconLabel();
-
-        model.onShowPayFundsScreen();
-    }
-
-    @FXML
-    void onToggleShowAdvancedSettings() {
-        detailsVisible = !detailsVisible;
-        if (detailsVisible) {
-            showAdvancedSettingsButton.setText(BSResources.get("createOffer.fundsBox.hideAdvanced"));
-            showAdvancedSettingsButton.setGraphic(collapse);
-            showDetailsScreen();
-        }
-        else {
-            showAdvancedSettingsButton.setText(BSResources.get("createOffer.fundsBox.showAdvanced"));
-            showAdvancedSettingsButton.setGraphic(expand);
-            hideDetailsScreen();
-        }
-    }
-
-    @FXML
-    void onOpenGeneralHelp() {
-        Help.openWindow(HelpId.CREATE_OFFER_GENERAL);
-    }
-
-    @FXML
-    void onOpenFundingHelp() {
-        Help.openWindow(HelpId.CREATE_OFFER_FUNDING);
-    }
-
-    @FXML
-    void onOpenAdvancedSettingsHelp() {
-        Help.openWindow(HelpId.CREATE_OFFER_ADVANCED);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Navigation
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void openAccountSettings() {
-        navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, RestrictionsView.class);
-    }
-
-    private void close() {
-        if (closeHandler != null)
-            closeHandler.close();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // State
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void showDetailsScreen() {
-        payFundsPane.setInactive();
-
+    private void addScrollPane() {
+        scrollPane = new ScrollPane();
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.layout();
-
-        if (!advancedScreenInited) {
-            initEditIcons();
-            advancedScreenInited = true;
-        }
-
-        toggleDetailsScreen(true);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+        scrollPane.setOnScroll(e -> InputTextField.hideErrorMessageDisplay());
+        AnchorPane.setLeftAnchor(scrollPane, 0d);
+        AnchorPane.setTopAnchor(scrollPane, 0d);
+        AnchorPane.setRightAnchor(scrollPane, 0d);
+        AnchorPane.setBottomAnchor(scrollPane, 0d);
+        root.getChildren().add(scrollPane);
     }
 
-    private void hideDetailsScreen() {
-        payFundsPane.setActive();
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.layout();
-        toggleDetailsScreen(false);
+    private void addGridPane() {
+        gridPane = new GridPane();
+        gridPane.setPadding(new Insets(30, 25, -1, 25));
+        gridPane.setHgap(5);
+        gridPane.setVgap(5);
+        ColumnConstraints columnConstraints1 = new ColumnConstraints();
+        columnConstraints1.setHalignment(HPos.RIGHT);
+        columnConstraints1.setHgrow(Priority.SOMETIMES);
+        columnConstraints1.setMinWidth(200);
+        ColumnConstraints columnConstraints2 = new ColumnConstraints();
+        columnConstraints2.setHgrow(Priority.ALWAYS);
+        gridPane.getColumnConstraints().addAll(columnConstraints1, columnConstraints2);
+        scrollPane.setContent(gridPane);
     }
 
-    private void toggleDetailsScreen(boolean visible) {
-        scrollPane.setOnScroll(scrollEvent -> {
-            if (!visible)
-                scrollEvent.consume();
+    private void addPaymentGroup() {
+        addTitledGroupBg(gridPane, gridRow, 2, "Select payment account");
+
+        paymentAccountsComboBox = addLabelComboBox(gridPane, gridRow, "Payment account:", Layout.FIRST_ROW_DISTANCE).second;
+        paymentAccountsComboBox.setPromptText("Select payment account");
+
+        // we display either currencyComboBox (multi currency account) or currencyTextField (single)
+        Tuple2<Label, ComboBox> currencyComboBoxTuple = addLabelComboBox(gridPane, ++gridRow, "Currency:");
+        currencyComboBoxLabel = currencyComboBoxTuple.first;
+        currencyComboBox = currencyComboBoxTuple.second;
+        currencyComboBox.setPromptText("Select currency");
+        currencyComboBox.setConverter(new StringConverter<TradeCurrency>() {
+            @Override
+            public String toString(TradeCurrency tradeCurrency) {
+                return tradeCurrency.getCodeAndName();
+            }
+
+            @Override
+            public TradeCurrency fromString(String s) {
+                return null;
+            }
         });
 
-        // deactivate mouse wheel scrolling if hidden
-        scrollPane.setVmax(visible ? scrollPane.getHeight() : 0);
-        scrollPane.setVvalue(visible ? scrollPane.getHeight() : 0);
+        Tuple2<Label, TextField> currencyTextFieldTuple = addLabelTextField(gridPane, gridRow, "Currency:", "", 5);
+        currencyTextFieldLabel = currencyTextFieldTuple.first;
+        currencyTextField = currencyTextFieldTuple.second;
+    }
 
-        showDetailsPane.setVisible(visible);
+    private void addAmountPriceGroup() {
+        addTitledGroupBg(gridPane, ++gridRow, 2, "Set amount and price", Layout.GROUP_DISTANCE);
 
-        acceptedCountriesLabel.setVisible(visible);
-        acceptedCountriesLabelIcon.setVisible(visible);
-        acceptedCountriesTextField.setVisible(visible);
-        acceptedLanguagesLabel.setVisible(visible);
-        acceptedLanguagesLabelIcon.setVisible(visible);
-        acceptedLanguagesTextField.setVisible(visible);
-        acceptedArbitratorsLabel.setVisible(visible);
-        acceptedArbitratorsLabelIcon.setVisible(visible);
-        acceptedArbitratorsTextField.setVisible(visible);
+        imageView = new ImageView();
+        imageView.setPickOnBounds(true);
+        buyLabel = new Label();
+        buyLabel.setId("direction-icon-label");
+        buyLabel.setAlignment(Pos.CENTER);
+        buyLabel.setPadding(new Insets(-5, 0, 0, 0));
+        VBox imageVBox = new VBox();
+        imageVBox.setAlignment(Pos.CENTER);
+        imageVBox.setSpacing(6);
+        imageVBox.getChildren().addAll(imageView, buyLabel);
+        GridPane.setRowIndex(imageVBox, gridRow);
+        GridPane.setRowSpan(imageVBox, 2);
+        GridPane.setMargin(imageVBox, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 10, 10, 10));
+        gridPane.getChildren().add(imageVBox);
 
-        bankAccountTypeLabel.setVisible(visible);
-        bankAccountTypeTextField.setVisible(visible);
-        bankAccountCurrencyLabel.setVisible(visible);
-        bankAccountCurrencyTextField.setVisible(visible);
-        bankAccountCountyLabel.setVisible(visible);
-        bankAccountCountyTextField.setVisible(visible);
+        addAmountPriceFields();
 
-        advancedInfoDisplay.setVisible(visible);
+        addMinAmountBox();
+
+        showPaymentButton = addButton(gridPane, ++gridRow, BSResources.get("createOffer.amountPriceBox.next"));
+        GridPane.setMargin(showPaymentButton, new Insets(-35, 0, 0, 0));
+        showPaymentButton.setId("show-details-button");
+        showPaymentButton.setOnAction(e -> onShowFundsScreen());
+    }
+
+    private void addFundingGroup() {
+        // don't increase gridRow as we removed button when this gets visible
+        payFundsPane = addTitledGroupBg(gridPane, gridRow, 3, BSResources.get("createOffer.fundsBox.title"), Layout.GROUP_DISTANCE);
+        payFundsPane.setVisible(false);
+
+        totalToPayLabel = new Label(BSResources.get("createOffer.fundsBox.totalsNeeded"));
+        totalToPayLabel.setVisible(false);
+        totalToPayInfoIconLabel = new Label();
+        totalToPayInfoIconLabel.setVisible(false);
+        HBox totalToPayBox = new HBox();
+        totalToPayBox.setSpacing(4);
+        totalToPayBox.setAlignment(Pos.CENTER_RIGHT);
+        totalToPayBox.getChildren().addAll(totalToPayLabel, totalToPayInfoIconLabel);
+        GridPane.setMargin(totalToPayBox, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 0, 0, 0));
+        GridPane.setRowIndex(totalToPayBox, gridRow);
+        gridPane.getChildren().add(totalToPayBox);
+        totalToPayTextField = new TextField();
+        totalToPayTextField.setEditable(false);
+        totalToPayTextField.setFocusTraversable(false);
+        totalToPayTextField.setVisible(false);
+        GridPane.setRowIndex(totalToPayTextField, gridRow);
+        GridPane.setColumnIndex(totalToPayTextField, 1);
+        GridPane.setMargin(totalToPayTextField, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 0, 0, 0));
+        gridPane.getChildren().add(totalToPayTextField);
+
+        Tuple2<Label, AddressTextField> addressTuple = addLabelAddressTextField(gridPane, ++gridRow, BSResources.get("createOffer.fundsBox.address"));
+        addressLabel = addressTuple.first;
+        addressLabel.setVisible(false);
+        addressTextField = addressTuple.second;
+        addressTextField.setVisible(false);
+
+        Tuple2<Label, BalanceTextField> balanceTuple = addLabelBalanceTextField(gridPane, ++gridRow, BSResources.get("createOffer.fundsBox.balance"));
+        balanceLabel = balanceTuple.first;
+        balanceLabel.setVisible(false);
+        balanceTextField = balanceTuple.second;
+        balanceTextField.setVisible(false);
+
+        Tuple3<Button, ProgressIndicator, Label> placeOfferTuple = addButtonWithStatus(gridPane, ++gridRow, BSResources.get("createOffer.fundsBox.placeOffer"));
+        placeOfferButton = placeOfferTuple.first;
+        placeOfferButton.setVisible(false);
+        placeOfferButton.setOnAction(e -> onPlaceOffer());
+        placeOfferSpinner = placeOfferTuple.second;
+        placeOfferSpinnerInfoLabel = placeOfferTuple.third;
+        placeOfferSpinnerInfoLabel.setText(BSResources.get("createOffer.fundsBox.placeOfferSpinnerInfo"));
+        placeOfferSpinnerInfoLabel.setVisible(false);
+    }
+
+    private void addAmountPriceFields() {
+        // amountBox
+        Tuple3<HBox, InputTextField, Label> amountValueCurrencyBoxTuple = FormBuilder.getValueCurrencyBox(BSResources.get("createOffer.amount.prompt"));
+        HBox amountValueCurrencyBox = amountValueCurrencyBoxTuple.first;
+        amountTextField = amountValueCurrencyBoxTuple.second;
+        amountBtcLabel = amountValueCurrencyBoxTuple.third;
+        Tuple2<Label, VBox> amountInputBoxTuple = getTradeInputBox(amountValueCurrencyBox, model.getAmountDescription());
+        amountDescriptionLabel = amountInputBoxTuple.first;
+        VBox amountBox = amountInputBoxTuple.second;
+
+        // x
+        Label xLabel = new Label("x");
+        xLabel.setFont(Font.font("Helvetica-Bold", 20));
+        xLabel.setPadding(new Insets(14, 3, 0, 3));
+
+        // price
+        Tuple3<HBox, InputTextField, Label> priceValueCurrencyBoxTuple = FormBuilder.getValueCurrencyBox(BSResources.get("createOffer.price.prompt"));
+        HBox priceValueCurrencyBox = priceValueCurrencyBoxTuple.first;
+        priceTextField = priceValueCurrencyBoxTuple.second;
+        priceCurrencyLabel = priceValueCurrencyBoxTuple.third;
+        Tuple2<Label, VBox> priceInputBoxTuple = getTradeInputBox(priceValueCurrencyBox, BSResources.get("createOffer.amountPriceBox.priceDescription"));
+        priceDescriptionLabel = priceInputBoxTuple.first;
+        VBox priceBox = priceInputBoxTuple.second;
+
+        // =
+        Label resultLabel = new Label("=");
+        resultLabel.setFont(Font.font("Helvetica-Bold", 20));
+        resultLabel.setPadding(new Insets(14, 2, 0, 2));
+
+        // volume
+        Tuple3<HBox, InputTextField, Label> volumeValueCurrencyBoxTuple = FormBuilder.getValueCurrencyBox(BSResources.get("createOffer.volume.prompt"));
+        HBox volumeValueCurrencyBox = volumeValueCurrencyBoxTuple.first;
+        volumeTextField = volumeValueCurrencyBoxTuple.second;
+        volumeCurrencyLabel = volumeValueCurrencyBoxTuple.third;
+        Tuple2<Label, VBox> volumeInputBoxTuple = getTradeInputBox(volumeValueCurrencyBox, model.volumeDescriptionLabel.get());
+        volumeDescriptionLabel = volumeInputBoxTuple.first;
+        VBox volumeBox = volumeInputBoxTuple.second;
+
+        HBox hBox = new HBox();
+        hBox.setSpacing(5);
+        hBox.setAlignment(Pos.CENTER_LEFT);
+        hBox.getChildren().addAll(amountBox, xLabel, priceBox, resultLabel, volumeBox);
+        GridPane.setRowIndex(hBox, gridRow);
+        GridPane.setColumnIndex(hBox, 1);
+        GridPane.setMargin(hBox, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 10, 0, 0));
+        gridPane.getChildren().add(hBox);
+    }
+
+    private void addMinAmountBox() {
+        Tuple3<HBox, InputTextField, Label> amountValueCurrencyBoxTuple = getValueCurrencyBox(BSResources.get("createOffer.amount.prompt"));
+        HBox amountValueCurrencyBox = amountValueCurrencyBoxTuple.first;
+        minAmountTextField = amountValueCurrencyBoxTuple.second;
+        minAmountBtcLabel = amountValueCurrencyBoxTuple.third;
+
+        Tuple2<Label, VBox> amountInputBoxTuple = getTradeInputBox(amountValueCurrencyBox, BSResources.get("createOffer.amountPriceBox" +
+                ".minAmountDescription"));
+        VBox box = amountInputBoxTuple.second;
+        GridPane.setRowIndex(box, ++gridRow);
+        GridPane.setColumnIndex(box, 1);
+        GridPane.setMargin(box, new Insets(5, 10, 5, 0));
+        gridPane.getChildren().add(box);
     }
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Utils
+    // PayInfo
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void initEditIcons() {
-        acceptedCountriesLabelIcon.setId("clickable-icon");
-        AwesomeDude.setIcon(acceptedCountriesLabelIcon, AwesomeIcon.EDIT_SIGN);
-        Tooltip.install(acceptedCountriesLabelIcon, new Tooltip(BSResources.get("shared.openSettings")));
-        acceptedCountriesLabelIcon.setOnMouseClicked(e -> openAccountSettings());
-
-        acceptedLanguagesLabelIcon.setId("clickable-icon");
-        AwesomeDude.setIcon(acceptedLanguagesLabelIcon, AwesomeIcon.EDIT_SIGN);
-        Tooltip.install(acceptedLanguagesLabelIcon, new Tooltip(BSResources.get("shared.openSettings")));
-        acceptedLanguagesLabelIcon.setOnMouseClicked(e -> openAccountSettings());
-
-        acceptedArbitratorsLabelIcon.setId("clickable-icon");
-        AwesomeDude.setIcon(acceptedArbitratorsLabelIcon, AwesomeIcon.EDIT_SIGN);
-        Tooltip.install(acceptedArbitratorsLabelIcon, new Tooltip(BSResources.get("shared.openSettings")));
-        acceptedArbitratorsLabelIcon.setOnMouseClicked(e -> openAccountSettings());
-    }
-
     private void setupTotalToPayInfoIconLabel() {
         totalToPayInfoIconLabel.setId("clickable-icon");
         AwesomeDude.setIcon(totalToPayInfoIconLabel, AwesomeIcon.QUESTION_SIGN);
@@ -579,25 +697,18 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
         infoGridPane.setPadding(new Insets(10, 10, 10, 10));
 
         int i = 0;
-        if (model.isSeller()) {
-            addPayInfoEntry(infoGridPane, i++,
-                    BSResources.get("createOffer.fundsBox.tradeAmount"),
-                    model.tradeAmount.get());
-        }
-        addPayInfoEntry(infoGridPane, i++,
-                BSResources.get("createOffer.fundsBox.securityDeposit"),
-                model.securityDeposit.get());
-        addPayInfoEntry(infoGridPane, i++, BSResources.get("createOffer.fundsBox.offerFee"),
-                model.offerFee.get());
-        addPayInfoEntry(infoGridPane, i++, BSResources.get("createOffer.fundsBox.networkFee"),
-                model.networkFee.get());
+        if (model.isSeller())
+            addPayInfoEntry(infoGridPane, i++, BSResources.get("createOffer.fundsBox.tradeAmount"), model.tradeAmount.get());
+
+        addPayInfoEntry(infoGridPane, i++, BSResources.get("createOffer.fundsBox.securityDeposit"), model.getSecurityDeposit());
+        addPayInfoEntry(infoGridPane, i++, BSResources.get("createOffer.fundsBox.offerFee"), model.getOfferFee());
+        addPayInfoEntry(infoGridPane, i++, BSResources.get("createOffer.fundsBox.networkFee"), model.getNetworkFee());
         Separator separator = new Separator();
         separator.setOrientation(Orientation.HORIZONTAL);
         separator.setStyle("-fx-background: #666;");
         GridPane.setConstraints(separator, 1, i++);
         infoGridPane.getChildren().add(separator);
-        addPayInfoEntry(infoGridPane, i++, BSResources.get("createOffer.fundsBox.total"),
-                model.totalToPay.get());
+        addPayInfoEntry(infoGridPane, i, BSResources.get("createOffer.fundsBox.total"), model.totalToPay.get());
         totalToPayInfoPopover = new PopOver(infoGridPane);
         if (totalToPayInfoIconLabel.getScene() != null) {
             totalToPayInfoPopover.setDetachable(false);
@@ -622,7 +733,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
     private Point2D getPopupPosition() {
         Window window = totalToPayInfoIconLabel.getScene().getWindow();
         Point2D point = totalToPayInfoIconLabel.localToScene(0, 0);
-        double x = point.getX() + window.getX() + totalToPayInfoIconLabel.getWidth() - 3;
+        double x = point.getX() + window.getX() + totalToPayInfoIconLabel.getWidth() + 2;
         double y = point.getY() + window.getY() + Math.floor(totalToPayInfoIconLabel.getHeight() / 2) - 9;
         return new Point2D(x, y);
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
index b3d1b6936c..eeec6024b0 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.offer.createoffer;
 
-import io.bitsquare.btc.WalletService;
+import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.gui.common.model.ActivatableWithDataModel;
 import io.bitsquare.gui.common.model.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
@@ -25,57 +25,42 @@ import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.FiatValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.payment.PaymentAccount;
 import io.bitsquare.trade.offer.Offer;
-
+import javafx.beans.property.*;
+import javafx.beans.value.ChangeListener;
+import javafx.collections.ObservableList;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
 
 import javax.inject.Inject;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
+import java.util.List;
 
 import static javafx.beans.binding.Bindings.createStringBinding;
 
 class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel> implements ViewModel {
-
     private final BtcValidator btcValidator;
     private final BSFormatter formatter;
     private final FiatValidator fiatValidator;
 
+    private String amountDescription;
+    private String directionLabel;
+    private String addressAsString;
+    private final String paymentLabel;
+
     final StringProperty amount = new SimpleStringProperty();
     final StringProperty minAmount = new SimpleStringProperty();
     final StringProperty price = new SimpleStringProperty();
     final StringProperty volume = new SimpleStringProperty();
     final StringProperty volumeDescriptionLabel = new SimpleStringProperty();
-    final StringProperty amountPriceBoxInfo = new SimpleStringProperty();
-    final StringProperty securityDeposit = new SimpleStringProperty();
+    final StringProperty volumePromptLabel = new SimpleStringProperty();
     final StringProperty tradeAmount = new SimpleStringProperty();
     final StringProperty totalToPay = new SimpleStringProperty();
-    final StringProperty directionLabel = new SimpleStringProperty();
-    final StringProperty amountToTradeLabel = new SimpleStringProperty();
-    final StringProperty offerFee = new SimpleStringProperty();
-    final StringProperty networkFee = new SimpleStringProperty();
-    final StringProperty bankAccountType = new SimpleStringProperty();
-    final StringProperty bankAccountCurrency = new SimpleStringProperty();
-    final StringProperty bankAccountCounty = new SimpleStringProperty();
-    final StringProperty acceptedCountries = new SimpleStringProperty();
-    final StringProperty acceptedLanguages = new SimpleStringProperty();
-    final StringProperty acceptedArbitrators = new SimpleStringProperty();
-    final StringProperty addressAsString = new SimpleStringProperty();
-    final StringProperty paymentLabel = new SimpleStringProperty();
-    final StringProperty transactionId = new SimpleStringProperty();
-    final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty();
+    final StringProperty errorMessage = new SimpleStringProperty();
     final StringProperty btcCode = new SimpleStringProperty();
-    final StringProperty fiatCode = new SimpleStringProperty();
+    final StringProperty tradeCurrencyCode = new SimpleStringProperty();
 
     final BooleanProperty isPlaceOfferButtonVisible = new SimpleBooleanProperty(false);
     final BooleanProperty isPlaceOfferButtonDisabled = new SimpleBooleanProperty(true);
@@ -83,7 +68,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     final BooleanProperty showWarningAdjustedVolume = new SimpleBooleanProperty();
     final BooleanProperty showWarningInvalidFiatDecimalPlaces = new SimpleBooleanProperty();
     final BooleanProperty showWarningInvalidBtcDecimalPlaces = new SimpleBooleanProperty();
-    final BooleanProperty showTransactionPublishedScreen = new SimpleBooleanProperty();
+    final BooleanProperty requestPlaceOfferSuccess = new SimpleBooleanProperty();
 
     final ObjectProperty<InputValidator.ValidationResult> amountValidationResult = new SimpleObjectProperty<>();
     final ObjectProperty<InputValidator.ValidationResult> minAmountValidationResult = new
@@ -106,9 +91,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     private ChangeListener<Boolean> isWalletFundedListener;
     private ChangeListener<Boolean> requestPlaceOfferSuccessListener;
     private ChangeListener<String> requestPlaceOfferErrorMessageListener;
-    private InvalidationListener acceptedCountriesListener;
-    private InvalidationListener acceptedLanguageCodesListener;
-    private InvalidationListener acceptedArbitratorsListener;
+    private ChangeListener<String> errorMessageListener;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -124,71 +107,72 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
         this.btcValidator = btcValidator;
         this.formatter = formatter;
 
-        paymentLabel.set(BSResources.get("createOffer.fundsBox.paymentLabel", dataModel.getOfferId()));
+        paymentLabel = BSResources.get("createOffer.fundsBox.paymentLabel", dataModel.getOfferId());
 
         if (dataModel.getAddressEntry() != null) {
-            addressAsString.set(dataModel.getAddressEntry().getAddress().toString());
+            addressAsString = dataModel.getAddressEntry().getAddress().toString();
             address.set(dataModel.getAddressEntry().getAddress());
         }
         createListeners();
     }
 
     @Override
-    protected void doActivate() {
+    protected void activate() {
         addBindings();
         addListeners();
+
+        updateButtonDisableState();
+
+        if (dataModel.getDirection() == Offer.Direction.BUY) {
+            directionLabel = BSResources.get("shared.buyBitcoin");
+            amountDescription = BSResources.get("createOffer.amountPriceBox.amountDescription", BSResources.get("shared.buy"));
+        } else {
+            directionLabel = BSResources.get("shared.sellBitcoin");
+            amountDescription = BSResources.get("createOffer.amountPriceBox.amountDescription", BSResources.get("shared.sell"));
+        }
     }
 
     @Override
-    protected void doDeactivate() {
+    protected void deactivate() {
         removeBindings();
         removeListeners();
     }
 
     private void addBindings() {
+        if (dataModel.getDirection() == Offer.Direction.BUY) {
+            volumeDescriptionLabel.bind(createStringBinding(
+                    () -> BSResources.get("createOffer.amountPriceBox.buy.volumeDescription", dataModel.tradeCurrencyCode.get()),
+                    dataModel.tradeCurrencyCode));
+        } else {
+            volumeDescriptionLabel.bind(createStringBinding(
+                    () -> BSResources.get("createOffer.amountPriceBox.sell.volumeDescription", dataModel.tradeCurrencyCode.get()),
+                    dataModel.tradeCurrencyCode));
+        }
+        volumePromptLabel.bind(createStringBinding(
+                () -> BSResources.get("createOffer.volume.prompt", dataModel.tradeCurrencyCode.get()),
+                dataModel.tradeCurrencyCode));
+
         totalToPay.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.totalToPayAsCoin.get()),
                 dataModel.totalToPayAsCoin));
-        securityDeposit.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.securityDepositAsCoin.get()),
-                dataModel.securityDepositAsCoin));
+
 
         tradeAmount.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.amountAsCoin.get()),
                 dataModel.amountAsCoin));
 
         totalToPayAsCoin.bind(dataModel.totalToPayAsCoin);
 
-        offerFee.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.offerFeeAsCoin.get()),
-                dataModel.offerFeeAsCoin));
-        networkFee.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.networkFeeAsCoin.get()),
-                dataModel.offerFeeAsCoin));
-
-        bankAccountType.bind(createStringBinding(() -> BSResources.get(dataModel.bankAccountType.get()),
-                dataModel.bankAccountType));
-        bankAccountCurrency.bind(dataModel.bankAccountCurrency);
-        bankAccountCounty.bind(dataModel.bankAccountCounty);
-
-        requestPlaceOfferErrorMessage.bind(dataModel.requestPlaceOfferErrorMessage);
-        showTransactionPublishedScreen.bind(dataModel.requestPlaceOfferSuccess);
-        transactionId.bind(dataModel.transactionId);
-
         btcCode.bind(dataModel.btcCode);
-        fiatCode.bind(dataModel.fiatCode);
+        tradeCurrencyCode.bind(dataModel.tradeCurrencyCode);
     }
 
     private void removeBindings() {
         totalToPay.unbind();
-        securityDeposit.unbind();
         tradeAmount.unbind();
         totalToPayAsCoin.unbind();
-        offerFee.unbind();
-        networkFee.unbind();
-        bankAccountType.unbind();
-        bankAccountCurrency.unbind();
-        bankAccountCounty.unbind();
-        requestPlaceOfferErrorMessage.unbind();
-        showTransactionPublishedScreen.unbind();
-        transactionId.unbind();
         btcCode.unbind();
-        fiatCode.unbind();
+        tradeCurrencyCode.unbind();
+        volumeDescriptionLabel.unbind();
+        volumePromptLabel.unbind();
     }
 
     private void createListeners() {
@@ -226,24 +210,15 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
         priceAsFiatListener = (ov, oldValue, newValue) -> price.set(formatter.formatFiat(newValue));
         volumeAsFiatListener = (ov, oldValue, newValue) -> volume.set(formatter.formatFiat(newValue));
 
-        isWalletFundedListener = (ov, oldValue, newValue) -> {
-            updateButtonDisableState();
-        };
+        isWalletFundedListener = (ov, oldValue, newValue) -> updateButtonDisableState();
         requestPlaceOfferSuccessListener = (ov, oldValue, newValue) -> {
             isPlaceOfferButtonVisible.set(!newValue);
             isPlaceOfferSpinnerVisible.set(false);
         };
         requestPlaceOfferErrorMessageListener = (ov, oldValue, newValue) -> {
-            if (newValue != null) {
+            if (newValue != null)
                 isPlaceOfferSpinnerVisible.set(false);
-            }
         };
-
-        acceptedCountriesListener = (Observable o) ->
-                acceptedCountries.set(formatter.countryLocalesToString(dataModel.acceptedCountries));
-        acceptedLanguageCodesListener = (Observable o) -> acceptedLanguages.set(formatter.languageCodesToString(dataModel.acceptedLanguageCodes));
-        acceptedArbitratorsListener = (Observable o) -> acceptedArbitrators.set(formatter.arbitratorsToNames(dataModel.acceptedArbitrators));
-
     }
 
     private void addListeners() {
@@ -261,13 +236,9 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
         dataModel.volumeAsFiat.addListener(volumeAsFiatListener);
 
         dataModel.isWalletFunded.addListener(isWalletFundedListener);
-        dataModel.requestPlaceOfferSuccess.addListener(requestPlaceOfferSuccessListener);
-        dataModel.requestPlaceOfferErrorMessage.addListener(requestPlaceOfferErrorMessageListener);
+        requestPlaceOfferSuccess.addListener(requestPlaceOfferSuccessListener);
+        errorMessage.addListener(requestPlaceOfferErrorMessageListener);
 
-        // ObservableLists
-        dataModel.acceptedCountries.addListener(acceptedCountriesListener);
-        dataModel.acceptedLanguageCodes.addListener(acceptedLanguageCodesListener);
-        dataModel.acceptedArbitrators.addListener(acceptedArbitratorsListener);
     }
 
     private void removeListeners() {
@@ -283,13 +254,12 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
         dataModel.volumeAsFiat.removeListener(volumeAsFiatListener);
 
         dataModel.isWalletFunded.removeListener(isWalletFundedListener);
-        dataModel.requestPlaceOfferSuccess.removeListener(requestPlaceOfferSuccessListener);
-        dataModel.requestPlaceOfferErrorMessage.removeListener(requestPlaceOfferErrorMessageListener);
+        requestPlaceOfferSuccess.removeListener(requestPlaceOfferSuccessListener);
+        errorMessage.removeListener(requestPlaceOfferErrorMessageListener);
 
-        // ObservableLists
-        dataModel.acceptedCountries.removeListener(acceptedCountriesListener);
-        dataModel.acceptedLanguageCodes.removeListener(acceptedLanguageCodesListener);
-        dataModel.acceptedArbitrators.removeListener(acceptedArbitratorsListener);
+        Offer offer = dataModel.getOffer();
+        if (offer != null && errorMessageListener != null)
+            offer.errorMessageProperty().removeListener(errorMessageListener);
     }
 
 
@@ -297,43 +267,8 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    void initWithData(Offer.Direction direction, Coin amountAsCoin, Fiat priceAsFiat) {
-        addListeners();
-
-        dataModel.initWithData(direction);
-
-        if (dataModel.getDirection() == Offer.Direction.BUY) {
-            directionLabel.set(BSResources.get("shared.buyBitcoin"));
-            amountToTradeLabel.set(BSResources.get("createOffer.amountPriceBox.amountDescription", BSResources.get("shared.buy")));
-            volumeDescriptionLabel.set(BSResources.get("createOffer.amountPriceBox.buy.volumeDescription", fiatCode.get()));
-            amountPriceBoxInfo.set(BSResources.get("createOffer.amountPriceBox.buy.info"));
-        }
-        else {
-            directionLabel.set(BSResources.get("shared.sellBitcoin"));
-            amountToTradeLabel.set(BSResources.get("createOffer.amountPriceBox.amountDescription", BSResources.get("shared.sell")));
-            volumeDescriptionLabel.set(BSResources.get("createOffer.amountPriceBox.sell.volumeDescription", fiatCode.get()));
-            amountPriceBoxInfo.set(BSResources.get("createOffer.amountPriceBox.sell.info"));
-        }
-
-
-        // apply only if valid
-        boolean amountValid = false;
-        if (amountAsCoin != null && isBtcInputValid(amountAsCoin.toPlainString())
-                .isValid) {
-            dataModel.amountAsCoin.set(amountAsCoin);
-            dataModel.minAmountAsCoin.set(amountAsCoin);
-            amountValid = true;
-        }
-
-        // apply only if valid
-        boolean priceValid = false;
-        if (priceAsFiat != null && isBtcInputValid(priceAsFiat.toPlainString()).isValid) {
-            dataModel.priceAsFiat.set(formatter.parseToFiatWith2Decimals(priceAsFiat.toPlainString()));
-            priceValid = true;
-        }
-
-        if (amountValid && priceValid)
-            dataModel.calculateTotalToPay();
+    void initWithData(Offer.Direction direction, TradeCurrency tradeCurrency) {
+        dataModel.initWithData(direction, tradeCurrency);
     }
 
 
@@ -341,16 +276,26 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     // UI actions
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    void onPlaceOffer() {
-        dataModel.requestPlaceOfferErrorMessage.set(null);
-        dataModel.requestPlaceOfferSuccess.set(false);
-
+    void onPlaceOffer(Offer offer) {
+        errorMessage.set(null);
         isPlaceOfferSpinnerVisible.set(true);
+        requestPlaceOfferSuccess.set(false);
 
-        dataModel.onPlaceOffer();
+        errorMessageListener = (observable, oldValue, newValue) -> {
+            if (newValue != null) {
+                if (offer.getState() == Offer.State.OFFER_FEE_PAID)
+                    this.errorMessage.set(newValue +
+                            "\n\nThe create offer fee is already paid. In the worst case you have lost that fee. " +
+                            "We are sorry about that but keep in mind it is a very small amount.\n" +
+                            "Please try to restart you application and check your network connection to see if you can resolve the issue.");
+                else
+                    this.errorMessage.set(newValue);
+            }
+        };
+        offer.errorMessageProperty().addListener(errorMessageListener);
+        dataModel.onPlaceOffer(offer, (transaction) -> requestPlaceOfferSuccess.set(true));
     }
 
-
     void onShowPayFundsScreen() {
         isPlaceOfferButtonVisible.set(true);
     }
@@ -359,6 +304,14 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
         dataModel.onSecurityDepositInfoDisplayed();
     }
 
+    public void onPaymentAccountSelected(PaymentAccount paymentAccount) {
+        dataModel.onPaymentAccountSelected(paymentAccount);
+    }
+
+    public void onCurrencySelected(TradeCurrency tradeCurrency) {
+        dataModel.onCurrencySelected(tradeCurrency);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Handle focus
@@ -420,7 +373,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
             boolean isValid = result.isValid;
             priceValidationResult.set(result);
             if (isValid) {
-                showWarningInvalidFiatDecimalPlaces.set(!formatter.hasFiatValidDecimals(userInput));
+                showWarningInvalidFiatDecimalPlaces.set(!formatter.hasFiatValidDecimals(userInput, dataModel.tradeCurrencyCode.get()));
                 setPriceToModel();
                 price.set(formatter.formatFiat(dataModel.priceAsFiat.get()));
 
@@ -431,10 +384,10 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
 
     void onFocusOutVolumeTextField(boolean oldValue, boolean newValue, String userInput) {
         if (oldValue && !newValue) {
-            InputValidator.ValidationResult result = isBtcInputValid(volume.get());
+            InputValidator.ValidationResult result = isFiatInputValid(volume.get());
             volumeValidationResult.set(result);
             if (result.isValid) {
-                showWarningInvalidFiatDecimalPlaces.set(!formatter.hasFiatValidDecimals(userInput));
+                showWarningInvalidFiatDecimalPlaces.set(!formatter.hasFiatValidDecimals(userInput, dataModel.tradeCurrencyCode.get()));
                 setVolumeToModel();
                 volume.set(formatter.formatFiat(dataModel.volumeAsFiat.get()));
 
@@ -442,7 +395,7 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
 
                 // must be placed after calculateAmount (btc value has been adjusted in case the calculation leads to
                 // invalid decimal places for the amount value
-                showWarningAdjustedVolume.set(!formatter.formatFiat(formatter.parseToFiatWith2Decimals(userInput))
+                showWarningAdjustedVolume.set(!formatter.formatFiat(formatter.parseToFiatWith2Decimals(userInput, dataModel.tradeCurrencyCode.get()))
                         .equals(volume
                                 .get()));
             }
@@ -454,10 +407,6 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    WalletService getWalletService() {
-        return dataModel.getWalletService();
-    }
-
     BSFormatter getFormatter() {
         return formatter;
     }
@@ -470,6 +419,53 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
         return dataModel.getDirection() == Offer.Direction.SELL;
     }
 
+    public ObservableList<PaymentAccount> getPaymentAccounts() {
+        return dataModel.paymentAccounts;
+    }
+
+    public TradeCurrency getTradeCurrency() {
+        return dataModel.getTradeCurrency();
+    }
+
+    public String getOfferFee() {
+        return formatter.formatCoinWithCode(dataModel.getOfferFeeAsCoin());
+    }
+
+    public String getNetworkFee() {
+        return formatter.formatCoinWithCode(dataModel.getNetworkFeeAsCoin());
+    }
+
+    public String getSecurityDeposit() {
+        return formatter.formatCoinWithCode(dataModel.getSecurityDepositAsCoin());
+    }
+
+    public PaymentAccount getPaymentAccount() {
+        return dataModel.getPaymentAccount();
+    }
+
+    public String getAmountDescription() {
+        return amountDescription;
+    }
+
+    public String getDirectionLabel() {
+        return directionLabel;
+    }
+
+    public String getAddressAsString() {
+        return addressAsString;
+    }
+
+    public String getPaymentLabel() {
+        return paymentLabel;
+    }
+
+    public Offer getOffer() {
+        return dataModel.getOffer();
+    }
+
+    boolean hasAcceptedArbitrators() {
+        return dataModel.hasAcceptedArbitrators();
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Utils
@@ -501,6 +497,10 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
 
     private void setAmountToModel() {
         dataModel.amountAsCoin.set(formatter.parseToCoinWith4Decimals(amount.get()));
+        if (dataModel.minAmountAsCoin.get() == null || dataModel.minAmountAsCoin.get().equals(Coin.ZERO)) {
+            minAmount.set(amount.get());
+            setMinAmountToModel();
+        }
     }
 
     private void setMinAmountToModel() {
@@ -508,21 +508,11 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
     }
 
     private void setPriceToModel() {
-        dataModel.priceAsFiat.set(formatter.parseToFiatWith2Decimals(price.get()));
+        dataModel.priceAsFiat.set(formatter.parseToFiatWith2Decimals(price.get(), dataModel.tradeCurrencyCode.get()));
     }
 
     private void setVolumeToModel() {
-        dataModel.volumeAsFiat.set(formatter.parseToFiatWith2Decimals(volume.get()));
-    }
-
-    private void updateButtonDisableState() {
-        isPlaceOfferButtonDisabled.set(!(isBtcInputValid(amount.get()).isValid &&
-                        isBtcInputValid(minAmount.get()).isValid &&
-                        isBtcInputValid(price.get()).isValid &&
-                        isBtcInputValid(volume.get()).isValid &&
-                        dataModel.isMinAmountLessOrEqualAmount() &&
-                        dataModel.isWalletFunded.get())
-        );
+        dataModel.volumeAsFiat.set(formatter.parseToFiatWith2Decimals(volume.get(), dataModel.tradeCurrencyCode.get()));
     }
 
     private InputValidator.ValidationResult isBtcInputValid(String input) {
@@ -533,4 +523,25 @@ class CreateOfferViewModel extends ActivatableWithDataModel<CreateOfferDataModel
         return fiatValidator.validate(input);
     }
 
+    private void updateButtonDisableState() {
+        isPlaceOfferButtonDisabled.set(!(isBtcInputValid(amount.get()).isValid &&
+                        isBtcInputValid(minAmount.get()).isValid &&
+                        isFiatInputValid(price.get()).isValid &&
+                        isFiatInputValid(volume.get()).isValid &&
+                        dataModel.isMinAmountLessOrEqualAmount() &&
+                        dataModel.isWalletFunded.get())
+        );
+    }
+
+    public List<Arbitrator> getArbitrators() {
+        return dataModel.getArbitrators();
+    }
+
+    public void setShowPlaceOfferConfirmation(boolean selected) {
+        dataModel.setShowPlaceOfferConfirmation(selected);
+    }
+
+    public boolean getShowPlaceOfferConfirmation() {
+        return dataModel.getShowPlaceOfferConfirmation();
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java
index 82b336025c..7dbdfeb9fc 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java
@@ -17,27 +17,21 @@
 
 package io.bitsquare.gui.main.offer.offerbook;
 
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.CurrencyUtil;
+import io.bitsquare.p2p.storage.HashSetChangedListener;
+import io.bitsquare.p2p.storage.data.ProtectedData;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.offer.OfferBookService;
-import io.bitsquare.user.User;
-import io.bitsquare.util.Utilities;
-
-import java.util.List;
-import java.util.Timer;
-
-import javax.inject.Inject;
-
-import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import java.io.Serializable;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 /**
  * Holds and manages the unsorted and unfiltered offerbook list of both buy and sell offers.
  * It is handled as singleton by Guice and is used by 2 instances of OfferBookDataModel (one for Buy one for Sell).
@@ -46,121 +40,62 @@ import org.slf4j.LoggerFactory;
  * package for that.
  */
 public class OfferBook {
-
     private static final Logger log = LoggerFactory.getLogger(OfferBook.class);
-    private static final int POLLING_INTERVAL = 2000; // in ms
 
     private final OfferBookService offerBookService;
-    private final User user;
-    private final ChangeListener<FiatAccount> bankAccountChangeListener;
-    private final ChangeListener<Number> invalidationListener;
-    private final OfferBookService.Listener offerBookServiceListener;
-
     private final ObservableList<OfferBookListItem> offerBookListItems = FXCollections.observableArrayList();
 
-    private String fiatCode;
-    private Timer pollingTimer;
-    private Country country;
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    OfferBook(OfferBookService offerBookService, User user, TradeManager tradeManager) {
+    OfferBook(OfferBookService offerBookService, TradeManager tradeManager) {
         this.offerBookService = offerBookService;
-        this.user = user;
-
-        bankAccountChangeListener = (observableValue, oldValue, newValue) -> setBankAccount(newValue);
-        invalidationListener = (ov, oldValue, newValue) -> offerBookService.getOffers(fiatCode);
-
-        offerBookServiceListener = new OfferBookService.Listener() {
+        offerBookService.addHashSetChangedListener(new HashSetChangedListener() {
             @Override
-            public void onOfferAdded(Offer offer) {
-                addOfferToOfferBookListItems(offer);
+            public void onAdded(ProtectedData entry) {
+                log.debug("onAdded " + entry);
+                Serializable data = entry.expirablePayload;
+                if (data instanceof Offer) {
+                    Offer offer = (Offer) data;
+                    OfferBookListItem offerBookListItem = new OfferBookListItem(offer);
+                    if (!offerBookListItems.contains(offerBookListItem))
+                        offerBookListItems.add(offerBookListItem);
+                }
             }
 
             @Override
-            public void onOffersReceived(List<Offer> offers) {
-                //TODO use deltas instead replacing the whole list
-                offerBookListItems.clear();
-                offers.stream().forEach(OfferBook.this::addOfferToOfferBookListItems);
+            public void onRemoved(ProtectedData entry) {
+                log.debug("onRemoved " + entry);
+                if (entry.expirablePayload instanceof Offer) {
+                    Offer offer = (Offer) entry.expirablePayload;
+
+                    // Update state in case that that offer is used in the take offer screen, so it gets updated correctly
+                    offer.setState(Offer.State.REMOVED);
+
+                    // clean up possible references in openOfferManager 
+                    tradeManager.onOfferRemovedFromRemoteOfferBook(offer);
+
+                    offerBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId()));
+                }
             }
-
-            @Override
-            public void onOfferRemoved(Offer offer) {
-                // Update state in case that that offer is used in the take offer screen, so it gets updated correctly
-                offer.setState(Offer.State.REMOVED);
-
-                // clean up possible references in openOfferManager 
-                tradeManager.onOfferRemovedFromRemoteOfferBook(offer);
-
-                offerBookListItems.removeIf(item -> item.getOffer().getId().equals(offer.getId()));
-            }
-        };
+        });
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // API
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    void startPolling() {
-        addListeners();
-        setBankAccount(user.currentFiatAccountProperty().get());
-        pollingTimer = Utilities.setInterval(POLLING_INTERVAL, () -> offerBookService.requestInvalidationTimeStampFromDHT(fiatCode));
-        offerBookService.getOffers(fiatCode);
-    }
-
-    void stopPolling() {
-        pollingTimer.cancel();
-        removeListeners();
-    }
-
-    private void addListeners() {
-        user.currentFiatAccountProperty().addListener(bankAccountChangeListener);
-        offerBookService.addListener(offerBookServiceListener);
-        offerBookService.invalidationTimestampProperty().addListener(invalidationListener);
-    }
-
-    private void removeListeners() {
-        user.currentFiatAccountProperty().removeListener(bankAccountChangeListener);
-        offerBookService.removeListener(offerBookServiceListener);
-        offerBookService.invalidationTimestampProperty().removeListener(invalidationListener);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Getter
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    ObservableList<OfferBookListItem> getOfferBookListItems() {
+    public ObservableList<OfferBookListItem> getOfferBookListItems() {
         return offerBookListItems;
     }
 
+    public void fillOfferBookListItems() {
+        log.debug("fillOfferBookListItems");
+        List<Offer> offers = offerBookService.getOffers();
+        CopyOnWriteArrayList<OfferBookListItem> list = new CopyOnWriteArrayList<>();
+        offers.stream().forEach(e -> list.add(new OfferBookListItem(e)));
+        offerBookListItems.clear();
+        offerBookListItems.addAll(list);
 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Utils
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void setBankAccount(FiatAccount fiatAccount) {
-        log.debug("setBankAccount " + fiatAccount);
-        if (fiatAccount != null) {
-            country = fiatAccount.country;
-            fiatCode = fiatAccount.currencyCode;
-
-            // TODO check why that was used (probably just for update triggering, if so refactor that)
-            //offerBookListItems.stream().forEach(e -> e.setBankAccountCountry(country));
-        }
-        else {
-            fiatCode = CurrencyUtil.getDefaultCurrencyAsCode();
-        }
-    }
-
-    private void addOfferToOfferBookListItems(Offer offer) {
-        if (offer != null) {
-            offerBookListItems.add(new OfferBookListItem(offer, country));
-        }
+        log.debug("offerBookListItems " + offerBookListItems.size());
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java
deleted file mode 100644
index 5d32270887..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * 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.offer.offerbook;
-
-import io.bitsquare.common.handlers.ErrorMessageHandler;
-import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
-import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.locale.Country;
-import io.bitsquare.locale.CurrencyUtil;
-import io.bitsquare.trade.offer.Offer;
-import io.bitsquare.trade.offer.OpenOfferManager;
-import io.bitsquare.user.Preferences;
-import io.bitsquare.user.User;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.utils.ExchangeRate;
-import org.bitcoinj.utils.Fiat;
-
-import com.google.inject.Inject;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.collections.transformation.FilteredList;
-import javafx.collections.transformation.SortedList;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * It holds the scope specific domain data for either a buy or sell UI screen.
- */
-class OfferBookDataModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(OfferBookDataModel.class);
-
-    private final OpenOfferManager openOfferManager;
-    private final User user;
-    private final OfferBook offerBook;
-    private final Preferences preferences;
-    private final BSFormatter formatter;
-
-    private final FilteredList<OfferBookListItem> filteredItems;
-    private final SortedList<OfferBookListItem> sortedItems;
-
-    private ChangeListener<FiatAccount> bankAccountChangeListener;
-
-    private final ObjectProperty<Coin> amountAsCoin = new SimpleObjectProperty<>();
-    private final ObjectProperty<Fiat> priceAsFiat = new SimpleObjectProperty<>();
-    private final ObjectProperty<Fiat> volumeAsFiat = new SimpleObjectProperty<>();
-
-    final StringProperty restrictionsInfo = new SimpleStringProperty();
-    final StringProperty fiatCode = new SimpleStringProperty();
-    final StringProperty btcCode = new SimpleStringProperty();
-    final ObjectProperty<Country> bankAccountCountry = new SimpleObjectProperty<>();
-    private Offer.Direction direction;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor, lifecycle
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Inject
-    public OfferBookDataModel(User user, OpenOfferManager openOfferManager, OfferBook offerBook, Preferences preferences,
-                              BSFormatter formatter) {
-        this.openOfferManager = openOfferManager;
-        this.user = user;
-        this.offerBook = offerBook;
-        this.preferences = preferences;
-        this.formatter = formatter;
-
-        this.filteredItems = new FilteredList<>(offerBook.getOfferBookListItems());
-        this.sortedItems = new SortedList<>(filteredItems);
-
-        createListeners();
-    }
-
-    @Override
-    public void activate() {
-        amountAsCoin.set(null);
-        priceAsFiat.set(null);
-        volumeAsFiat.set(null);
-        
-        addBindings();
-        addListeners();
-
-        setBankAccount(user.currentFiatAccountProperty().get());
-
-        offerBook.startPolling();
-        applyFilter();
-    }
-
-    @Override
-    public void deactivate() {
-        removeBindings();
-        removeListeners();
-
-        offerBook.stopPolling();
-    }
-
-    private void addBindings() {
-        btcCode.bind(preferences.btcDenominationProperty());
-    }
-
-    private void removeBindings() {
-        btcCode.unbind();
-    }
-
-    private void createListeners() {
-        this.bankAccountChangeListener = (observableValue, oldValue, newValue) -> setBankAccount(newValue);
-    }
-
-    private void addListeners() {
-        user.currentFiatAccountProperty().addListener(bankAccountChangeListener);
-    }
-
-    private void removeListeners() {
-        user.currentFiatAccountProperty().removeListener(bankAccountChangeListener);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // API
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-
-    void setDirection(Offer.Direction direction) {
-        this.direction = direction;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // UI actions
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        openOfferManager.onCancelOpenOffer(offer, resultHandler, errorMessageHandler);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Getters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    boolean isTradable(Offer offer) {
-        // if user has not registered yet we display all
-        FiatAccount currentFiatAccount = user.currentFiatAccountProperty().get();
-        if (currentFiatAccount == null)
-            return true;
-
-        boolean countryResult = offer.getAcceptedCountries().contains(currentFiatAccount.country);
-        // for IRC test version deactivate the check
-        countryResult = true;
-        if (!countryResult)
-            restrictionsInfo.set("This offer requires that the payments account resides in one of those countries:\n" +
-                    formatter.countryLocalesToString(offer.getAcceptedCountries()) +
-                    "\n\nThe country of your payments account (" + user.currentFiatAccountProperty().get().country.name +
-                    ") is not included in that list." +
-                    "\n\n Do you want to edit your preferences now?");
-
-
-        // TODO Not so clear how the restrictions will be handled
-        // we might get rid of languages (handles viy arbitrators)
-        /*
-        // disjoint returns true if the two specified collections have no elements in common.
-        boolean languageResult = !Collections.disjoint(preferences.getAcceptedLanguageLocales(),
-                offer.getAcceptedLanguageLocales());
-        if (!languageResult)
-            restrictionsInfo.set("This offer requires that the payments account resides in one of those languages:\n" +
-                    BSFormatter.languageLocalesToString(offer.getAcceptedLanguageLocales()) +
-                    "\n\nThe country of your payments account (" + user.getCurrentBankAccount().getCountry().getName() +
-                    ") is not included in that list.");
-
-        boolean arbitratorResult = !Collections.disjoint(preferences.getAcceptedArbitrators(),
-                offer.getArbitrators());*/
-
-        return countryResult;
-    }
-
-    SortedList<OfferBookListItem> getOfferList() {
-        return sortedItems;
-    }
-
-    boolean isRegistered() {
-        return user.isRegistered();
-    }
-
-    boolean isMyOffer(Offer offer) {
-        return openOfferManager.isMyOffer(offer);
-    }
-
-    Coin getAmountAsCoin() {
-        return amountAsCoin.get();
-    }
-
-    ObjectProperty<Coin> amountAsCoinProperty() {
-        return amountAsCoin;
-    }
-
-    Fiat getPriceAsFiat() {
-        return priceAsFiat.get();
-    }
-
-    ObjectProperty<Fiat> priceAsFiatProperty() {
-        return priceAsFiat;
-    }
-
-    Fiat getVolumeAsFiat() {
-        return volumeAsFiat.get();
-    }
-
-    ObjectProperty<Fiat> volumeAsFiatProperty() {
-        return volumeAsFiat;
-    }
-
-    Offer.Direction getDirection() {
-        return direction;
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Utils
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    void calculateVolume() {
-        try {
-            if (priceAsFiat.get() != null &&
-                    amountAsCoin.get() != null &&
-                    !amountAsCoin.get().isZero() &&
-                    !priceAsFiat.get().isZero()) {
-                volumeAsFiat.set(new ExchangeRate(priceAsFiat.get()).coinToFiat(amountAsCoin.get()));
-            }
-        } catch (Throwable t) {
-            // Should be never reached
-            log.error(t.toString());
-        }
-    }
-
-    void calculateAmount() {
-        try {
-            if (volumeAsFiat.get() != null &&
-                    priceAsFiat.get() != null &&
-                    !volumeAsFiat.get().isZero() &&
-                    !priceAsFiat.get().isZero()) {
-                // If we got a btc value with more then 4 decimals we convert it to max 4 decimals
-                amountAsCoin.set(formatter.reduceTo4Decimals(new ExchangeRate(priceAsFiat.get()).fiatToCoin
-                        (volumeAsFiat.get())));
-            }
-        } catch (Throwable t) {
-            // Should be never reached
-            log.error(t.toString());
-        }
-    }
-
-
-    void setAmount(Coin amount) {
-        amountAsCoin.set(amount);
-        applyFilter();
-    }
-
-    void setPrice(Fiat price) {
-        priceAsFiat.set(price);
-        applyFilter();
-    }
-
-    void setVolume(Fiat volume) {
-        volumeAsFiat.set(volume);
-        applyFilter();
-    }
-
-    private void setBankAccount(FiatAccount fiatAccount) {
-        if (fiatAccount != null) {
-            fiatCode.set(fiatAccount.currencyCode);
-            bankAccountCountry.set(fiatAccount.country);
-            sortedItems.stream().forEach(e -> e.setBankAccountCountry(fiatAccount.country));
-        }
-        else {
-            fiatCode.set(CurrencyUtil.getDefaultCurrencyAsCode());
-        }
-    }
-
-    void applyFilter() {
-        filteredItems.setPredicate(offerBookListItem -> {
-            Offer offer = offerBookListItem.getOffer();
-
-            boolean directionResult = offer.getDirection() != direction;
-
-            boolean amountResult = true;
-            if (amountAsCoin.get() != null && amountAsCoin.get().isPositive())
-                amountResult = amountAsCoin.get().compareTo(offer.getAmount()) <= 0 &&
-                        amountAsCoin.get().compareTo(offer.getMinAmount()) >= 0;
-
-            boolean priceResult = true;
-            if (priceAsFiat.get() != null && priceAsFiat.get().isPositive()) {
-                if (offer.getDirection() == Offer.Direction.SELL)
-                    priceResult = priceAsFiat.get().compareTo(offer.getPrice()) >= 0;
-                else
-                    priceResult = priceAsFiat.get().compareTo(offer.getPrice()) <= 0;
-            }
-
-            return directionResult && amountResult && priceResult;
-        });
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java
index 49e87f155d..c3678b1091 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java
@@ -17,35 +17,17 @@
 
 package io.bitsquare.gui.main.offer.offerbook;
 
-import io.bitsquare.locale.Country;
 import io.bitsquare.trade.offer.Offer;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
 public class OfferBookListItem {
     private final Offer offer;
-    private final ObjectProperty<Country> bankAccountCountry = new SimpleObjectProperty<>();
 
-    public OfferBookListItem(Offer offer, Country bankAccountCountry) {
+    public OfferBookListItem(Offer offer) {
         this.offer = offer;
-        setBankAccountCountry(bankAccountCountry);
-    }
-
-    void setBankAccountCountry(Country bankAccountCountry) {
-        this.bankAccountCountry.set(bankAccountCountry);
     }
 
     public Offer getOffer() {
         return offer;
     }
-
-    Country getBankAccountCountry() {
-        return bankAccountCountry.get();
-    }
-
-    ObjectProperty<Country> bankAccountCountryProperty() {
-        return bankAccountCountry;
-    }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml
index 74132793e9..2f8e98ca82 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml
@@ -17,142 +17,20 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.InputTextField?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?import io.bitsquare.gui.components.TitledSeparator?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.offer.offerbook.OfferBookView"
-          hgap="5.0" vgap="0"
+          hgap="5.0" vgap="5"
           xmlns:fx="http://javafx.com/fxml">
-    <padding>
-        <Insets bottom="20.0" left="25.0" top="30.0" right="25"/>
-    </padding>
-
-    <TitledGroupBg text="Filter offers" GridPane.rowIndex="0" GridPane.columnIndex="0"
-                   GridPane.rowSpan="5" GridPane.columnSpan="2"/>
-
-    <Label text="Filter by amount or price:" GridPane.rowIndex="0" GridPane.valignment="TOP">
-        <padding>
-            <Insets top="21.0"/>
-        </padding>
-    </Label>
-    <HBox alignment="CENTER_LEFT" spacing="5" GridPane.rowIndex="0" GridPane.columnIndex="1">
-        <VBox spacing="4">
-            <Label id="input-description-label" text="Filter by Amount in BTC"
-                   prefWidth="137"/>
-            <HBox>
-                <InputTextField fx:id="amountTextField" id="text-input-with-currency-text-field"
-                                promptText="Amount in BTC" prefWidth="137"
-                                alignment="CENTER_RIGHT"/>
-                <Label fx:id="amountBtcLabel" id="currency-info-label"/>
-            </HBox>
-        </VBox>
-        <Label text="x">
-            <font>
-                <Font name="Helvetica-Bold" size="20.0"/>
-            </font>
-            <padding>
-                <Insets top="14.0" left="3" right="3"/>
-            </padding>
-        </Label>
-
-        <VBox spacing="4">
-            <Label fx:id="priceDescriptionLabel" id="input-description-label" prefWidth="123"/>
-            <HBox>
-                <InputTextField fx:id="priceTextField" id="text-input-with-currency-text-field"
-                                promptText="Filter by price" prefWidth="123"
-                                alignment="CENTER_RIGHT"/>
-                <Label fx:id="priceFiatLabel" id="currency-info-label" alignment="CENTER"/>
-            </HBox>
-        </VBox>
-
-        <Label text="=">
-            <font>
-                <Font name="Helvetica-Bold" size="20.0"/>
-            </font>
-            <padding>
-                <Insets top="14.0" left="2" right="2"/>
-            </padding>
-        </Label>
-
-        <VBox spacing="4">
-            <Label fx:id="volumeDescriptionLabel" id="input-description-label" prefWidth="135"/>
-            <HBox>
-                <InputTextField fx:id="volumeTextField" id="text-input-with-currency-text-field"
-                                prefWidth="135" alignment="CENTER_RIGHT"/>
-                <Label fx:id="volumeFiatLabel" id="currency-info-label"/>
-            </HBox>
-        </VBox>
-        <GridPane.margin>
-            <Insets bottom="5"/>
-        </GridPane.margin>
-    </HBox>
-
-    <Label fx:id="extendedCheckBoxLabel" text="Show only matching offers:" GridPane.columnIndex="0"
-           GridPane.rowIndex="2" visible="false" managed="false"/>
-    <CheckBox fx:id="showOnlyMatchingCheckBox" onAction="#onShowOnlyMatching" visible="false" managed="false"
-              GridPane.columnIndex="1"
-              GridPane.rowIndex="2"/>
-
-    <Label fx:id="extendedButton1Label" text="Payments account countries:" GridPane.columnIndex="0"
-           GridPane.rowIndex="3" visible="false" managed="false"/>
-    <Button fx:id="openCountryFilterButton" text="Open countries filter"
-            onAction="#onOpenCountryFilter" GridPane.columnIndex="1"
-            GridPane.rowIndex="3" visible="false" managed="false"/>
-
-    <Label fx:id="extendedButton2Label" text="Payments account methods:" GridPane.columnIndex="0"
-           GridPane.rowIndex="4" visible="false" managed="false"/>
-    <Button fx:id="openPaymentMethodsFilterButton" text="Open payment methods filter"
-            onAction="#onOpenPaymentMethodsFilter" GridPane.columnIndex="1"
-            GridPane.rowIndex="4" visible="false" managed="false">
-        <GridPane.margin>
-            <Insets bottom="-5"/>
-        </GridPane.margin>
-    </Button>
-
-    <HBox spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="5">
-        <Button fx:id="showAdvancedSettingsButton" text="Open advanced filter"
-                onAction="#onToggleShowAdvancedSettings"/>
-        <Button fx:id="createOfferButton" text="Create new offer" defaultButton="true" onAction="#createOffer"/>
-        <GridPane.margin>
-            <Insets bottom="30" top="20"/>
-        </GridPane.margin>
-    </HBox>
-
-    <TitledSeparator text="Offers" GridPane.rowIndex="6" GridPane.columnIndex="0"
-                     GridPane.columnSpan="2"/>
-
-    <TableView fx:id="table" GridPane.rowIndex="6" GridPane.columnIndex="0" GridPane.columnSpan="2"
-               prefHeight="1500">
-        <GridPane.margin>
-            <Insets top="10.0" left="-10" right="-10" bottom="-15"/>
-        </GridPane.margin>
-        <columns>
-            <TableColumn text="Amount in BTC (Min.)" fx:id="amountColumn" minWidth="130"/>
-            <TableColumn text="Price" fx:id="priceColumn" minWidth="130"/>
-            <TableColumn text="Amount in EUR (Min.)" fx:id="volumeColumn" minWidth="130"/>
-            <!--<TableColumn text="Country" fx:id="countryColumn" minWidth="60"/>-->
-            <TableColumn text="Bank transfer type" fx:id="bankAccountTypeColumn" minWidth="130"/>
-            <TableColumn text="" fx:id="directionColumn" minWidth="80" sortable="false"/>
-        </columns>
-    </TableView>
-
-    <columnConstraints>
-        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
-        <ColumnConstraints hgrow="ALWAYS"/>
-    </columnConstraints>
 
     <rowConstraints>
         <RowConstraints/>
         <RowConstraints/>
         <RowConstraints/>
-        <RowConstraints/>
-        <RowConstraints/>
-        <RowConstraints/>
-        <RowConstraints/>
+        <RowConstraints vgrow="ALWAYS"/>
     </rowConstraints>
 
+    <columnConstraints>
+        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
+        <ColumnConstraints hgrow="ALWAYS"/>
+    </columnConstraints>
 </GridPane>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
index a5362b013b..191e1a9a46 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
@@ -18,76 +18,51 @@
 package io.bitsquare.gui.main.offer.offerbook;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.components.Popups;
+import io.bitsquare.gui.components.TableGroupHeadline;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.account.AccountView;
-import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
+import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView;
+import io.bitsquare.gui.main.account.content.paymentsaccount.PaymentAccountView;
 import io.bitsquare.gui.main.account.settings.AccountSettingsView;
-import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
 import io.bitsquare.gui.main.offer.OfferView;
-import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.gui.util.validation.OptionalBtcValidator;
-import io.bitsquare.gui.util.validation.OptionalFiatValidator;
+import io.bitsquare.gui.popups.OfferDetailsPopup;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
-import io.bitsquare.locale.Country;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.payment.PaymentMethod;
 import io.bitsquare.trade.offer.Offer;
-
-import java.util.ArrayList;
-import java.util.List;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.geometry.Insets;
+import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.GridPane;
+import javafx.util.Callback;
+import javafx.util.StringConverter;
 
 import javax.inject.Inject;
 
-import javafx.beans.property.ReadOnlyObjectWrapper;
-import javafx.beans.value.ChangeListener;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.image.*;
-import javafx.scene.layout.*;
-import javafx.util.Callback;
-
-import org.controlsfx.control.action.AbstractAction;
-import org.controlsfx.control.action.Action;
-import org.controlsfx.dialog.Dialog;
-
+import static io.bitsquare.gui.util.FormBuilder.*;
 import static javafx.beans.binding.Bindings.createStringBinding;
 
 @FxmlView
 public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookViewModel> {
 
-    @FXML CheckBox showOnlyMatchingCheckBox;
-    @FXML TableView<OfferBookListItem> table;
-    @FXML InputTextField volumeTextField, amountTextField, priceTextField;
-    @FXML Button createOfferButton, showAdvancedSettingsButton, openCountryFilterButton, openPaymentMethodsFilterButton;
-    @FXML TableColumn<OfferBookListItem, OfferBookListItem> priceColumn, amountColumn, volumeColumn, directionColumn,
-    /*countryColumn,*/ bankAccountTypeColumn;
-    @FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, volumeFiatLabel,
-            extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel;
-
-    private ImageView expand;
-    private ImageView collapse;
-
-    private boolean detailsVisible;
-    private boolean advancedScreenInited;
-
-
     private final Navigation navigation;
-    private final OptionalBtcValidator optionalBtcValidator;
-    private final OptionalFiatValidator optionalFiatValidator;
-    private OfferView.OfferActionHandler offerActionHandler;
+    private final OfferDetailsPopup offerDetailsPopup;
 
-    private ChangeListener<String> amountTextFieldListener;
-    private ChangeListener<String> priceTextFieldListener;
-    private ChangeListener<String> volumeTextFieldListener;
-    private ChangeListener<Boolean> amountTextFieldFocusedListener;
-    private ChangeListener<Boolean> priceTextFieldFocusedListener;
-    private ChangeListener<Boolean> volumeTextFieldFocusedListener;
+    private ComboBox<TradeCurrency> currencyComboBox;
+    private ComboBox<PaymentMethod> paymentMethodComboBox;
+    private Button createOfferButton;
+    private TableColumn<OfferBookListItem, OfferBookListItem> amountColumn, volumeColumn, priceColumn, paymentMethodColumn;
+    private TableView<OfferBookListItem> tableView;
+
+    private OfferView.OfferActionHandler offerActionHandler;
+    private int gridRow = 0;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -95,174 +70,113 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    OfferBookView(OfferBookViewModel model,
-                  Navigation navigation,
-                  OptionalBtcValidator optionalBtcValidator,
-                  OptionalFiatValidator optionalFiatValidator) {
+    OfferBookView(OfferBookViewModel model, Navigation navigation, OfferDetailsPopup offerDetailsPopup) {
         super(model);
 
         this.navigation = navigation;
-        this.optionalBtcValidator = optionalBtcValidator;
-        this.optionalFiatValidator = optionalFiatValidator;
+        this.offerDetailsPopup = offerDetailsPopup;
     }
 
     @Override
     public void initialize() {
-        // init table
-        setAmountColumnCellFactory();
-        setPriceColumnCellFactory();
-        setVolumeColumnCellFactory();
-        // TODO: countryColumn is deactivated in alpha version
-        // setCountryColumnCellFactory();
-        setBankAccountTypeColumnCellFactory();
-        setDirectionColumnCellFactory();
+        root.setPadding(new Insets(30, 25, -1, 25));
+        addTitledGroupBg(root, gridRow, 2, "Filter offer book");
 
-        table.getSortOrder().add(priceColumn);
-        table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+        currencyComboBox = addLabelComboBox(root, gridRow, "Filter by currency:", Layout.FIRST_ROW_DISTANCE).second;
+        currencyComboBox.setPromptText("Select currency");
+        currencyComboBox.setConverter(new StringConverter<TradeCurrency>() {
+            @Override
+            public String toString(TradeCurrency tradeCurrency) {
+                return tradeCurrency.getCodeAndName();
+            }
+
+            @Override
+            public TradeCurrency fromString(String s) {
+                return null;
+            }
+        });
+
+        paymentMethodComboBox = addLabelComboBox(root, ++gridRow, "Filter by payment method:").second;
+        paymentMethodComboBox.setPromptText("Select payment method");
+        paymentMethodComboBox.setConverter(new StringConverter<PaymentMethod>() {
+            @Override
+            public String toString(PaymentMethod paymentMethod) {
+                return paymentMethod.getId();
+            }
+
+            @Override
+            public PaymentMethod fromString(String s) {
+                return null;
+            }
+        });
+
+
+        // createOfferButton
+        createOfferButton = addButtonAfterGroup(root, ++gridRow, "Create new offer");
+
+        TableGroupHeadline offerBookTitle = new TableGroupHeadline("Offer book");
+        GridPane.setRowIndex(offerBookTitle, ++gridRow);
+        GridPane.setColumnSpan(offerBookTitle, 2);
+        GridPane.setMargin(offerBookTitle, new Insets(20, -10, -10, -10));
+        root.getChildren().add(offerBookTitle);
+
+        tableView = new TableView<>();
+        GridPane.setRowIndex(tableView, gridRow);
+        GridPane.setColumnSpan(tableView, 2);
+        GridPane.setMargin(tableView, new Insets(40, -10, -15, -10));
+        root.getChildren().add(tableView);
+        amountColumn = getAmountColumn();
+        tableView.getColumns().add(amountColumn);
+        priceColumn = getPriceColumn();
+        tableView.getColumns().add(priceColumn);
+        volumeColumn = getVolumeColumn();
+        tableView.getColumns().add(volumeColumn);
+        paymentMethodColumn = getPaymentMethodColumn();
+        tableView.getColumns().add(paymentMethodColumn);
+        tableView.getColumns().add(getActionColumn());
+
+        tableView.getSortOrder().add(priceColumn);
+        tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
         Label placeholder = new Label("Currently there are no offers available");
         placeholder.setWrapText(true);
-        table.setPlaceholder(placeholder);
+        tableView.setPlaceholder(placeholder);
 
-        setupValidators();
-        setupComparators();
-
-        expand = ImageUtil.getImageViewById(ImageUtil.EXPAND);
-        collapse = ImageUtil.getImageViewById(ImageUtil.COLLAPSE);
-        showAdvancedSettingsButton.setGraphic(expand);
-
-        // for irc demo
-        showAdvancedSettingsButton.setVisible(false);
-        showAdvancedSettingsButton.setManaged(false);
-
-        createListeners();
+        priceColumn.setComparator((o1, o2) -> o1.getOffer().getPrice().compareTo(o2.getOffer().getPrice()));
+        amountColumn.setComparator((o1, o2) -> o1.getOffer().getAmount().compareTo(o2.getOffer().getAmount()));
+        volumeColumn.setComparator((o1, o2) -> o1.getOffer().getOfferVolume().compareTo(o2.getOffer().getOfferVolume()));
+        paymentMethodColumn.setComparator((o1, o2) -> o1.getOffer().getPaymentMethod().compareTo(o2.getOffer().getPaymentMethod()));
     }
 
     @Override
-    public void doActivate() {
-        // reset filter values
-        amountTextField.setText("");
-        priceTextField.setText("");
-        volumeTextField.setText("");
+    protected void activate() {
+        currencyComboBox.setItems(model.getTradeCurrencies());
+        currencyComboBox.getSelectionModel().select(model.getTradeCurrency());
+        currencyComboBox.setVisibleRowCount(Math.min(currencyComboBox.getItems().size(), 25));
+        paymentMethodComboBox.setItems(model.getPaymentMethods());
+        paymentMethodComboBox.getSelectionModel().select(0);
 
-        amountTextField.resetValidation();
-        priceTextField.resetValidation();
-        volumeTextField.resetValidation();
+        currencyComboBox.setOnAction(e -> model.onSetTradeCurrency(currencyComboBox.getSelectionModel().getSelectedItem()));
+        paymentMethodComboBox.setOnAction(e -> model.onSetPaymentMethod(paymentMethodComboBox.getSelectionModel().getSelectedItem()));
+        createOfferButton.setOnAction(e -> onCreateOffer());
+        volumeColumn.textProperty().bind(createStringBinding(
+                () -> BSResources.get("Amount in {0} (Min.)", model.tradeCurrencyCode.get()), model.tradeCurrencyCode));
+        model.getOfferList().comparatorProperty().bind(tableView.comparatorProperty());
 
-        addListeners();
-        addBindings();
 
-        // setOfferBookInfo has been called before
-        table.setItems(model.getOfferList());
+        tableView.setItems(model.getOfferList());
         priceColumn.setSortType((model.getDirection() == Offer.Direction.BUY) ? TableColumn.SortType.ASCENDING : TableColumn.SortType.DESCENDING);
-        table.sort();
+        tableView.sort();
     }
 
     @Override
-    public void doDeactivate() {
-        removeBindings();
-        removeListeners();
-    }
-
-    private void createListeners() {
-        amountTextFieldListener = (observable, oldValue, newValue) -> model.amount.set(newValue);
-        priceTextFieldListener = (observable, oldValue, newValue) -> model.price.set(newValue);
-        volumeTextFieldListener = (observable, oldValue, newValue) -> model.volume.set(newValue);
-
-        amountTextFieldFocusedListener = (ov, oldValue, newValue) -> {
-            if (newValue) {
-                amountTextField.textProperty().unbind();
-                amountTextField.textProperty().addListener(amountTextFieldListener);
-            }
-            else {
-                amountTextField.textProperty().removeListener(amountTextFieldListener);
-                amountTextField.textProperty().bind(model.amount);
-            }
-        };
-        priceTextFieldFocusedListener = (ov, oldValue, newValue) -> {
-            if (newValue) {
-                priceTextField.textProperty().unbind();
-                priceTextField.textProperty().addListener(priceTextFieldListener);
-            }
-            else {
-                priceTextField.textProperty().removeListener(priceTextFieldListener);
-                priceTextField.textProperty().bind(model.price);
-            }
-        };
-        volumeTextFieldFocusedListener = (ov, oldValue, newValue) -> {
-            if (newValue) {
-                volumeTextField.textProperty().unbind();
-                volumeTextField.textProperty().addListener(volumeTextFieldListener);
-            }
-            else {
-                volumeTextField.textProperty().removeListener(volumeTextFieldListener);
-                volumeTextField.textProperty().bind(model.volume);
-            }
-        };
-    }
-
-    private void addListeners() {
-        amountTextField.focusedProperty().addListener(amountTextFieldFocusedListener);
-        priceTextField.focusedProperty().addListener(priceTextFieldFocusedListener);
-        volumeTextField.focusedProperty().addListener(volumeTextFieldFocusedListener);
-    }
-
-    private void removeListeners() {
-        amountTextField.focusedProperty().removeListener(amountTextFieldFocusedListener);
-        priceTextField.focusedProperty().removeListener(priceTextFieldFocusedListener);
-        volumeTextField.focusedProperty().removeListener(volumeTextFieldFocusedListener);
-
-        amountTextField.textProperty().removeListener(amountTextFieldListener);
-        priceTextField.textProperty().removeListener(priceTextFieldListener);
-        volumeTextField.textProperty().removeListener(volumeTextFieldListener);
-    }
-
-    private void addBindings() {
-        // those bindings are unbinded by focus change handlers
-        amountTextField.textProperty().bind(model.amount);
-        priceTextField.textProperty().bind(model.price);
-        volumeTextField.textProperty().bind(model.volume);
-
-        amountBtcLabel.textProperty().bind(model.btcCode);
-        priceFiatLabel.textProperty().bind(model.fiatCode);
-        volumeFiatLabel.textProperty().bind(model.fiatCode);
-        priceDescriptionLabel.textProperty().bind(createStringBinding(() -> BSResources.get("Filter by price in {0}", model.fiatCode.get()), model.fiatCode));
-        volumeDescriptionLabel.textProperty().bind(createStringBinding(() -> BSResources.get("Filter by amount in {0}", model.fiatCode.get()), model.fiatCode));
-        volumeTextField.promptTextProperty().bind(createStringBinding(() -> BSResources.get("Amount in {0}", model.fiatCode.get()), model.fiatCode));
-
-        model.getOfferList().comparatorProperty().bind(table.comparatorProperty());
-    }
-
-    private void removeBindings() {
-        amountTextField.textProperty().unbind();
-        priceTextField.textProperty().unbind();
-        volumeTextField.textProperty().unbind();
-        amountBtcLabel.textProperty().unbind();
-        priceFiatLabel.textProperty().unbind();
-        volumeFiatLabel.textProperty().unbind();
-        priceDescriptionLabel.textProperty().unbind();
-        volumeDescriptionLabel.textProperty().unbind();
-        volumeTextField.promptTextProperty().unbind();
-
+    protected void deactivate() {
+        currencyComboBox.setOnAction(null);
+        paymentMethodComboBox.setOnAction(null);
+        createOfferButton.setOnAction(null);
+        volumeColumn.textProperty().unbind();
         model.getOfferList().comparatorProperty().unbind();
     }
 
-    private void setupValidators() {
-        amountTextField.setValidator(optionalBtcValidator);
-        priceTextField.setValidator(optionalFiatValidator);
-        volumeTextField.setValidator(optionalFiatValidator);
-    }
-
-    private void setupComparators() {
-        priceColumn.setComparator((o1, o2) -> o1.getOffer().getPrice().compareTo(o2.getOffer().getPrice()));
-        amountColumn.setComparator((o1, o2) -> o1.getOffer().getAmount().compareTo(o2.getOffer().getAmount()));
-        volumeColumn.setComparator((o1, o2) ->
-                o1.getOffer().getOfferVolume().compareTo(o2.getOffer().getOfferVolume()));
-      /*  countryColumn.setComparator((o1, o2) -> o1.getOffer().getBankAccountCountry().getName().compareTo(o2
-      .getOffer()
-                .getBankAccountCountry().getName()));*/
-        bankAccountTypeColumn.setComparator((o1, o2) -> o1.getOffer().getFiatAccountType().compareTo(o2.getOffer()
-                .getFiatAccountType()));
-    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API
@@ -285,175 +199,75 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
     // UI actions
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @FXML
-    void createOffer() {
-        if (model.isRegistered()) {
+    private void onCreateOffer() {
+        if (!model.hasPaymentAccount()) {
+            showWarning("You don't have setup a payment account yet.",
+                    "You need to setup your payment account before you can trade.\nDo you want to do this now?", PaymentAccountView.class);
+        } else if (!model.hasPaymentAccountForCurrency()) {
+            showWarning("You don't have a payment account with that selected currency.",
+                    "You need to setup a payment account for the selected currency to be able to trade in that currency.\n" +
+                            "Do you want to do this now?", PaymentAccountView.class);
+        } else if (!model.hasAcceptedArbitrators()) {
+            showWarning("You don't have an arbitrator selected.",
+                    "You need to setup at least one arbitrator to be able to trade.\n" +
+                            "Do you want to do this now?", ArbitratorSelectionView.class);
+        }
+        else {
             createOfferButton.setDisable(true);
-            offerActionHandler.createOffer(model.getAmountAsCoin(), model.getPriceAsCoin());
-        }
-        else {
-            openSetupScreen();
+            offerActionHandler.onCreateOffer(model.getTradeCurrency());
         }
     }
 
-    private void openSetupScreen() {
-        OverlayManager.blurContent();
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.ok")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "OK");
-                Dialog.Actions.OK.handle(actionEvent);
-                navigation.setReturnPath(navigation.getCurrentPath());
-                navigation.navigateTo(MainView.class, AccountView.class, AccountSetupWizard.class);
-            }
-        });
-        Popups.openInfoPopup("You don't have setup a trading account.",
-                "You need to setup your trading account before you can trade.",
-                actions);
-    }
-
-    @FXML
-    void onToggleShowAdvancedSettings() {
-        detailsVisible = !detailsVisible;
-        if (detailsVisible) {
-            showAdvancedSettingsButton.setText(BSResources.get("Hide extended filter options"));
-            showAdvancedSettingsButton.setGraphic(collapse);
-            showDetailsScreen();
-        }
-        else {
-            showAdvancedSettingsButton.setText(BSResources.get("Show more filter options"));
-            showAdvancedSettingsButton.setGraphic(expand);
-            hideDetailsScreen();
+    private void onShowInfo(boolean isPaymentAccountValidForOffer, boolean hasMatchingArbitrator) {
+        if (!hasMatchingArbitrator) {
+            showWarning("You don't have an arbitrator selected.",
+                    "You need to setup at least one arbitrator to be able to trade.\n" +
+                            "Do you want to do this now?", ArbitratorSelectionView.class);
+        } else if (!isPaymentAccountValidForOffer) {
+            showWarning("You don't have a payment account with the payment method required for that offer.",
+                    "You need to setup a payment account with that payment method if you want to take that offer.\n" +
+                            "Do you want to do this now?", PaymentAccountView.class);
         }
     }
 
-    @FXML
-    void onShowOnlyMatching() {
-        Popups.openWarningPopup("Under construction", "This feature is not implemented yet.");
+    private void onTakeOffer(Offer offer) {
+        offerActionHandler.onTakeOffer(offer);
     }
 
-    @FXML
-    void onOpenCountryFilter() {
-        Popups.openWarningPopup("Under construction", "This feature is not implemented yet.");
-    }
-
-    @FXML
-    void onOpenPaymentMethodsFilter() {
-        Popups.openWarningPopup("Under construction", "This feature is not implemented yet.");
-    }
-
-    private void takeOffer(Offer offer) {
-        if (model.isRegistered()) {
-            if (offer.getDirection() == Offer.Direction.BUY) {
-                offerActionHandler.takeOffer(model.getAmountAsCoin(), model.getPriceAsCoin(), offer);
-            }
-            else {
-                offerActionHandler.takeOffer(model.getAmountAsCoin(), model.getPriceAsCoin(), offer);
-            }
-        }
-        else {
-            openSetupScreen();
-        }
-    }
-
-    private void onCancelOpenOffer(Offer offer) {
-        model.onCancelOpenOffer(offer,
+    private void onRemoveOpenOffer(Offer offer) {
+        model.onRemoveOpenOffer(offer,
                 () -> {
                     log.debug("Remove offer was successful");
-                    Popups.openInfoPopup("You can withdraw the funds you paid in from the funds screens.");
+                    new Popup().information("You can withdraw the funds you paid in from the funds screens.").show();
                     navigation.navigateTo(MainView.class, FundsView.class, WithdrawalView.class);
                 },
                 (message) -> {
                     log.error(message);
-                    Popups.openWarningPopup("Remove offer failed", message);
+                    new Popup().warning("Remove offer failed:\n" + message).show();
                 });
 
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // State
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void showDetailsScreen() {
-        if (!advancedScreenInited) {
-            advancedScreenInited = true;
-        }
-
-        toggleDetailsScreen(true);
+    private void showWarning(String masthead, String message, Class target) {
+        new Popup().information(masthead + "\n\n" + message)
+                .onAction(() -> {
+                    navigation.setReturnPath(navigation.getCurrentPath());
+                    navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, target);
+                }).show();
     }
 
-    private void hideDetailsScreen() {
-        toggleDetailsScreen(false);
-    }
-
-    private void toggleDetailsScreen(boolean visible) {
-        root.setVgap(visible ? 5 : 0);
-
-        extendedButton1Label.setVisible(visible);
-        extendedButton1Label.setManaged(visible);
-
-        extendedButton2Label.setVisible(visible);
-        extendedButton2Label.setManaged(visible);
-
-        extendedCheckBoxLabel.setVisible(visible);
-        extendedCheckBoxLabel.setManaged(visible);
-
-        openCountryFilterButton.setVisible(visible);
-        openCountryFilterButton.setManaged(visible);
-
-        openPaymentMethodsFilterButton.setVisible(visible);
-        openPaymentMethodsFilterButton.setManaged(visible);
-
-        showOnlyMatchingCheckBox.setVisible(visible);
-        showOnlyMatchingCheckBox.setManaged(visible);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Utils
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void openRestrictionsWarning(String restrictionsInfo) {
-        OverlayManager.blurContent();
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.yes")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "YES");
-                Dialog.Actions.YES.handle(actionEvent);
-            }
-        });
-        actions.add(new AbstractAction(BSResources.get("shared.no")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "NO");
-                Dialog.Actions.NO.handle(actionEvent);
-            }
-        });
-
-        Action response = Popups.openConfirmPopup("Information",
-                "You do not fulfill the requirements for that offer.",
-                restrictionsInfo,
-                actions);
-
-        Popups.removeBlurContent();
-
-        if (Popups.isYes(response))
-            navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, RestrictionsView.class);
-        else
-            table.getSelectionModel().clearSelection();
-    }
-
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Table
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void setAmountColumnCellFactory() {
-        amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
-        amountColumn.setCellFactory(
+    private TableColumn<OfferBookListItem, OfferBookListItem> getAmountColumn() {
+        TableColumn<OfferBookListItem, OfferBookListItem> column = new TableColumn<OfferBookListItem, OfferBookListItem>("Amount in BTC (Min.)") {
+            {
+                setMinWidth(130);
+            }
+        };
+        column.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
+        column.setCellFactory(
                 new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
                         OfferBookListItem>>() {
                     @Override
@@ -463,16 +277,25 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
                             @Override
                             public void updateItem(final OfferBookListItem item, boolean empty) {
                                 super.updateItem(item, empty);
-                                setText(model.getAmount(item));
+                                if (item != null && !empty)
+                                    setText(model.getAmount(item));
+                                else
+                                    setText("");
                             }
                         };
                     }
                 });
+        return column;
     }
 
-    private void setPriceColumnCellFactory() {
-        priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
-        priceColumn.setCellFactory(
+    private TableColumn<OfferBookListItem, OfferBookListItem> getPriceColumn() {
+        TableColumn<OfferBookListItem, OfferBookListItem> column = new TableColumn<OfferBookListItem, OfferBookListItem>("Price") {
+            {
+                setMinWidth(130);
+            }
+        };
+        column.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
+        column.setCellFactory(
                 new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
                         OfferBookListItem>>() {
                     @Override
@@ -482,16 +305,25 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
                             @Override
                             public void updateItem(final OfferBookListItem item, boolean empty) {
                                 super.updateItem(item, empty);
-                                setText(model.getPrice(item));
+                                if (item != null && !empty)
+                                    setText(model.getPrice(item));
+                                else
+                                    setText("");
                             }
                         };
                     }
                 });
+        return column;
     }
 
-    private void setVolumeColumnCellFactory() {
-        volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
-        volumeColumn.setCellFactory(
+    private TableColumn<OfferBookListItem, OfferBookListItem> getVolumeColumn() {
+        TableColumn<OfferBookListItem, OfferBookListItem> column = new TableColumn<OfferBookListItem, OfferBookListItem>() {
+            {
+                setMinWidth(130);
+            }
+        };
+        column.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
+        column.setCellFactory(
                 new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
                         OfferBookListItem>>() {
                     @Override
@@ -501,101 +333,42 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
                             @Override
                             public void updateItem(final OfferBookListItem item, boolean empty) {
                                 super.updateItem(item, empty);
-                                setText(model.getVolume(item));
+                                if (item != null && !empty)
+                                    setText(model.getVolume(item));
+                                else
+                                    setText("");
                             }
                         };
                     }
                 });
+        return column;
     }
 
-    private void setDirectionColumnCellFactory() {
-        directionColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
-        directionColumn.setCellFactory(
-                new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
-                        OfferBookListItem>>() {
-
+    private TableColumn<OfferBookListItem, OfferBookListItem> getPaymentMethodColumn() {
+        TableColumn<OfferBookListItem, OfferBookListItem> column = new TableColumn<OfferBookListItem, OfferBookListItem>("Payment method") {
+            {
+                setMinWidth(130);
+            }
+        };
+        column.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
+        column.setCellFactory(
+                new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem, OfferBookListItem>>() {
                     @Override
-                    public TableCell<OfferBookListItem, OfferBookListItem> call(
-                            TableColumn<OfferBookListItem, OfferBookListItem> column) {
+                    public TableCell<OfferBookListItem, OfferBookListItem> call(TableColumn<OfferBookListItem, OfferBookListItem> column) {
                         return new TableCell<OfferBookListItem, OfferBookListItem>() {
-                            final ImageView iconView = new ImageView();
-                            final Button button = new Button();
-                            ChangeListener<Country> countryChangeListener;
-                            OfferBookListItem item;
-
-                            {
-                                button.setGraphic(iconView);
-                                button.setMinWidth(70);
-                            }
-
-                            private void verifyIfTradable(final OfferBookListItem item) {
-                                boolean isMatchingRestrictions = model.isTradable(item
-                                        .getOffer());
-                                button.setDisable(!isMatchingRestrictions);
-
-                                TableRow tableRow = getTableRow();
-                                if (tableRow != null)
-                                    tableRow.setOpacity(isMatchingRestrictions ? 1 : 0.4);
-
-                                if (isMatchingRestrictions) {
-                                    button.setDefaultButton(getIndex() == 0);
-                                    if (tableRow != null) {
-                                        getTableRow().setOnMouseClicked(null);
-                                        getTableRow().setTooltip(null);
-                                    }
-                                }
-                                else {
-
-                                    button.setDefaultButton(false);
-                                    if (tableRow != null) {
-                                        getTableRow().setTooltip(new Tooltip("Click for more information."));
-                                        getTableRow().setOnMouseClicked((e) -> openRestrictionsWarning
-                                                (model.restrictionsInfo.get()));
-                                    }
-                                }
-                            }
-
                             @Override
                             public void updateItem(final OfferBookListItem item, boolean empty) {
                                 super.updateItem(item, empty);
-
-                                if (item != null) {
-                                    String title;
-                                    Offer offer = item.getOffer();
-
-                                    if (model.isMyOffer(offer)) {
-                                        iconView.setId("image-remove");
-                                        title = "Remove";
-                                        button.setOnAction(event -> onCancelOpenOffer(item.getOffer()));
-                                    }
-                                    else {
-                                        if (offer.getDirection() == Offer.Direction.SELL)
-                                            iconView.setId("image-buy");
-                                        else
-                                            iconView.setId("image-sell");
-                                        title = model.getDirectionLabel(offer);
-                                        button.setOnAction(event -> takeOffer(item.getOffer()));
-                                    }
-
-
-                                    if (countryChangeListener != null && this.item != null)
-                                        item.bankAccountCountryProperty().removeListener(countryChangeListener);
-
-                                    this.item = item;
-                                    countryChangeListener = (ov, o, n) -> verifyIfTradable(this.item);
-                                    item.bankAccountCountryProperty().addListener(countryChangeListener);
-
-
-                                    verifyIfTradable(item);
-
-                                    button.setText(title);
-                                    setGraphic(button);
-                                }
-                                else {
-                                    if (this.item != null) {
-                                        this.item.bankAccountCountryProperty().removeListener(countryChangeListener);
-                                        this.item = null;
-                                        countryChangeListener = null;
+                                Hyperlink hyperlink = null;
+                                if (item != null && !empty) {
+                                    hyperlink = new Hyperlink(model.getPaymentMethod(item));
+                                    hyperlink.setTooltip(new Tooltip(model.getPaymentMethodToolTip(item)));
+                                    hyperlink.setOnAction(event -> offerDetailsPopup.show(item.getOffer()));
+                                    setGraphic(hyperlink);
+                                } else {
+                                    if (hyperlink != null) {
+                                        hyperlink.setText("");
+                                        hyperlink.setTooltip(null);
                                     }
                                     setGraphic(null);
                                 }
@@ -603,62 +376,96 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
                         };
                     }
                 });
+        return column;
     }
 
-   
-
-   /* private void setCountryColumnCellFactory() {
-        countryColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
-        countryColumn.setCellFactory(
+    private TableColumn<OfferBookListItem, OfferBookListItem> getActionColumn() {
+        TableColumn<OfferBookListItem, OfferBookListItem> column = new TableColumn<OfferBookListItem, OfferBookListItem>("") {
+            {
+                setMinWidth(80);
+                setSortable(false);
+            }
+        };
+        column.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
+        column.setCellFactory(
                 new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
                         OfferBookListItem>>() {
 
                     @Override
-                    public TableCell<OfferBookListItem, OfferBookListItem> call(
-                            TableColumn<OfferBookListItem, OfferBookListItem> column) {
+                    public TableCell<OfferBookListItem, OfferBookListItem> call(TableColumn<OfferBookListItem, OfferBookListItem> column) {
                         return new TableCell<OfferBookListItem, OfferBookListItem>() {
-                            final HBox hBox = new HBox();
+                            final ImageView iconView = new ImageView();
+                            final Button button = new Button();
+                            boolean isTradable;
+                            boolean isPaymentAccountValidForOffer;
+                            boolean hasMatchingArbitrator;
 
                             {
-                                hBox.setSpacing(3);
-                                hBox.setAlignment(Pos.CENTER);
-                                setGraphic(hBox);
+                                button.setGraphic(iconView);
+                                button.setMinWidth(70);
+                            }
+
+                            private void verifyIfTradable(final Offer offer) {
+                                TableRow tableRow = getTableRow();
+                                if (tableRow != null) {
+                                    isPaymentAccountValidForOffer = model.isPaymentAccountValidForOffer(offer);
+                                    hasMatchingArbitrator = model.hasMatchingArbitrator(offer);
+                                    isTradable = isPaymentAccountValidForOffer && hasMatchingArbitrator;
+
+                                    tableRow.setOpacity(isTradable ? 1 : 0.4);
+
+                                    if (isTradable) {
+                                        // set first row button as default
+                                        button.setDefaultButton(getIndex() == 0);
+                                        tableRow.setOnMouseClicked(null);
+                                        // tableRow.setTooltip(null);
+                                    } else {
+                                        button.setDefaultButton(false);
+                                        tableRow.setOnMouseClicked(e -> onShowInfo(isPaymentAccountValidForOffer, hasMatchingArbitrator));
+                                       /* tableRow.setTooltip(
+                                                new Tooltip(hasMatchingArbitrator ? "No matching payment account." : "No matching accepted arbitrators."));*/
+                                    }
+                                }
                             }
 
                             @Override
-                            public void updateItem(final OfferBookListItem offerBookListItem, boolean empty) {
-                                super.updateItem(offerBookListItem, empty);
+                            public void updateItem(final OfferBookListItem newItem, boolean empty) {
+                                super.updateItem(newItem, empty);
 
-                                hBox.getChildren().clear();
-                                if (offerBookListItem != null) {
-                                    Country country = offerBookListItem.getOffer().getBankAccountCountry();
-                                    hBox.getChildren().add(ImageUtil.getCountryIconImageView(offerBookListItem
-                                            .getOffer().getBankAccountCountry()));
-                                    Tooltip.install(this, new Tooltip(country.name));
+                                if (newItem != null && !empty) {
+                                    final Offer offer = newItem.getOffer();
+                                    verifyIfTradable(offer);
+                                    String title;
+                                    if (isTradable) {
+                                        if (model.isMyOffer(offer)) {
+                                            iconView.setId("image-remove");
+                                            title = "Remove";
+                                            button.setOnAction(e -> onRemoveOpenOffer(offer));
+                                        } else {
+                                            iconView.setId(offer.getDirection() == Offer.Direction.SELL ? "image-buy" : "image-sell");
+                                            title = model.getDirectionLabel(offer);
+                                            button.setOnAction(e -> onTakeOffer(offer));
+                                        }
+                                    }
+                                    else {
+                                        title = "Not matching";
+                                        iconView.setId(null);
+                                        button.setOnAction(e -> onShowInfo(isPaymentAccountValidForOffer, hasMatchingArbitrator));
+                                    }
+
+                                    button.setText(title);
+                                    setGraphic(button);
+                                }
+                                else {
+                                    setGraphic(null);
+                                    TableRow tableRow = getTableRow();
+                                    if (tableRow != null) tableRow.setOpacity(1);
                                 }
                             }
                         };
                     }
                 });
-    }*/
-
-    private void setBankAccountTypeColumnCellFactory() {
-        bankAccountTypeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
-        bankAccountTypeColumn.setCellFactory(
-                new Callback<TableColumn<OfferBookListItem, OfferBookListItem>, TableCell<OfferBookListItem,
-                        OfferBookListItem>>() {
-                    @Override
-                    public TableCell<OfferBookListItem, OfferBookListItem> call(
-                            TableColumn<OfferBookListItem, OfferBookListItem> column) {
-                        return new TableCell<OfferBookListItem, OfferBookListItem>() {
-                            @Override
-                            public void updateItem(final OfferBookListItem offerBookListItem, boolean empty) {
-                                super.updateItem(offerBookListItem, empty);
-                                setText(model.getBankAccountType(offerBookListItem));
-                            }
-                        };
-                    }
-                });
+        return column;
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
index 4754afd2c8..45da5c6fec 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
@@ -17,153 +17,89 @@
 
 package io.bitsquare.gui.main.offer.offerbook;
 
-import io.bitsquare.app.BitsquareApp;
+import com.google.inject.Inject;
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.gui.common.model.ActivatableWithDataModel;
-import io.bitsquare.gui.common.model.ViewModel;
+import io.bitsquare.gui.common.model.ActivatableViewModel;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.gui.util.validation.InputValidator;
-import io.bitsquare.gui.util.validation.OptionalBtcValidator;
-import io.bitsquare.gui.util.validation.OptionalFiatValidator;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.locale.CountryUtil;
+import io.bitsquare.locale.CurrencyUtil;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.payment.PaymentMethod;
+import io.bitsquare.payment.SepaAccount;
 import io.bitsquare.trade.offer.Offer;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.utils.Fiat;
-
-import com.google.inject.Inject;
-
+import io.bitsquare.trade.offer.OpenOfferManager;
+import io.bitsquare.user.Preferences;
+import io.bitsquare.user.User;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.List;
+import java.util.Optional;
 
-class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(OfferBookViewModel.class);
-
-    private final OptionalBtcValidator optionalBtcValidator;
+class OfferBookViewModel extends ActivatableViewModel {
+    private final OpenOfferManager openOfferManager;
+    private final User user;
+    private final OfferBook offerBook;
+    private final Preferences preferences;
     private final BSFormatter formatter;
-    private final OptionalFiatValidator optionalFiatValidator;
 
-    final StringProperty amount = new SimpleStringProperty();
-    final StringProperty price = new SimpleStringProperty();
-    final StringProperty volume = new SimpleStringProperty();
-    final StringProperty btcCode = new SimpleStringProperty();
-    final StringProperty fiatCode = new SimpleStringProperty();
-    final StringProperty restrictionsInfo = new SimpleStringProperty();
+    private final FilteredList<OfferBookListItem> filteredItems;
+    private final SortedList<OfferBookListItem> sortedItems;
+    private TradeCurrency tradeCurrency;
 
-    private ChangeListener<String> amountListener;
-    private ChangeListener<String> priceListener;
-    private ChangeListener<String> volumeListener;
-    private ChangeListener<Coin> amountAsCoinListener;
-    private ChangeListener<Fiat> priceAsFiatListener;
-    private ChangeListener<Fiat> volumeAsFiatListener;
+    private Offer.Direction direction;
 
+    private final StringProperty btcCode = new SimpleStringProperty();
+    final StringProperty tradeCurrencyCode = new SimpleStringProperty();
+    private PaymentMethod paymentMethod = new AllPaymentMethodsEntry();
+    private final ObservableList<OfferBookListItem> offerBookListItems;
+    private final ListChangeListener<OfferBookListItem> listChangeListener;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public OfferBookViewModel(OfferBookDataModel dataModel, OptionalFiatValidator optionalFiatValidator,
-                              OptionalBtcValidator optionalBtcValidator, BSFormatter formatter) {
-        super(dataModel);
+    public OfferBookViewModel(User user, OpenOfferManager openOfferManager, OfferBook offerBook,
+                              Preferences preferences,
+                              BSFormatter formatter) {
+        super();
 
-        this.optionalFiatValidator = optionalFiatValidator;
-        this.optionalBtcValidator = optionalBtcValidator;
+        this.openOfferManager = openOfferManager;
+        this.user = user;
+        this.offerBook = offerBook;
+        this.preferences = preferences;
         this.formatter = formatter;
 
-        createListeners();
+        offerBookListItems = offerBook.getOfferBookListItems();
+        listChangeListener = c -> filterList();
+
+        this.filteredItems = new FilteredList<>(offerBookListItems);
+        this.sortedItems = new SortedList<>(filteredItems);
+
+        tradeCurrency = CurrencyUtil.getDefaultFiatCurrency();
+        tradeCurrencyCode.set(tradeCurrency.getCode());
     }
 
     @Override
-    protected void doActivate() {
-        amount.set("");
-        price.set("");
-        volume.set("");
-        
-        addBindings();
-        addListeners();
+    protected void activate() {
+        btcCode.bind(preferences.btcDenominationProperty());
+        offerBookListItems.addListener(listChangeListener);
+        offerBook.fillOfferBookListItems();
+        filterList();
     }
 
     @Override
-    protected void doDeactivate() {
-        removeBindings();
-        removeListeners();
-    }
-
-    private void addBindings() {
-        btcCode.bind(dataModel.btcCode);
-        fiatCode.bind(dataModel.fiatCode);
-        restrictionsInfo.bind(dataModel.restrictionsInfo);
-    }
-
-    private void removeBindings() {
+    protected void deactivate() {
         btcCode.unbind();
-        fiatCode.unbind();
-        restrictionsInfo.unbind();
-    }
-
-    private void createListeners() {
-        amountAsCoinListener = (ov, oldValue, newValue) -> amount.set(formatter.formatCoin(newValue));
-        priceAsFiatListener = (ov, oldValue, newValue) -> price.set(formatter.formatFiat(newValue));
-        volumeAsFiatListener = (ov, oldValue, newValue) -> volume.set(formatter.formatFiat(newValue));
-
-        amountListener = (ov, oldValue, newValue) -> {
-            if (isBtcInputValid(newValue).isValid) {
-                setAmountToModel();
-                setPriceToModel();
-                dataModel.calculateVolume();
-            }
-        };
-        priceListener = (ov, oldValue, newValue) -> {
-            if (isFiatInputValid(newValue).isValid) {
-                setAmountToModel();
-                setPriceToModel();
-                dataModel.calculateVolume();
-            }
-        };
-        volumeListener = (ov, oldValue, newValue) -> {
-            if (isFiatInputValid(newValue).isValid) {
-                setPriceToModel();
-                setVolumeToModel();
-                dataModel.calculateAmount();
-            }
-        };
-    }
-
-    private void addListeners() {
-        // Binding with Bindings.createObjectBinding does not work because of bi-directional binding
-        dataModel.amountAsCoinProperty().addListener(amountAsCoinListener);
-        dataModel.priceAsFiatProperty().addListener(priceAsFiatListener);
-        dataModel.volumeAsFiatProperty().addListener(volumeAsFiatListener);
-
-        // Bidirectional bindings are used for all input fields: amount, price and volume
-        // We do volume/amount calculation during input, so user has immediate feedback
-        amount.addListener(amountListener);
-        price.addListener(priceListener);
-        volume.addListener(volumeListener);
-
-        if (BitsquareApp.DEV_MODE) {
-            amount.set("1");
-            price.set("300");
-            setAmountToModel();
-            setPriceToModel();
-        }
-    }
-
-    private void removeListeners() {
-        amount.removeListener(amountListener);
-        price.removeListener(priceListener);
-        volume.removeListener(volumeListener);
-
-        dataModel.amountAsCoinProperty().removeListener(amountAsCoinListener);
-        dataModel.priceAsFiatProperty().removeListener(priceAsFiatListener);
-        dataModel.volumeAsFiatProperty().removeListener(volumeAsFiatListener);
     }
 
 
@@ -172,7 +108,7 @@ class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> im
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     void setDirection(Offer.Direction direction) {
-        dataModel.setDirection(direction);
+        this.direction = direction;
     }
 
 
@@ -180,8 +116,20 @@ class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> im
     // UI actions
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    void onCancelOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        dataModel.onCancelOpenOffer(offer, resultHandler, errorMessageHandler);
+    public void onSetTradeCurrency(TradeCurrency tradeCurrency) {
+        this.tradeCurrency = tradeCurrency;
+        tradeCurrencyCode.set(tradeCurrency.getCode());
+       /* if (!(tradeCurrency instanceof AllTradeCurrenciesEntry))*/
+        //offerBook.getOffers(tradeCurrencyCode.get());
+    }
+
+    public void onSetPaymentMethod(PaymentMethod paymentMethod) {
+        this.paymentMethod = paymentMethod;
+        filterList();
+    }
+
+    void onRemoveOpenOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        openOfferManager.onRemoveOpenOffer(offer, resultHandler, errorMessageHandler);
     }
 
 
@@ -189,22 +137,35 @@ class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> im
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    boolean isTradable(Offer offer) {
-        return dataModel.isTradable(offer);
-    }
-
     SortedList<OfferBookListItem> getOfferList() {
-        return dataModel.getOfferList();
-    }
-
-    boolean isRegistered() {
-        return dataModel.isRegistered();
+        return sortedItems;
     }
 
     boolean isMyOffer(Offer offer) {
-        return dataModel.isMyOffer(offer);
+        return openOfferManager.isMyOffer(offer);
     }
 
+    Offer.Direction getDirection() {
+        return direction;
+    }
+
+    public ObservableList<TradeCurrency> getTradeCurrencies() {
+        ObservableList<TradeCurrency> list = preferences.getTradeCurrenciesAsObservable();
+       /* list.add(0, new AllTradeCurrenciesEntry());*/
+        return list;
+    }
+
+    public TradeCurrency getTradeCurrency() {
+        return tradeCurrency;
+    }
+
+    public ObservableList<PaymentMethod> getPaymentMethods() {
+        ObservableList<PaymentMethod> list = FXCollections.observableArrayList(PaymentMethod.ALL_VALUES);
+        list.add(0, paymentMethod);
+        return list;
+    }
+
+
     String getAmount(OfferBookListItem item) {
         return (item != null) ? formatter.formatCoin(item.getOffer().getAmount()) +
                 " (" + formatter.formatCoin(item.getOffer().getMinAmount()) + ")" : "";
@@ -219,49 +180,108 @@ class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> im
                 " (" + formatter.formatFiat(item.getOffer().getMinOfferVolume()) + ")" : "";
     }
 
-    String getBankAccountType(OfferBookListItem item) {
-        return (item != null) ? BSResources.get(item.getOffer().getFiatAccountType().toString()) : "";
+    String getPaymentMethod(OfferBookListItem item) {
+        String result = "";
+        if (item != null) {
+            Offer offer = item.getOffer();
+            String method = BSResources.get(offer.getPaymentMethod().getId());
+            String methodCountryCode = offer.getPaymentMethodCountryCode();
+
+            if (methodCountryCode != null)
+                result = method + " (" + methodCountryCode + ")";
+            else
+                result = method;
+        }
+        return result;
+    }
+
+    String getPaymentMethodToolTip(OfferBookListItem item) {
+        String result = "";
+        if (item != null) {
+            Offer offer = item.getOffer();
+            String method = BSResources.get(offer.getPaymentMethod().getId());
+            String methodCountryCode = offer.getPaymentMethodCountryCode();
+
+            if (methodCountryCode != null)
+                result = method + "\nOfferers country of bank: " + CountryUtil.getNameByCode(methodCountryCode);
+            else
+                result = method;
+
+            List<String> acceptedCountryCodes = offer.getAcceptedCountryCodes();
+            if (acceptedCountryCodes != null && acceptedCountryCodes.size() > 0) {
+                if (CountryUtil.containsAllSepaEuroCountries(acceptedCountryCodes))
+                    result += "\nAccepted taker countries: All Euro countries";
+                else
+                    result += "\nAccepted taker countries: " + CountryUtil.getNamesByCodesString(acceptedCountryCodes);
+            }
+        }
+        return result;
     }
 
     String getDirectionLabel(Offer offer) {
-        return formatter.formatDirection(offer.getMirroredDirection());
-    }
-
-    Offer.Direction getDirection() {
-        return dataModel.getDirection();
-    }
-
-    Coin getAmountAsCoin() {
-        return dataModel.getAmountAsCoin();
-    }
-
-    Fiat getPriceAsCoin() {
-        return dataModel.getPriceAsFiat();
+        return formatter.getDirection(offer.getMirroredDirection());
     }
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Utils
+    // Checks
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private InputValidator.ValidationResult isBtcInputValid(String input) {
-        return optionalBtcValidator.validate(input);
+    boolean hasPaymentAccount() {
+        return user.currentPaymentAccountProperty().get() != null;
     }
 
-    private InputValidator.ValidationResult isFiatInputValid(String input) {
-        return optionalFiatValidator.validate(input);
+    boolean isPaymentAccountValidForOffer(Offer offer) {
+
+        Optional<TradeCurrency> result1 = user.getPaymentAccounts().stream()
+                .filter(paymentAccount -> paymentAccount.getPaymentMethod().equals(offer.getPaymentMethod()))
+                .filter(paymentAccount -> {
+                    List<String> offerAcceptedCountryCodes = offer.getAcceptedCountryCodes();
+                    if (offerAcceptedCountryCodes != null && paymentAccount instanceof SepaAccount) {
+                        return ((SepaAccount) paymentAccount).getAcceptedCountryCodes().stream()
+                                .filter(offerAcceptedCountryCodes::contains)
+                                .findAny().isPresent();
+                    } else {
+                        return true;
+                    }
+                })
+                .flatMap(paymentAccount -> paymentAccount.getTradeCurrencies().stream())
+                .filter(currency -> currency.getCode().equals(offer.getCurrencyCode())).findAny();
+        return result1.isPresent();
     }
 
-    private void setAmountToModel() {
-        dataModel.setAmount(formatter.parseToCoinWith4Decimals(amount.get()));
+    public boolean hasPaymentAccountForCurrency() {
+        return user.hasPaymentAccountForCurrency(tradeCurrency);
     }
 
-    private void setPriceToModel() {
-        dataModel.setPrice(formatter.parseToFiatWith2Decimals(price.get()));
+    boolean hasAcceptedArbitrators() {
+        return user.getAcceptedArbitrators() != null && !user.getAcceptedArbitrators().isEmpty();
     }
 
-    private void setVolumeToModel() {
-        dataModel.setVolume(formatter.parseToFiatWith2Decimals(volume.get()));
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Filters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private void filterList() {
+        filteredItems.setPredicate(offerBookListItem -> {
+            Offer offer = offerBookListItem.getOffer();
+            boolean directionResult = offer.getDirection() != direction;
+            boolean paymentMethodResult = true;
+            if (!(paymentMethod instanceof AllPaymentMethodsEntry))
+                paymentMethodResult = offer.getPaymentMethod().equals(paymentMethod);
+
+            return directionResult && paymentMethodResult;
+        });
     }
 
+
+    public boolean hasMatchingArbitrator(Offer offer) {
+        for (Address offerArbitratorAddress : offer.getArbitratorAddresses()) {
+            for (Address acceptedArbitratorAddress : user.getAcceptedArbitratorAddresses()) {
+                if (offerArbitratorAddress.equals(acceptedArbitratorAddress))
+                    return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
index bd6b07eaf4..3373913a8a 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
@@ -17,90 +17,217 @@
 
 package io.bitsquare.gui.main.offer.takeoffer;
 
+import com.google.inject.Inject;
+import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
+import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.gui.common.model.ActivatableDataModel;
+import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.payment.PaymentAccount;
+import io.bitsquare.payment.PaymentMethod;
 import io.bitsquare.trade.TradeManager;
-import io.bitsquare.trade.handlers.TakeOfferResultHandler;
+import io.bitsquare.trade.handlers.TradeResultHandler;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.user.Preferences;
-
+import io.bitsquare.user.User;
+import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
 import org.bitcoinj.utils.Fiat;
-
-import com.google.inject.Inject;
-
-import javafx.application.Platform;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
 import org.jetbrains.annotations.NotNull;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
 
-class TakeOfferDataModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(TakeOfferDataModel.class);
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
+/**
+ * Domain for that UI element.
+ * Note that the create offer domain has a deeper scope in the application domain (TradeManager).
+ * That model is just responsible for the domain specific parts displayed needed in that UI element.
+ */
+class TakeOfferDataModel extends ActivatableDataModel {
     private final TradeManager tradeManager;
+    private final TradeWalletService tradeWalletService;
     private final WalletService walletService;
+    private final User user;
+    private final WalletPasswordPopup walletPasswordPopup;
     private final Preferences preferences;
 
+    private final Coin offerFeeAsCoin;
+    private final Coin networkFeeAsCoin;
+    private final Coin securityDepositAsCoin;
+
     private Offer offer;
     private AddressEntry addressEntry;
 
     final StringProperty btcCode = new SimpleStringProperty();
-
-    final BooleanProperty isWalletFunded = new SimpleBooleanProperty();
     final BooleanProperty useMBTC = new SimpleBooleanProperty();
-
+    final BooleanProperty isWalletFunded = new SimpleBooleanProperty();
     final ObjectProperty<Coin> amountAsCoin = new SimpleObjectProperty<>();
     final ObjectProperty<Fiat> volumeAsFiat = new SimpleObjectProperty<>();
     final ObjectProperty<Coin> totalToPayAsCoin = new SimpleObjectProperty<>();
-    final ObjectProperty<Coin> securityDepositAsCoin = new SimpleObjectProperty<>();
-    final ObjectProperty<Coin> offerFeeAsCoin = new SimpleObjectProperty<>();
-    final ObjectProperty<Coin> networkFeeAsCoin = new SimpleObjectProperty<>();
 
     private BalanceListener balanceListener;
+    private PaymentAccount paymentAccount;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+
     @Inject
-    public TakeOfferDataModel(TradeManager tradeManager,
-                              WalletService walletService,
-                              Preferences preferences) {
+    TakeOfferDataModel(TradeManager tradeManager, TradeWalletService tradeWalletService,
+                       WalletService walletService, User user, WalletPasswordPopup walletPasswordPopup,
+                       Preferences preferences) {
         this.tradeManager = tradeManager;
+        this.tradeWalletService = tradeWalletService;
         this.walletService = walletService;
+        this.user = user;
+        this.walletPasswordPopup = walletPasswordPopup;
         this.preferences = preferences;
 
-        offerFeeAsCoin.set(FeePolicy.CREATE_OFFER_FEE);
-        networkFeeAsCoin.set(FeePolicy.TX_FEE);
+        offerFeeAsCoin = FeePolicy.CREATE_OFFER_FEE;
+        networkFeeAsCoin = FeePolicy.TX_FEE;
+        securityDepositAsCoin = FeePolicy.SECURITY_DEPOSIT;
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
+        // when leaving screen we reset state
+        offer.setState(Offer.State.UNDEFINED);
+
         addBindings();
         addListeners();
+        updateBalance(walletService.getBalanceForAddress(addressEntry.getAddress()));
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         removeBindings();
         removeListeners();
         tradeManager.onCancelAvailabilityRequest(offer);
     }
 
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // API
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    // called before activate
+    void initWithData(Offer offer) {
+        this.offer = offer;
+
+        ObservableList<PaymentAccount> possiblePaymentAccounts = getPossiblePaymentAccounts();
+        checkArgument(!possiblePaymentAccounts.isEmpty(), "possiblePaymentAccounts.isEmpty()");
+        paymentAccount = possiblePaymentAccounts.get(0);
+
+        amountAsCoin.set(offer.getAmount());
+
+        calculateVolume();
+        calculateTotalToPay();
+
+        addressEntry = walletService.getAddressEntryByOfferId(offer.getId());
+        checkNotNull(addressEntry, "addressEntry must not be null");
+
+        balanceListener = new BalanceListener(addressEntry.getAddress()) {
+            @Override
+            public void onBalanceChanged(@NotNull Coin balance) {
+                updateBalance(balance);
+            }
+        };
+
+        offer.resetState();
+    }
+
+    void checkOfferAvailability(ResultHandler resultHandler) {
+        tradeManager.checkOfferAvailability(offer, resultHandler);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // UI actions
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    // errorMessageHandler is used only in the check availability phase. As soon we have a trade we write the error msg in the trade object as we want to 
+    // have it persisted as well.
+    void onTakeOffer(TradeResultHandler tradeResultHandler) {
+        if (walletService.getWallet().isEncrypted() && tradeWalletService.getAesKey() == null) {
+            walletPasswordPopup.show().onAesKey(aesKey -> {
+                tradeWalletService.setAesKey(aesKey);
+                doTakeOffer(tradeResultHandler);
+            });
+        } else {
+            doTakeOffer(tradeResultHandler);
+        }
+    }
+
+    private void doTakeOffer(TradeResultHandler tradeResultHandler) {
+        tradeManager.onTakeOffer(amountAsCoin.get(),
+                offer,
+                paymentAccount.getId(),
+                tradeResultHandler
+        );
+    }
+
+    void onSecurityDepositInfoDisplayed() {
+        preferences.setDisplaySecurityDepositInfo(false);
+    }
+
+    public void onPaymentAccountSelected(PaymentAccount paymentAccount) {
+        if (paymentAccount != null)
+            this.paymentAccount = paymentAccount;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    Offer.Direction getDirection() {
+        return offer.getDirection();
+    }
+
+    boolean getDisplaySecurityDepositInfo() {
+        return preferences.getDisplaySecurityDepositInfo();
+    }
+
+    public Offer getOffer() {
+        return offer;
+    }
+
+    ObservableList<PaymentAccount> getPossiblePaymentAccounts() {
+        ObservableList<PaymentAccount> paymentAccounts = FXCollections.observableArrayList(new ArrayList<>());
+        for (PaymentAccount paymentAccount : user.getPaymentAccounts()) {
+            if (paymentAccount.getPaymentMethod().equals(offer.getPaymentMethod())) {
+                for (TradeCurrency tradeCurrency : paymentAccount.getTradeCurrencies()) {
+                    if (tradeCurrency.getCode().equals(offer.getCurrencyCode())) {
+                        paymentAccounts.add(paymentAccount);
+                    }
+                }
+            }
+        }
+        return paymentAccounts;
+    }
+
+    boolean hasAcceptedArbitrators() {
+        return user.getAcceptedArbitrators().size() > 0;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Bindings, listeners
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
     private void addBindings() {
         btcCode.bind(preferences.btcDenominationProperty());
     }
@@ -114,54 +241,7 @@ class TakeOfferDataModel implements Activatable, DataModel {
     }
 
     private void removeListeners() {
-        if (addressEntry != null)
-            walletService.removeBalanceListener(balanceListener);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // API
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    void initWithData(Coin amount, Offer offer) {
-        this.offer = offer;
-        securityDepositAsCoin.set(offer.getSecurityDeposit());
-
-        if (amount != null && !amount.isGreaterThan(offer.getAmount()) && !offer.getMinAmount().isGreaterThan(amount))
-            amountAsCoin.set(amount);
-        else
-            amountAsCoin.set(offer.getAmount());
-
-        calculateVolume();
-        calculateTotalToPay();
-
-        addressEntry = walletService.getAddressEntry(offer.getId());
-        assert addressEntry != null;
-
-        balanceListener = new BalanceListener(addressEntry.getAddress()) {
-            @Override
-            public void onBalanceChanged(@NotNull Coin balance) {
-                updateBalance(balance);
-            }
-        };
-        updateBalance(walletService.getBalanceForAddress(addressEntry.getAddress()));
-
-        // delay a bit to get the listeners called
-        offer.resetState();
-        Platform.runLater(() -> tradeManager.onCheckOfferAvailability(offer));
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // UI calls
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    void onTakeOffer(TakeOfferResultHandler handler) {
-        tradeManager.onTakeOffer(amountAsCoin.get(), offer, handler);
-    }
-
-    void onSecurityDepositInfoDisplayed() {
-        preferences.setDisplaySecurityDepositInfo(false);
+        walletService.removeBalanceListener(balanceListener);
     }
 
 
@@ -180,25 +260,15 @@ class TakeOfferDataModel implements Activatable, DataModel {
 
     void calculateTotalToPay() {
         if (getDirection() == Offer.Direction.SELL)
-            totalToPayAsCoin.set(offerFeeAsCoin.get().add(networkFeeAsCoin.get()).add(securityDepositAsCoin.get()));
+            totalToPayAsCoin.set(offerFeeAsCoin.add(networkFeeAsCoin).add(securityDepositAsCoin));
         else
-            totalToPayAsCoin.set(offerFeeAsCoin.get().add(networkFeeAsCoin.get()).add(securityDepositAsCoin.get()).add(amountAsCoin.get()));
+            totalToPayAsCoin.set(offerFeeAsCoin.add(networkFeeAsCoin).add(securityDepositAsCoin).add(amountAsCoin.get()));
     }
 
     private void updateBalance(@NotNull Coin balance) {
         isWalletFunded.set(totalToPayAsCoin.get() != null && balance.compareTo(totalToPayAsCoin.get()) >= 0);
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Getters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    Offer.Direction getDirection() {
-        return offer.getDirection();
-    }
-
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     boolean isMinAmountLessOrEqualAmount() {
         //noinspection SimplifiableIfStatement
         if (offer != null && offer.getMinAmount() != null && amountAsCoin.get() != null)
@@ -213,15 +283,39 @@ class TakeOfferDataModel implements Activatable, DataModel {
         return true;
     }
 
-    boolean getDisplaySecurityDepositInfo() {
-        return preferences.getDisplaySecurityDepositInfo();
+    public PaymentMethod getPaymentMethod() {
+        return offer.getPaymentMethod();
     }
 
-    WalletService getWalletService() {
-        return walletService;
+    public TradeCurrency getTradeCurrency() {
+        return new TradeCurrency(offer.getCurrencyCode());
     }
 
-    AddressEntry getAddressEntry() {
+    public Coin getSecurityDepositAsCoin() {
+        return securityDepositAsCoin;
+    }
+
+    public Coin getOfferFeeAsCoin() {
+        return offerFeeAsCoin;
+    }
+
+    public Coin getNetworkFeeAsCoin() {
+        return networkFeeAsCoin;
+    }
+
+    public AddressEntry getAddressEntry() {
         return addressEntry;
     }
+
+    public boolean getShowTakeOfferConfirmation() {
+        return preferences.getShowTakeOfferConfirmation();
+    }
+
+    public void setShowTakeOfferConfirmation(boolean selected) {
+        preferences.setShowTakeOfferConfirmation(selected);
+    }
+
+    public List<Arbitrator> getArbitrators() {
+        return user.getAcceptedArbitrators();
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml
index fbc902178d..1c5dad029b 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml
@@ -17,265 +17,8 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.AddressTextField?>
-<?import io.bitsquare.gui.components.BalanceTextField?>
-<?import io.bitsquare.gui.components.InfoDisplay?>
-<?import io.bitsquare.gui.components.InputTextField?>
-<?import io.bitsquare.gui.components.TitledGroupBg?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?import javafx.scene.layout.AnchorPane?>
 <AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.offer.takeoffer.TakeOfferView"
-            AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0"
-            AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
             xmlns:fx="http://javafx.com/fxml">
 
-    <ScrollPane fx:id="scrollPane" onScroll="#onScroll" hbarPolicy="NEVER" vbarPolicy="NEVER" fitToWidth="true" fitToHeight="true"
-                AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
-                AnchorPane.bottomAnchor="0.0">
-
-        <!--suppress JavaFxUnresolvedFxIdReference -->
-        <GridPane fx:id="gridPane" hgap="5.0" vgap="5.0">
-            <padding>
-                <Insets bottom="-10.0" left="25.0" top="30.0" right="25"/>
-            </padding>
-
-            <!--
-            Amount/Price group
-             -->
-            <TitledGroupBg fx:id="priceAmountPane" text="%takeOffer.amountPriceBox.title"
-                           GridPane.rowSpan="3" GridPane.columnSpan="3"/>
-
-            <VBox alignment="CENTER" spacing="6" GridPane.rowSpan="2">
-                <GridPane.margin>
-                    <Insets bottom="10.0" left="10.0" right="10.0" top="20.0"/>
-                </GridPane.margin>
-                <ImageView fx:id="imageView" pickOnBounds="true"/>
-                <Label fx:id="buyLabel" id="direction-icon-label" text="%takeOffer.amountPriceBox.subTitle"
-                       alignment="CENTER">
-                    <padding>
-                        <Insets top="-5.0"/>
-                    </padding>
-                </Label>
-            </VBox>
-
-            <HBox GridPane.columnIndex="1" alignment="CENTER_LEFT" spacing="5"
-                    >
-                <GridPane.margin>
-                    <Insets right="10.0" top="20.0"/>
-                </GridPane.margin>
-                <VBox spacing="4">
-                    <Label fx:id="amountDescriptionLabel" id="input-description-label" prefWidth="170"/>
-                    <HBox>
-                        <InputTextField fx:id="amountTextField" id="text-input-with-currency-text-field"
-                                        promptText="%takeOffer.amount.prompt" prefWidth="170"
-                                        alignment="CENTER_RIGHT"/>
-                        <Label fx:id="amountBtcLabel" id="currency-info-label"/>
-                    </HBox>
-                </VBox>
-                <Label text="x">
-                    <font>
-                        <Font name="Helvetica-Bold" size="20.0"/>
-                    </font>
-                    <padding>
-                        <Insets top="14.0" left="3" right="3"/>
-                    </padding>
-                </Label>
-
-                <VBox spacing="4">
-                    <Label fx:id="priceDescriptionLabel" id="input-description-label" prefWidth="170"/>
-                    <TextField fx:id="priceTextField" id="text-input-with-currency-text-field"
-                               prefWidth="170" alignment="CENTER_RIGHT" mouseTransparent="true" editable="false"
-                               focusTraversable="false"/>
-                </VBox>
-
-                <Label text="=">
-                    <font>
-                        <Font name="Helvetica-Bold" size="20.0"/>
-                    </font>
-                    <padding>
-                        <Insets top="14.0" left="2" right="2"/>
-                    </padding>
-                </Label>
-
-                <VBox spacing="4">
-                    <Label fx:id="volumeDescriptionLabel" id="input-description-label" prefWidth="170"/>
-                    <TextField fx:id="volumeTextField" id="text-input-with-currency-text-field"
-                               prefWidth="170" alignment="CENTER_RIGHT" mouseTransparent="true" editable="false"
-                               focusTraversable="false"/>
-                </VBox>
-            </HBox>
-
-            <VBox GridPane.columnIndex="1" GridPane.rowIndex="1" spacing="4"
-                    >
-                <GridPane.margin>
-                    <Insets right="10.0" top="5.0" bottom="5.0"/>
-                </GridPane.margin>
-                <Label id="input-description-label" text="%takeOffer.amountPriceBox.amountRangeDescription"
-                       prefWidth="170" textAlignment="CENTER"/>
-                <Label fx:id="amountRangeTextField" id="label-with-background" prefWidth="170"
-                       style=" -fx-alignment: center;"/>
-            </VBox>
-
-            <InfoDisplay fx:id="amountPriceBoxInfoDisplay" gridPane="$gridPane" onAction="#onOpenGeneralHelp" rowIndex="2"/>
-
-            <Label fx:id="isOfferAvailableLabel" text="%takeOffer.fundsBox.isOfferAvailable" GridPane.rowIndex="3">
-                <GridPane.margin>
-                    <Insets top="15.0"/>
-                </GridPane.margin>
-            </Label>
-            <ProgressIndicator fx:id="isOfferAvailableProgressIndicator" progress="-1" maxWidth="24" maxHeight="24"
-                               GridPane.rowIndex="3" GridPane.columnIndex="1" GridPane.halignment="LEFT">
-                <GridPane.margin>
-                    <Insets top="15.0"/>
-                </GridPane.margin>
-            </ProgressIndicator>
-            <Button fx:id="showPaymentInfoScreenButton" text="%takeOffer.amountPriceBox.next" id="show-details-button"
-                    GridPane.columnIndex="1" GridPane.rowIndex="3" defaultButton="true" visible="false"
-                    onAction="#onShowPaymentScreen">
-                <GridPane.margin>
-                    <Insets top="15.0"/>
-                </GridPane.margin>
-            </Button>
-
-            <!--
-            Pay funds group
-            -->
-            <TitledGroupBg fx:id="payFundsPane" text="%takeOffer.fundsBox.title" GridPane.rowIndex="4"
-                           GridPane.rowSpan="4" GridPane.columnSpan="3" visible="false"/>
-
-            <HBox GridPane.rowIndex="4" spacing="4" alignment="CENTER_RIGHT">
-                <Label fx:id="totalToPayLabel" text="%takeOffer.fundsBox.totalsNeeded" visible="false"/>
-                <Label fx:id="totalToPayInfoIconLabel" visible="false"/>
-                <GridPane.margin>
-                    <Insets top="10.0"/>
-                </GridPane.margin>
-            </HBox>
-            <TextField fx:id="totalToPayTextField" promptText="%takeOffer.fundsBox.totalsNeeded.prompt"
-                       GridPane.columnIndex="1" GridPane.rowIndex="4" editable="false"
-                       focusTraversable="false" visible="false">
-                <GridPane.margin>
-                    <Insets top="10.0"/>
-                </GridPane.margin>
-            </TextField>
-
-            <Label fx:id="addressLabel" text="%takeOffer.fundsBox.address" GridPane.rowIndex="5" visible="false"/>
-            <AddressTextField fx:id="addressTextField" GridPane.columnIndex="1" GridPane.rowIndex="5"
-                              focusTraversable="true" visible="false"/>
-
-            <Label fx:id="balanceLabel" text="%takeOffer.fundsBox.balance" GridPane.rowIndex="6" visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </Label>
-            <BalanceTextField fx:id="balanceTextField" GridPane.columnIndex="1" GridPane.rowIndex="6"
-                              focusTraversable="false" visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </BalanceTextField>
-
-            <InfoDisplay fx:id="fundsBoxInfoDisplay" gridPane="$gridPane" onAction="#onOpenFundingHelp" rowIndex="7" visible="false"/>
-
-            <HBox spacing="10" GridPane.columnIndex="1" GridPane.rowIndex="8">
-                <Button fx:id="showAdvancedSettingsButton" text="%takeOffer.fundsBox.showAdvanced"
-                        onAction="#onToggleShowAdvancedSettings" visible="false"/>
-                <Button fx:id="takeOfferButton" text="%takeOffer.fundsBox.takeOffer" visible="false"
-                        defaultButton="true"
-                        onAction="#onTakeOffer"/>
-                <ProgressIndicator fx:id="takeOfferSpinner" progress="0" visible="false" prefHeight="24"
-                                   prefWidth="24"/>
-                <Label fx:id="takeOfferSpinnerInfoLabel" text="%takeOffer.fundsBox.takeOfferSpinnerInfo"
-                       visible="false">
-                    <padding>
-                        <Insets top="5.0"/>
-                    </padding>
-                </Label>
-                <GridPane.margin>
-                    <Insets bottom="30" top="15.0"/>
-                </GridPane.margin>
-            </HBox>
-
-            <!--
-            Advanced settings group
-            -->
-            <TitledGroupBg fx:id="showDetailsPane" text="%takeOffer.advancedBox.title" GridPane.columnSpan="3"
-                           GridPane.rowIndex="9" GridPane.rowSpan="7" visible="false"/>
-
-            <Label fx:id="acceptedCountriesLabel" text="%takeOffer.advancedBox.countries" GridPane.rowIndex="9"
-                   visible="false">
-                <GridPane.margin>
-                    <Insets top="0.0"/>
-                </GridPane.margin>
-            </Label>
-            <TextField fx:id="acceptedCountriesTextField" GridPane.columnIndex="1" GridPane.rowIndex="9"
-                       mouseTransparent="true" visible="false" editable="false" focusTraversable="false"/>
-
-            <Label fx:id="acceptedLanguagesLabel" text="%takeOffer.advancedBox.languages" GridPane.rowIndex="10"
-                   visible="false"/>
-            <TextField fx:id="acceptedLanguagesTextField" GridPane.columnIndex="1" GridPane.rowIndex="10"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false"/>
-
-            <Label fx:id="acceptedArbitratorsLabel" text="%takeOffer.advancedBox.arbitrators" GridPane.rowIndex="11"
-                   visible="false"/>
-            <TextField fx:id="acceptedArbitratorsTextField" GridPane.columnIndex="1" GridPane.rowIndex="11"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false"/>
-
-            <Label fx:id="bankAccountTypeLabel" text="%takeOffer.advancedBox.txType" GridPane.rowIndex="12"
-                   visible="false"/>
-            <TextField fx:id="bankAccountTypeTextField" GridPane.columnIndex="1" GridPane.rowIndex="12" editable="false"
-                       mouseTransparent="true" focusTraversable="false" visible="false"/>
-
-            <Label fx:id="bankAccountCurrencyLabel" text="%takeOffer.advancedBox.currency" GridPane.rowIndex="13"
-                   visible="false"/>
-            <TextField fx:id="bankAccountCurrencyTextField" GridPane.rowIndex="13" GridPane.columnIndex="1"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false"/>
-
-            <Label fx:id="bankAccountCountyLabel" text="%takeOffer.advancedBox.county" GridPane.rowIndex="14"
-                   visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </Label>
-            <TextField fx:id="bankAccountCountyTextField" GridPane.rowIndex="14" GridPane.columnIndex="1"
-                       mouseTransparent="true" editable="false" focusTraversable="false" visible="false">
-                <GridPane.margin>
-                    <Insets bottom="5.0"/>
-                </GridPane.margin>
-            </TextField>
-
-            <InfoDisplay fx:id="advancedInfoDisplay" gridPane="$gridPane" onAction="#onOpenAdvancedSettingsHelp"
-                         rowIndex="15" visible="false"
-                         text="%takeOffer.advancedBox.info">
-            </InfoDisplay>
-
-            <columnConstraints>
-                <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
-                <ColumnConstraints hgrow="ALWAYS"/>
-            </columnConstraints>
-
-            <rowConstraints>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints/>
-                <RowConstraints minHeight="35"/>
-            </rowConstraints>
-
-        </GridPane>
-    </ScrollPane>
 </AnchorPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
index 245b0fb426..cdf317ed11 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
@@ -17,94 +17,98 @@
 
 package io.bitsquare.gui.main.offer.takeoffer;
 
-
+import de.jensd.fx.fontawesome.AwesomeDude;
+import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.app.BitsquareApp;
+import io.bitsquare.common.util.Tuple2;
+import io.bitsquare.common.util.Tuple3;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.AddressTextField;
 import io.bitsquare.gui.components.BalanceTextField;
-import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.gui.main.account.AccountView;
+import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView;
+import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.offer.OfferView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
-import io.bitsquare.gui.util.ImageUtil;
+import io.bitsquare.gui.popups.OfferDetailsPopup;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.util.BSFormatter;
+import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.payment.PaymentAccount;
 import io.bitsquare.trade.offer.Offer;
-
-import org.bitcoinj.core.Coin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import javafx.application.Platform;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.geometry.Point2D;
-import javafx.geometry.VPos;
+import javafx.geometry.*;
 import javafx.scene.control.*;
-import javafx.scene.image.*;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.*;
+import javafx.scene.text.Font;
 import javafx.stage.Window;
-
-import de.jensd.fx.fontawesome.AwesomeDude;
-import de.jensd.fx.fontawesome.AwesomeIcon;
-
+import javafx.util.StringConverter;
 import org.controlsfx.control.PopOver;
 import org.controlsfx.control.action.AbstractAction;
 import org.controlsfx.control.action.Action;
 import org.controlsfx.dialog.Dialog;
+import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.Subscription;
 
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
+import static io.bitsquare.gui.util.FormBuilder.*;
 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.
 @FxmlView
 public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOfferViewModel> {
 
+    // TODO convert unneeded properties to static fields
+
     private final Navigation navigation;
+    private final BSFormatter formatter;
+    private final OfferDetailsPopup offerDetailsPopup;
 
-    @FXML ScrollPane scrollPane;
-    @FXML ImageView imageView;
-    @FXML InputTextField amountTextField;
-    @FXML AddressTextField addressTextField;
-    @FXML BalanceTextField balanceTextField;
-    @FXML ProgressIndicator takeOfferSpinner, isOfferAvailableProgressIndicator;
-    @FXML InfoDisplay amountPriceBoxInfoDisplay, advancedInfoDisplay, fundsBoxInfoDisplay;
-    @FXML TitledGroupBg priceAmountPane, payFundsPane, showDetailsPane;
-    @FXML Button showPaymentInfoScreenButton, showAdvancedSettingsButton, takeOfferButton;
-    @FXML TextField priceTextField, volumeTextField, acceptedArbitratorsTextField, totalToPayTextField,
-            bankAccountTypeTextField, bankAccountCurrencyTextField, bankAccountCountyTextField,
-            acceptedCountriesTextField, acceptedLanguagesTextField;
-    @FXML Label isOfferAvailableLabel, buyLabel, addressLabel, amountDescriptionLabel, amountRangeTextField, balanceLabel, totalToPayLabel,
-            totalToPayInfoIconLabel,
-            bankAccountTypeLabel, bankAccountCurrencyLabel, bankAccountCountyLabel, acceptedCountriesLabel,
-            acceptedLanguagesLabel, acceptedArbitratorsLabel, amountBtcLabel, priceDescriptionLabel,
-            volumeDescriptionLabel, takeOfferSpinnerInfoLabel;
+    private ScrollPane scrollPane;
+    private GridPane gridPane;
+    private ImageView imageView;
+    private AddressTextField addressTextField;
+    private BalanceTextField balanceTextField;
+    private ProgressIndicator takeOfferSpinner;
+    private TitledGroupBg payFundsPane;
+    private Button showPaymentButton, takeOfferButton;
+    private InputTextField amountTextField;
+    private TextField paymentMethodTextField, currencyTextField, totalToPayTextField, priceTextField, volumeTextField, amountRangeTextField;
+    private Label buyLabel, amountDescriptionLabel, addressLabel, balanceLabel, totalToPayLabel, totalToPayInfoIconLabel,
+            amountBtcLabel, priceCurrencyLabel,
+            volumeCurrencyLabel, amountRangeBtcLabel, priceDescriptionLabel, volumeDescriptionLabel, takeOfferSpinnerInfoLabel;
 
-    private ImageView expand;
-    private ImageView collapse;
     private PopOver totalToPayInfoPopover;
 
     private OfferView.CloseHandler closeHandler;
 
-    private ChangeListener<String> errorMessageChangeListener;
     private ChangeListener<Boolean> amountFocusedListener;
-    private ChangeListener<Boolean> isTakeOfferSpinnerVisibleListener;
-    private ChangeListener<TakeOfferViewModel.State> stateListener;
-    private ChangeListener<Boolean> showWarningInvalidBtcDecimalPlacesListener;
-    private ChangeListener<Boolean> showTransactionPublishedScreenListener;
+
+    private int gridRow = 0;
+    private ComboBox<PaymentAccount> paymentAccountsComboBox;
+    private Label paymentAccountsLabel;
+    private Label paymentMethodLabel;
+    private Subscription offerWarningSubscription;
+    private Subscription errorMessageSubscription;
+    private Subscription isTakeOfferSpinnerVisibleSubscription;
+    private Subscription showWarningInvalidBtcDecimalPlacesSubscription;
+    private Subscription showTransactionPublishedScreenSubscription;
+    private Subscription showCheckAvailabilityPopupSubscription;
+    private SimpleBooleanProperty errorPopupDisplayed;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -112,151 +116,151 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private TakeOfferView(TakeOfferViewModel model, Navigation navigation) {
+    private TakeOfferView(TakeOfferViewModel model, Navigation navigation, BSFormatter formatter, OfferDetailsPopup offerDetailsPopup) {
         super(model);
 
         this.navigation = navigation;
-
-        createListeners();
+        this.formatter = formatter;
+        this.offerDetailsPopup = offerDetailsPopup;
     }
 
     @Override
-    public void initialize() {
+    protected void initialize() {
+        addScrollPane();
+        addGridPane();
+        addPaymentGroup();
+        addAmountPriceGroup();
+        addFundingGroup();
+
+        amountFocusedListener = (o, oldValue, newValue) -> {
+            model.onFocusOutAmountTextField(oldValue, newValue, amountTextField.getText());
+            amountTextField.setText(model.amount.get());
+        };
     }
 
     @Override
-    protected void doActivate() {
-        addListeners();
-        addBindings();
-    }
+    protected void activate() {
+        paymentAccountsComboBox.setOnAction(e -> onPaymentAccountsComboBoxSelected());
 
-    @Override
-    protected void doDeactivate() {
-        removeBindings();
-        removeListeners();
-    }
+        amountTextField.focusedProperty().addListener(amountFocusedListener);
 
-    private void addBindings() {
         amountBtcLabel.textProperty().bind(model.btcCode);
         amountTextField.textProperty().bindBidirectional(model.amount);
         volumeTextField.textProperty().bindBidirectional(model.volume);
         totalToPayTextField.textProperty().bind(model.totalToPay);
         addressTextField.amountAsCoinProperty().bind(model.totalToPayAsCoin);
-        amountDescriptionLabel.textProperty().bind(model.amountDescription);
         amountTextField.validationResultProperty().bind(model.amountValidationResult);
-        takeOfferButton.disableProperty().bind(model.takeOfferButtonDisabled);
+        takeOfferButton.disableProperty().bind(model.isTakeOfferButtonDisabled);
         takeOfferSpinnerInfoLabel.visibleProperty().bind(model.isTakeOfferSpinnerVisible);
+
+        priceCurrencyLabel.textProperty().bind(createStringBinding(() ->
+                model.getTradeCurrency().getCode() + "/" + model.btcCode.get(), model.btcCode));
+
+        volumeCurrencyLabel.setText(model.getTradeCurrency().getCode());
+        amountRangeBtcLabel.textProperty().bind(model.btcCode);
+
+        priceDescriptionLabel.setText(BSResources.get("createOffer.amountPriceBox.priceDescription", model.getTradeCurrency().getCode()));
+        volumeDescriptionLabel.setText(model.volumeDescriptionLabel.get());
+
+        errorPopupDisplayed = new SimpleBooleanProperty();
+        offerWarningSubscription = EasyBind.subscribe(model.offerWarning, newValue -> {
+            if (newValue != null) {
+                new Popup().warning(newValue).onClose(() -> {
+                    errorPopupDisplayed.set(true);
+                    model.resetOfferWarning();
+                    close();
+                }).show();
+            }
+        });
+
+        errorMessageSubscription = EasyBind.subscribe(model.errorMessage, newValue -> {
+            if (newValue != null) {
+                new Popup().error(BSResources.get("takeOffer.error.message", newValue)).onClose(() -> {
+                    errorPopupDisplayed.set(true);
+                    model.resetErrorMessage();
+                    close();
+                }).show();
+            }
+        });
+
+        showCheckAvailabilityPopupSubscription = EasyBind.combine(model.offerWarning,
+                model.errorMessage,
+                errorPopupDisplayed,
+                model.isOfferAvailable,
+                (a, b, c, d) -> a == null && b == null && !c && !d)
+                .subscribe((observable, oldValue, newValue) -> {
+                    if (newValue) {
+                        new Popup().message(BSResources.get("takeOffer.fundsBox.isOfferAvailable", newValue))
+                                .closeButtonText("Cancel")
+                                .showProgressIndicator()
+                                .width(200)
+                                .show()
+                                .onClose(() -> {
+                                    model.resetErrorMessage();
+                                    close();
+                                }).show();
+                    }
+                });
+
+        isTakeOfferSpinnerVisibleSubscription = EasyBind.subscribe(model.isTakeOfferSpinnerVisible, newValue -> {
+            takeOfferSpinner.setProgress(newValue ? -1 : 0);
+            takeOfferSpinner.setVisible(newValue);
+        });
+
+        showWarningInvalidBtcDecimalPlacesSubscription = EasyBind.subscribe(model.showWarningInvalidBtcDecimalPlaces, newValue -> {
+            if (newValue) {
+                new Popup().warning(BSResources.get("takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces")).show();
+                model.showWarningInvalidBtcDecimalPlaces.set(false);
+            }
+        });
+        showTransactionPublishedScreenSubscription = EasyBind.subscribe(model.showTransactionPublishedScreen, newValue -> {
+            if (newValue && BitsquareApp.DEV_MODE) {
+                newValue = false;
+                close();
+                navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class);
+            }
+
+            if (newValue && model.getTrade() != null && model.getTrade().errorMessageProperty().get() == null)
+                new Popup().information(BSResources.get("takeOffer.success.info"))
+                        .onClose(() -> {
+                            navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class);
+                            close();
+                        })
+                        .show();
+        });
+
+        if (model.getPossiblePaymentAccounts().size() > 1) {
+            paymentAccountsComboBox.setItems(model.getPossiblePaymentAccounts());
+            paymentAccountsComboBox.getSelectionModel().select(0);
+        }
     }
 
-    private void removeBindings() {
+    @Override
+    protected void deactivate() {
+        paymentAccountsComboBox.setOnAction(null);
+
+        amountTextField.focusedProperty().removeListener(amountFocusedListener);
+
         amountBtcLabel.textProperty().unbind();
         amountTextField.textProperty().unbindBidirectional(model.amount);
         volumeTextField.textProperty().unbindBidirectional(model.volume);
         totalToPayTextField.textProperty().unbind();
         addressTextField.amountAsCoinProperty().unbind();
-        amountDescriptionLabel.textProperty().unbind();
         amountTextField.validationResultProperty().unbind();
         takeOfferButton.disableProperty().unbind();
         takeOfferSpinnerInfoLabel.visibleProperty().unbind();
-    }
+        priceCurrencyLabel.textProperty().unbind();
+        volumeCurrencyLabel.textProperty().unbind();
+        amountRangeBtcLabel.textProperty().unbind();
+        priceDescriptionLabel.textProperty().unbind();
+        volumeDescriptionLabel.textProperty().unbind();
 
-
-    private void createListeners() {
-        errorMessageChangeListener = (o, oldValue, newValue) -> {
-            if (newValue != null) {
-                Popups.openErrorPopup(BSResources.get("shared.error"), BSResources.get("takeOffer.error.message", model.errorMessage.get()));
-                Popups.removeBlurContent();
-                Platform.runLater(this::close);
-            }
-        };
-        amountFocusedListener = (o, oldValue, newValue) -> {
-            model.onFocusOutAmountTextField(oldValue, newValue, amountTextField.getText());
-            amountTextField.setText(model.amount.get());
-        };
-        isTakeOfferSpinnerVisibleListener = (ov, oldValue, newValue) -> {
-            takeOfferSpinner.setProgress(newValue ? -1 : 0);
-            takeOfferSpinner.setVisible(newValue);
-        };
-        stateListener = (ov, oldValue, newValue) -> {
-            switch (newValue) {
-                case CHECK_AVAILABILITY:
-                    showCheckAvailabilityScreen();
-                    break;
-                case AMOUNT_SCREEN:
-                    showAmountScreen();
-                    break;
-                case PAYMENT_SCREEN:
-                    setupPaymentScreen();
-                    break;
-                case DETAILS_SCREEN:
-                    showDetailsScreen();
-                    break;
-            }
-        };
-        showWarningInvalidBtcDecimalPlacesListener = (o, oldValue, newValue) -> {
-            if (newValue) {
-                Popups.openWarningPopup(BSResources.get("shared.warning"),
-                        BSResources.get("takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces"));
-                model.showWarningInvalidBtcDecimalPlaces.set(false);
-            }
-        };
-        showTransactionPublishedScreenListener = (o, oldValue, newValue) -> {
-            if (BitsquareApp.DEV_MODE) {
-                newValue = false;
-                close();
-                navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class);
-            }
-            
-            if (newValue) {
-                OverlayManager.blurContent();
-
-                // Dialogs are a bit limited. There is no callback for the InformationDialog button click, so we added
-                // our own actions.
-                List<Action> actions = new ArrayList<>();
-               /* actions.add(new AbstractAction(BSResources.get("shared.copyTxId")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "COPY");
-                         Utilities.copyToClipboard(model.transactionId.get());
-                    }
-                });*/
-                actions.add(new AbstractAction(BSResources.get("shared.close")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "CLOSE");
-                        try {
-                            close();
-                            navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        Dialog.Actions.CLOSE.handle(actionEvent);
-                    }
-                });
-
-                Popups.openInfoPopup(BSResources.get("takeOffer.success.headline"),
-                        BSResources.get("takeOffer.success.info"),
-                        actions);
-            }
-        };
-    }
-
-    private void addListeners() {
-        amountTextField.focusedProperty().addListener(amountFocusedListener);
-        model.isTakeOfferSpinnerVisible.addListener(isTakeOfferSpinnerVisibleListener);
-        model.state.addListener(stateListener);
-        model.showWarningInvalidBtcDecimalPlaces.addListener(showWarningInvalidBtcDecimalPlacesListener);
-        model.errorMessage.addListener(errorMessageChangeListener);
-        model.showTransactionPublishedScreen.addListener(showTransactionPublishedScreenListener);
-    }
-
-    private void removeListeners() {
-        amountTextField.focusedProperty().removeListener(amountFocusedListener);
-        model.isTakeOfferSpinnerVisible.removeListener(isTakeOfferSpinnerVisibleListener);
-        model.state.removeListener(stateListener);
-        model.showWarningInvalidBtcDecimalPlaces.removeListener(showWarningInvalidBtcDecimalPlacesListener);
-        model.errorMessage.removeListener(errorMessageChangeListener);
-        model.showTransactionPublishedScreen.removeListener(showTransactionPublishedScreenListener);
+        offerWarningSubscription.unsubscribe();
+        errorMessageSubscription.unsubscribe();
+        isTakeOfferSpinnerVisibleSubscription.unsubscribe();
+        showWarningInvalidBtcDecimalPlacesSubscription.unsubscribe();
+        showTransactionPublishedScreenSubscription.unsubscribe();
+        showCheckAvailabilityPopupSubscription.unsubscribe();
     }
 
 
@@ -264,115 +268,77 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void initWithData(Coin amount, Offer offer) {
-        model.initWithData(amount, offer);
+    public void initWithData(Offer offer) {
+        model.initWithData(offer);
 
-        if (offer.getDirection() == Offer.Direction.SELL)
+        if (model.getOffer().getDirection() == Offer.Direction.SELL)
             imageView.setId("image-buy-large");
         else
             imageView.setId("image-sell-large");
 
-        priceDescriptionLabel.setText(BSResources.get("takeOffer.amountPriceBox.priceDescription", model.getFiatCode()));
-        volumeDescriptionLabel.setText(BSResources.get("takeOffer.amountPriceBox.volumeDescription", model.getFiatCode()));
-        volumeDescriptionLabel.textProperty().bind(createStringBinding(() -> model.volumeDescriptionLabel.get(), model.fiatCode, model.volumeDescriptionLabel));
-
-        balanceTextField.setup(model.getWalletService(), model.address.get(), model.getFormatter());
+        balanceTextField.setup(model.address.get(), model.getFormatter());
 
+        boolean showComboBox = model.getPossiblePaymentAccounts().size() > 1;
+        paymentAccountsLabel.setVisible(showComboBox);
+        paymentAccountsLabel.setManaged(showComboBox);
+        paymentAccountsComboBox.setVisible(showComboBox);
+        paymentAccountsComboBox.setManaged(showComboBox);
+        paymentMethodTextField.setVisible(!showComboBox);
+        paymentMethodTextField.setManaged(!showComboBox);
+        paymentMethodLabel.setVisible(!showComboBox);
+        paymentMethodLabel.setManaged(!showComboBox);
+        if (!showComboBox)
+            paymentMethodTextField.setText(BSResources.get(model.getPaymentMethod().getId()));
+        currencyTextField.setText(model.getTradeCurrency().getCodeAndName());
         buyLabel.setText(model.getDirectionLabel());
+        amountDescriptionLabel.setText(model.getAmountDescription());
         amountRangeTextField.setText(model.getAmountRange());
         priceTextField.setText(model.getPrice());
         addressTextField.setPaymentLabel(model.getPaymentLabel());
         addressTextField.setAddress(model.getAddressAsString());
-        bankAccountTypeTextField.setText(model.getBankAccountType());
-        bankAccountTypeTextField.setText(model.getBankAccountType());
-        bankAccountCurrencyTextField.setText(model.getBankAccountCurrency());
-        bankAccountCountyTextField.setText(model.getBankAccountCounty());
-        acceptedCountriesTextField.setText(model.getAcceptedCountries());
-        acceptedLanguagesTextField.setText(model.getAcceptedLanguages());
-        acceptedArbitratorsTextField.setText(model.getAcceptedArbitratorIds());
-
-        amountPriceBoxInfoDisplay.textProperty().bind(model.amountPriceBoxInfo);
-        fundsBoxInfoDisplay.textProperty().bind(model.fundsBoxInfoDisplay);
-        showCheckAvailabilityScreen();
     }
 
     public void setCloseHandler(OfferView.CloseHandler closeHandler) {
         this.closeHandler = closeHandler;
     }
 
+    // called form parent as the view does not get notified when the tab is closed
+    public void onClose() {
+        // TODO need other implementation as it is displayed laso if there are old funds in the wallet
+        /*
+        if (model.dataModel.isWalletFunded.get())
+            new Popup().warning("You have already funds paid in.\nIn the <Funds/Open for withdrawal> section you can withdraw those funds.").show();*/
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // UI actions
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @FXML
-    void onTakeOffer() {
-        model.onTakeOffer();
-    }
-
-    @FXML
-    void onShowPaymentScreen() {
-        model.onShowPaymentScreen();
-    }
-
-    @FXML
-    void onScroll() {
-        InputTextField.hideErrorMessageDisplay();
-    }
-
-    @FXML
-    void onToggleShowAdvancedSettings() {
-        model.onToggleShowAdvancedSettings();
-        if (model.isDetailsVisible()) {
-            showAdvancedSettingsButton.setText(BSResources.get("takeOffer.fundsBox.hideAdvanced"));
-            showAdvancedSettingsButton.setGraphic(collapse);
-            showDetailsScreen();
+    private void onTakeOffer() {
+        Offer offer = model.getOffer();
+        if (model.getShowTakeOfferConfirmation()) {
+            offerDetailsPopup.onTakeOffer(() -> model.onTakeOffer()).show(offer);
         }
         else {
-            showAdvancedSettingsButton.setText(BSResources.get("takeOffer.fundsBox.showAdvanced"));
-            showAdvancedSettingsButton.setGraphic(expand);
-            hideDetailsScreen();
+            if (model.hasAcceptedArbitrators()) {
+                model.onTakeOffer();
+            } else {
+                new Popup().warning("You have no arbitrator selected.\n" +
+                        "Please select at least one arbitrator.").show();
+
+                navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, ArbitratorSelectionView.class);
+            }
         }
     }
 
-    @FXML
-    void onOpenGeneralHelp() {
-        Help.openWindow(HelpId.TAKE_OFFER_GENERAL);
+    private void onPaymentAccountsComboBoxSelected() {
+        model.onPaymentAccountSelected(paymentAccountsComboBox.getSelectionModel().getSelectedItem());
     }
 
-    @FXML
-    void onOpenFundingHelp() {
-        Help.openWindow(HelpId.TAKE_OFFER_FUNDING);
-    }
-
-    @FXML
-    void onOpenAdvancedSettingsHelp() {
-        Help.openWindow(HelpId.TAKE_OFFER_ADVANCED);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // States/screens
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void showCheckAvailabilityScreen() {
-
-    }
-
-    private void showAmountScreen() {
-        isOfferAvailableLabel.setVisible(false);
-        isOfferAvailableLabel.setManaged(false);
-        isOfferAvailableProgressIndicator.setProgress(0);
-        isOfferAvailableProgressIndicator.setVisible(false);
-        isOfferAvailableProgressIndicator.setManaged(false);
-
-        showPaymentInfoScreenButton.setVisible(true);
-    }
-
-    private void setupPaymentScreen() {
+    private void onShowPayFundsScreen() {
         if (!BitsquareApp.DEV_MODE) {
             if (model.getDisplaySecurityDepositInfo()) {
-                OverlayManager.blurContent();
+                MainView.blur();
                 List<Action> actions = new ArrayList<>();
                 actions.add(new AbstractAction(BSResources.get("shared.close")) {
                     @Override
@@ -381,18 +347,16 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
                         Dialog.Actions.CLOSE.handle(actionEvent);
                     }
                 });
-                Popups.openInfoPopup("To ensure that both traders behave fair they need to pay a security deposit.",
-                        "The deposit will stay in your local trading wallet until the offer gets accepted by another trader. " +
-                                "\nIt will be refunded to you after the trade has successfully completed.",
-                        actions);
+                new Popup().information("To ensure that both traders behave fair they need to pay a security deposit.\n\n" +
+                        "The deposit will stay in your local trading wallet until the offer gets accepted by another trader.\n" +
+                        "It will be refunded to you after the trade has successfully completed.").show();
 
                 model.onSecurityDepositInfoDisplayed();
             }
         }
 
-        priceAmountPane.setInactive();
+        showPaymentButton.setVisible(false);
         takeOfferButton.setVisible(true);
-        showPaymentInfoScreenButton.setVisible(false);
 
         payFundsPane.setVisible(true);
         totalToPayLabel.setVisible(true);
@@ -402,64 +366,218 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         addressTextField.setVisible(true);
         balanceLabel.setVisible(true);
         balanceTextField.setVisible(true);
-        fundsBoxInfoDisplay.setVisible(true);
-
-        // for irc demo
-        //showAdvancedSettingsButton.setVisible(true);
-        showAdvancedSettingsButton.setManaged(false);
-
-        if (expand == null) {
-            expand = ImageUtil.getImageViewById(ImageUtil.EXPAND);
-            collapse = ImageUtil.getImageViewById(ImageUtil.COLLAPSE);
-        }
-        showAdvancedSettingsButton.setGraphic(expand);
 
         setupTotalToPayInfoIconLabel();
     }
 
-    private void showDetailsScreen() {
-        payFundsPane.setInactive();
 
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Navigation
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private void close() {
+        if (closeHandler != null)
+            closeHandler.close();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Build UI elements
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private void addScrollPane() {
+        scrollPane = new ScrollPane();
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.layout();
-
-        toggleDetailsScreen(true);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+        scrollPane.setOnScroll(e -> InputTextField.hideErrorMessageDisplay());
+        AnchorPane.setLeftAnchor(scrollPane, 0d);
+        AnchorPane.setTopAnchor(scrollPane, 0d);
+        AnchorPane.setRightAnchor(scrollPane, 0d);
+        AnchorPane.setBottomAnchor(scrollPane, 0d);
+        root.getChildren().add(scrollPane);
     }
 
-    private void hideDetailsScreen() {
-        payFundsPane.setActive();
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.layout();
-        toggleDetailsScreen(false);
+    private void addGridPane() {
+        gridPane = new GridPane();
+        gridPane.setPadding(new Insets(30, 25, -1, 25));
+        gridPane.setHgap(5);
+        gridPane.setVgap(5);
+        ColumnConstraints columnConstraints1 = new ColumnConstraints();
+        columnConstraints1.setHalignment(HPos.RIGHT);
+        columnConstraints1.setHgrow(Priority.SOMETIMES);
+        columnConstraints1.setMinWidth(200);
+        ColumnConstraints columnConstraints2 = new ColumnConstraints();
+        columnConstraints2.setHgrow(Priority.ALWAYS);
+        gridPane.getColumnConstraints().addAll(columnConstraints1, columnConstraints2);
+        scrollPane.setContent(gridPane);
     }
 
-    private void toggleDetailsScreen(boolean visible) {
-        scrollPane.setOnScroll(scrollEvent -> {
-            if (!visible)
-                scrollEvent.consume();
+    private void addPaymentGroup() {
+        addTitledGroupBg(gridPane, gridRow, 2, "Payment info");
+        Tuple2<Label, ComboBox> tuple = addLabelComboBox(gridPane, gridRow, "Payment account:", Layout.FIRST_ROW_DISTANCE);
+        paymentAccountsLabel = tuple.first;
+        paymentAccountsLabel.setVisible(false);
+        paymentAccountsLabel.setManaged(false);
+        paymentAccountsComboBox = tuple.second;
+        paymentAccountsComboBox.setPromptText("Select payment account");
+        paymentAccountsComboBox.setConverter(new StringConverter<PaymentAccount>() {
+            @Override
+            public String toString(PaymentAccount paymentAccount) {
+                return paymentAccount.getAccountName() + " (" + paymentAccount.getSingleTradeCurrency().getCode() + ", " +
+                        BSResources.get(paymentAccount.getPaymentMethod().getId()) + ")";
+            }
+
+            @Override
+            public PaymentAccount fromString(String s) {
+                return null;
+            }
         });
+        paymentAccountsComboBox.setVisible(false);
+        paymentAccountsComboBox.setManaged(false);
+        Tuple2<Label, TextField> tuple2 = addLabelTextField(gridPane, gridRow, "Payment method:", "", Layout.FIRST_ROW_DISTANCE);
+        paymentMethodLabel = tuple2.first;
+        paymentMethodTextField = tuple2.second;
+        currencyTextField = addLabelTextField(gridPane, ++gridRow, "Trade currency:", "").second;
+    }
 
-        // deactivate mouse wheel scrolling if hidden
-        scrollPane.setVmax(visible ? scrollPane.getHeight() : 0);
-        scrollPane.setVvalue(visible ? scrollPane.getHeight() : 0);
+    private void addAmountPriceGroup() {
+        addTitledGroupBg(gridPane, ++gridRow, 2, "Set amount and price", Layout.GROUP_DISTANCE);
 
-        showDetailsPane.setVisible(visible);
+        imageView = new ImageView();
+        imageView.setPickOnBounds(true);
+        buyLabel = new Label();
+        buyLabel.setId("direction-icon-label");
+        buyLabel.setAlignment(Pos.CENTER);
+        buyLabel.setPadding(new Insets(-5, 0, 0, 0));
+        VBox imageVBox = new VBox();
+        imageVBox.setAlignment(Pos.CENTER);
+        imageVBox.setSpacing(6);
+        imageVBox.getChildren().addAll(imageView, buyLabel);
+        GridPane.setRowIndex(imageVBox, gridRow);
+        GridPane.setRowSpan(imageVBox, 2);
+        GridPane.setMargin(imageVBox, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 10, 10, 10));
+        gridPane.getChildren().add(imageVBox);
 
-        acceptedCountriesLabel.setVisible(visible);
-        acceptedCountriesTextField.setVisible(visible);
-        acceptedLanguagesLabel.setVisible(visible);
-        acceptedLanguagesTextField.setVisible(visible);
-        acceptedArbitratorsLabel.setVisible(visible);
-        acceptedArbitratorsTextField.setVisible(visible);
+        addAmountPriceFields();
 
-        bankAccountTypeLabel.setVisible(visible);
-        bankAccountTypeTextField.setVisible(visible);
-        bankAccountCurrencyLabel.setVisible(visible);
-        bankAccountCurrencyTextField.setVisible(visible);
-        bankAccountCountyLabel.setVisible(visible);
-        bankAccountCountyTextField.setVisible(visible);
+        addAmountRangeBox();
 
-        advancedInfoDisplay.setVisible(visible);
+        showPaymentButton = addButton(gridPane, ++gridRow, BSResources.get("takeOffer.amountPriceBox.next"));
+        GridPane.setMargin(showPaymentButton, new Insets(-35, 0, 0, 0));
+        showPaymentButton.setId("show-details-button");
+        showPaymentButton.setOnAction(e -> onShowPayFundsScreen());
+    }
+
+    private void addFundingGroup() {
+        // don't increase gridRow as we removed button when this gets visible
+        payFundsPane = addTitledGroupBg(gridPane, gridRow, 3, BSResources.get("takeOffer.fundsBox.title"), Layout.GROUP_DISTANCE);
+        payFundsPane.setVisible(false);
+
+        totalToPayLabel = new Label(BSResources.get("takeOffer.fundsBox.totalsNeeded"));
+        totalToPayLabel.setVisible(false);
+        totalToPayInfoIconLabel = new Label();
+        totalToPayInfoIconLabel.setVisible(false);
+        HBox totalToPayBox = new HBox();
+        totalToPayBox.setSpacing(4);
+        totalToPayBox.setAlignment(Pos.CENTER_RIGHT);
+        totalToPayBox.getChildren().addAll(totalToPayLabel, totalToPayInfoIconLabel);
+        GridPane.setMargin(totalToPayBox, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 0, 0, 0));
+        GridPane.setRowIndex(totalToPayBox, gridRow);
+        gridPane.getChildren().add(totalToPayBox);
+        totalToPayTextField = new TextField();
+        totalToPayTextField.setEditable(false);
+        totalToPayTextField.setFocusTraversable(false);
+        totalToPayTextField.setVisible(false);
+        totalToPayTextField.setPromptText(BSResources.get("createOffer.fundsBox.totalsNeeded.prompt"));
+        GridPane.setRowIndex(totalToPayTextField, gridRow);
+        GridPane.setColumnIndex(totalToPayTextField, 1);
+        GridPane.setMargin(totalToPayTextField, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 0, 0, 0));
+        gridPane.getChildren().add(totalToPayTextField);
+
+        Tuple2<Label, AddressTextField> addressTuple = addLabelAddressTextField(gridPane, ++gridRow, BSResources.get("takeOffer.fundsBox.address"));
+        addressLabel = addressTuple.first;
+        addressLabel.setVisible(false);
+        addressTextField = addressTuple.second;
+        addressTextField.setVisible(false);
+
+        Tuple2<Label, BalanceTextField> balanceTuple = addLabelBalanceTextField(gridPane, ++gridRow, BSResources.get("takeOffer.fundsBox.balance"));
+        balanceLabel = balanceTuple.first;
+        balanceLabel.setVisible(false);
+        balanceTextField = balanceTuple.second;
+        balanceTextField.setVisible(false);
+
+        Tuple3<Button, ProgressIndicator, Label> takeOfferTuple = addButtonWithStatus(gridPane, ++gridRow, BSResources.get("takeOffer.fundsBox.takeOffer"));
+        takeOfferButton = takeOfferTuple.first;
+        takeOfferButton.setVisible(false);
+        takeOfferButton.setOnAction(e -> onTakeOffer());
+        takeOfferSpinner = takeOfferTuple.second;
+        takeOfferSpinnerInfoLabel = takeOfferTuple.third;
+        takeOfferSpinnerInfoLabel.setText(BSResources.get("takeOffer.fundsBox.takeOfferSpinnerInfo"));
+        takeOfferSpinnerInfoLabel.setVisible(false);
+    }
+
+    private void addAmountPriceFields() {
+        // amountBox
+        Tuple3<HBox, InputTextField, Label> amountValueCurrencyBoxTuple = getAmountCurrencyBox(BSResources.get("takeOffer.amount.prompt"));
+        HBox amountValueCurrencyBox = amountValueCurrencyBoxTuple.first;
+        amountTextField = amountValueCurrencyBoxTuple.second;
+        amountBtcLabel = amountValueCurrencyBoxTuple.third;
+        Tuple2<Label, VBox> amountInputBoxTuple = getTradeInputBox(amountValueCurrencyBox, model.getAmountDescription());
+        amountDescriptionLabel = amountInputBoxTuple.first;
+        VBox amountBox = amountInputBoxTuple.second;
+
+        // x
+        Label xLabel = new Label("x");
+        xLabel.setFont(Font.font("Helvetica-Bold", 20));
+        xLabel.setPadding(new Insets(14, 3, 0, 3));
+
+        // price
+        Tuple3<HBox, TextField, Label> priceValueCurrencyBoxTuple = getValueCurrencyBox();
+        HBox priceValueCurrencyBox = priceValueCurrencyBoxTuple.first;
+        priceTextField = priceValueCurrencyBoxTuple.second;
+        priceCurrencyLabel = priceValueCurrencyBoxTuple.third;
+        Tuple2<Label, VBox> priceInputBoxTuple = getTradeInputBox(priceValueCurrencyBox, BSResources.get("takeOffer.amountPriceBox.priceDescription"));
+        priceDescriptionLabel = priceInputBoxTuple.first;
+        VBox priceBox = priceInputBoxTuple.second;
+
+        // =
+        Label resultLabel = new Label("=");
+        resultLabel.setFont(Font.font("Helvetica-Bold", 20));
+        resultLabel.setPadding(new Insets(14, 2, 0, 2));
+
+        // volume
+        Tuple3<HBox, TextField, Label> volumeValueCurrencyBoxTuple = getValueCurrencyBox();
+        HBox volumeValueCurrencyBox = volumeValueCurrencyBoxTuple.first;
+        volumeTextField = volumeValueCurrencyBoxTuple.second;
+        volumeCurrencyLabel = volumeValueCurrencyBoxTuple.third;
+        Tuple2<Label, VBox> volumeInputBoxTuple = getTradeInputBox(volumeValueCurrencyBox, model.volumeDescriptionLabel.get());
+        volumeDescriptionLabel = volumeInputBoxTuple.first;
+        VBox volumeBox = volumeInputBoxTuple.second;
+
+        HBox hBox = new HBox();
+        hBox.setSpacing(5);
+        hBox.setAlignment(Pos.CENTER_LEFT);
+        hBox.getChildren().addAll(amountBox, xLabel, priceBox, resultLabel, volumeBox);
+        GridPane.setRowIndex(hBox, gridRow);
+        GridPane.setColumnIndex(hBox, 1);
+        GridPane.setMargin(hBox, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, 10, 0, 0));
+        gridPane.getChildren().add(hBox);
+    }
+
+    private void addAmountRangeBox() {
+        Tuple3<HBox, TextField, Label> amountValueCurrencyBoxTuple = getValueCurrencyBox();
+        HBox amountValueCurrencyBox = amountValueCurrencyBoxTuple.first;
+        amountRangeTextField = amountValueCurrencyBoxTuple.second;
+        amountRangeBtcLabel = amountValueCurrencyBoxTuple.third;
+
+        Tuple2<Label, VBox> amountInputBoxTuple = getTradeInputBox(amountValueCurrencyBox, BSResources.get("takeOffer.amountPriceBox.amountRangeDescription"));
+        VBox box = amountInputBoxTuple.second;
+        GridPane.setRowIndex(box, ++gridRow);
+        GridPane.setColumnIndex(box, 1);
+        GridPane.setMargin(box, new Insets(5, 10, 5, 0));
+        gridPane.getChildren().add(box);
     }
 
 
@@ -467,9 +585,47 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     // Utils
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void close() {
-        if (closeHandler != null)
-            closeHandler.close();
+    private Tuple2<Label, VBox> getTradeInputBox(HBox amountValueBox, String promptText) {
+        Label descriptionLabel = new Label(promptText);
+        descriptionLabel.setId("input-description-label");
+        descriptionLabel.setPrefWidth(170);
+
+        VBox box = new VBox();
+        box.setSpacing(4);
+        box.getChildren().addAll(descriptionLabel, amountValueBox);
+        return new Tuple2<>(descriptionLabel, box);
+    }
+
+    private Tuple3<HBox, InputTextField, Label> getAmountCurrencyBox(String promptText) {
+        InputTextField input = new InputTextField();
+        input.setPrefWidth(170);
+        input.setAlignment(Pos.CENTER_RIGHT);
+        input.setId("text-input-with-currency-text-field");
+        input.setPromptText(promptText);
+
+        Label currency = new Label();
+        currency.setId("currency-info-label");
+
+        HBox box = new HBox();
+        box.getChildren().addAll(input, currency);
+        return new Tuple3<>(box, input, currency);
+    }
+
+    private Tuple3<HBox, TextField, Label> getValueCurrencyBox() {
+        TextField textField = new InputTextField();
+        textField.setPrefWidth(170);
+        textField.setAlignment(Pos.CENTER_RIGHT);
+        textField.setId("text-input-with-currency-text-field");
+        textField.setMouseTransparent(true);
+        textField.setEditable(false);
+        textField.setFocusTraversable(false);
+
+        Label currency = new Label();
+        currency.setId("currency-info-label-disabled");
+
+        HBox box = new HBox();
+        box.getChildren().addAll(textField, currency);
+        return new Tuple3<>(box, textField, currency);
     }
 
     private void setupTotalToPayInfoIconLabel() {
@@ -491,26 +647,18 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         infoGridPane.setPadding(new Insets(10, 10, 10, 10));
 
         int i = 0;
-        if (model.isSeller()) {
-            addPayInfoEntry(infoGridPane, i++,
-                    BSResources.get("takeOffer.fundsBox.amount"),
-                    model.getAmount());
-        }
+        if (model.isSeller())
+            addPayInfoEntry(infoGridPane, i++, BSResources.get("takeOffer.fundsBox.tradeAmount"), model.getAmount());
 
-
-        addPayInfoEntry(infoGridPane, i++,
-                BSResources.get("takeOffer.fundsBox.securityDeposit"),
-                model.securityDeposit.get());
-        addPayInfoEntry(infoGridPane, i++, BSResources.get("takeOffer.fundsBox.offerFee"),
-                model.getOfferFee());
-        addPayInfoEntry(infoGridPane, i++, BSResources.get("takeOffer.fundsBox.networkFee"),
-                model.getNetworkFee());
+        addPayInfoEntry(infoGridPane, i++, BSResources.get("takeOffer.fundsBox.securityDeposit"), model.getSecurityDeposit());
+        addPayInfoEntry(infoGridPane, i++, BSResources.get("takeOffer.fundsBox.offerFee"), model.getOfferFee());
+        addPayInfoEntry(infoGridPane, i++, BSResources.get("takeOffer.fundsBox.networkFee"), model.getNetworkFee());
         Separator separator = new Separator();
         separator.setOrientation(Orientation.HORIZONTAL);
         separator.setStyle("-fx-background: #666;");
         GridPane.setConstraints(separator, 1, i++);
         infoGridPane.getChildren().add(separator);
-        addPayInfoEntry(infoGridPane, i++, BSResources.get("takeOffer.fundsBox.total"),
+        addPayInfoEntry(infoGridPane, i, BSResources.get("takeOffer.fundsBox.total"),
                 model.totalToPay.get());
         totalToPayInfoPopover = new PopOver(infoGridPane);
         if (totalToPayInfoIconLabel.getScene() != null) {
@@ -536,7 +684,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     private Point2D getPopupPosition() {
         Window window = totalToPayInfoIconLabel.getScene().getWindow();
         Point2D point = totalToPayInfoIconLabel.localToScene(0, 0);
-        double x = point.getX() + window.getX() + totalToPayInfoIconLabel.getWidth() - 3;
+        double x = point.getX() + window.getX() + totalToPayInfoIconLabel.getWidth() + 2;
         double y = point.getY() + window.getY() + Math.floor(totalToPayInfoIconLabel.getHeight() / 2) - 9;
         return new Point2D(x, y);
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
index 0f23e5b3da..9b484c583f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
@@ -17,105 +17,76 @@
 
 package io.bitsquare.gui.main.offer.takeoffer;
 
-import io.bitsquare.btc.WalletService;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.common.UserThread;
 import io.bitsquare.gui.common.model.ActivatableWithDataModel;
 import io.bitsquare.gui.common.model.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
-import io.bitsquare.locale.CurrencyUtil;
-import io.bitsquare.trade.BuyerAsTakerTrade;
-import io.bitsquare.trade.SellerAsTakerTrade;
+import io.bitsquare.locale.TradeCurrency;
+import io.bitsquare.payment.PaymentAccount;
+import io.bitsquare.payment.PaymentMethod;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.offer.Offer;
-
+import javafx.beans.property.*;
+import javafx.beans.value.ChangeListener;
+import javafx.collections.ObservableList;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 
 import javax.inject.Inject;
+import java.util.List;
 
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import static com.google.common.base.Preconditions.checkNotNull;
 import static javafx.beans.binding.Bindings.createStringBinding;
 
 class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(TakeOfferViewModel.class);
-
-    public enum State {
-        CHECK_AVAILABILITY,
-        AMOUNT_SCREEN,
-        PAYMENT_SCREEN,
-        DETAILS_SCREEN
-    }
-
     private final BtcValidator btcValidator;
     private final BSFormatter formatter;
-    private final String offerFee;
-    private final String networkFee;
 
     // static fields
+
     private String amountRange;
-    private String price;
-    private String directionLabel;
-    private String bankAccountType;
-    private String bankAccountCurrency;
-    private String bankAccountCounty;
-    private String acceptedCountries;
-    private String acceptedLanguages;
-    private String acceptedArbitratorIds;
     private String addressAsString;
     private String paymentLabel;
-    private boolean detailsVisible;
-
+    private boolean takeOfferRequested;
+    private Trade trade;
+    private Offer offer;
+    private String price;
+    private String directionLabel;
+    private String amountDescription;
 
+    // TODO convert unneeded properties to static fields
+    // dynamic fields
     final StringProperty amount = new SimpleStringProperty();
     final StringProperty volume = new SimpleStringProperty();
-    final StringProperty securityDeposit = new SimpleStringProperty();
-    final StringProperty totalToPay = new SimpleStringProperty();
-    final StringProperty transactionId = new SimpleStringProperty();
-    final StringProperty errorMessage = new SimpleStringProperty();
-    final StringProperty btcCode = new SimpleStringProperty();
-    final StringProperty amountDescription = new SimpleStringProperty();
     final StringProperty volumeDescriptionLabel = new SimpleStringProperty();
-    final StringProperty fiatCode = new SimpleStringProperty();
-    final StringProperty amountPriceBoxInfo = new SimpleStringProperty();
-    final StringProperty fundsBoxInfoDisplay = new SimpleStringProperty();
+    final StringProperty totalToPay = new SimpleStringProperty();
+    final StringProperty errorMessage = new SimpleStringProperty();
+    final StringProperty offerWarning = new SimpleStringProperty();
+    final StringProperty btcCode = new SimpleStringProperty();
 
-    final BooleanProperty takeOfferButtonDisabled = new SimpleBooleanProperty(false);
-    final BooleanProperty isTakeOfferSpinnerVisible = new SimpleBooleanProperty(false);
+    final BooleanProperty isOfferAvailable = new SimpleBooleanProperty();
+    final BooleanProperty isTakeOfferButtonDisabled = new SimpleBooleanProperty(true);
+    final BooleanProperty isTakeOfferSpinnerVisible = new SimpleBooleanProperty();
     final BooleanProperty showWarningInvalidBtcDecimalPlaces = new SimpleBooleanProperty();
     final BooleanProperty showTransactionPublishedScreen = new SimpleBooleanProperty();
 
-
-    // Needed for the addressTextField
-    final ObjectProperty<Address> address = new SimpleObjectProperty<>();
-    final ObjectProperty<Coin> totalToPayAsCoin = new SimpleObjectProperty<>();
-
-    final ObjectProperty<State> state = new SimpleObjectProperty<>(TakeOfferViewModel.State.CHECK_AVAILABILITY);
     final ObjectProperty<InputValidator.ValidationResult> amountValidationResult = new SimpleObjectProperty<>();
 
-    private boolean takeOfferRequested;
+    // Those are needed for the addressTextField
+    final ObjectProperty<Coin> totalToPayAsCoin = new SimpleObjectProperty<>();
+    final ObjectProperty<Address> address = new SimpleObjectProperty<>();
 
-    // listeners
-    private ChangeListener<String> amountChangeListener;
-    private ChangeListener<Boolean> isWalletFundedChangeListener;
-    private ChangeListener<Coin> amountAsCoinChangeListener;
-    private ChangeListener<Offer.State> offerStateChangeListener;
-    private ChangeListener<TradeState> tradeStateChangeListener;
-    // Offer and trade are stored only for remove listener at deactivate
-    private Offer offer;
-    private Trade trade;
+    private ChangeListener<String> amountListener;
+    private ChangeListener<Coin> amountAsCoinListener;
+    private ChangeListener<Boolean> isWalletFundedListener;
+    private ChangeListener<Trade.State> tradeStateListener;
+    private ChangeListener<String> tradeErrorListener;
+    private ChangeListener<Offer.State> offerStateListener;
+    private ChangeListener<String> offerErrorListener;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -123,134 +94,77 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public TakeOfferViewModel(TakeOfferDataModel dataModel, BtcValidator btcValidator, BSFormatter formatter) {
+    public TakeOfferViewModel(TakeOfferDataModel dataModel, BtcValidator btcValidator,
+                              BSFormatter formatter) {
         super(dataModel);
 
         this.btcValidator = btcValidator;
         this.formatter = formatter;
 
-        this.offerFee = formatter.formatCoinWithCode(dataModel.offerFeeAsCoin.get());
-        this.networkFee = formatter.formatCoinWithCode(dataModel.networkFeeAsCoin.get());
-
         createListeners();
     }
 
     @Override
-    protected void doActivate() {
+    protected void activate() {
         addBindings();
         addListeners();
+
+        amount.set(formatter.formatCoin(dataModel.amountAsCoin.get()));
         isTakeOfferSpinnerVisible.set(false);
         showTransactionPublishedScreen.set(false);
+
+        // when getting back to an open screen we want to re-check again
+        isOfferAvailable.set(false);
+        checkNotNull(offer, "offer must not be null");
+
+        offer.stateProperty().addListener(offerStateListener);
+        applyOfferState(offer.stateProperty().get());
+
+        // when getting back to an open screen we want to re-check again
+        UserThread.execute(() -> dataModel.checkOfferAvailability(() -> {
+        }));
+        updateButtonDisableState();
     }
 
     @Override
-    protected void doDeactivate() {
+    protected void deactivate() {
         removeBindings();
         removeListeners();
     }
 
-    private void addBindings() {
-        volume.bind(createStringBinding(() -> formatter.formatFiatWithCode(dataModel.volumeAsFiat.get()), dataModel.volumeAsFiat));
-        totalToPay.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.totalToPayAsCoin.get()), dataModel.totalToPayAsCoin));
-        securityDeposit.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.securityDepositAsCoin.get()), dataModel.securityDepositAsCoin));
-        totalToPayAsCoin.bind(dataModel.totalToPayAsCoin);
-        btcCode.bind(dataModel.btcCode);
-    }
-
-    private void removeBindings() {
-        volume.unbind();
-        totalToPay.unbind();
-        securityDeposit.unbind();
-        totalToPayAsCoin.unbind();
-        btcCode.unbind();
-    }
-
-    private void createListeners() {
-        amountChangeListener = (ov, oldValue, newValue) -> {
-            if (isBtcInputValid(newValue).isValid) {
-                setAmountToModel();
-                calculateVolume();
-                dataModel.calculateTotalToPay();
-            }
-            evaluateViewState();
-        };
-        isWalletFundedChangeListener = (ov, oldValue, newValue) -> evaluateViewState();
-        amountAsCoinChangeListener = (ov, oldValue, newValue) -> amount.set(formatter.formatCoin(newValue));
-        offerStateChangeListener = (ov, oldValue, newValue) -> applyOfferState(newValue);
-        tradeStateChangeListener = (ov, oldValue, newValue) -> applyTradeState(newValue);
-    }
-
-    private void addListeners() {
-        // Bidirectional bindings are used for all input fields: amount, price, volume and minAmount
-        // We do volume/amount calculation during input, so user has immediate feedback
-        amount.addListener(amountChangeListener);
-        dataModel.isWalletFunded.addListener(isWalletFundedChangeListener);
-        // Binding with Bindings.createObjectBinding does not work because of bi-directional binding
-        dataModel.amountAsCoin.addListener(amountAsCoinChangeListener);
-
-        amountChangeListener.changed(null, null, amount.get());
-        isWalletFundedChangeListener.changed(null, null, dataModel.isWalletFunded.get());
-        amountAsCoinChangeListener.changed(null, null, dataModel.amountAsCoin.get());
-    }
-
-    private void removeListeners() {
-        amount.removeListener(amountChangeListener);
-        dataModel.isWalletFunded.removeListener(isWalletFundedChangeListener);
-        dataModel.amountAsCoin.removeListener(amountAsCoinChangeListener);
-
-        if (offer != null)
-            offer.stateProperty().removeListener(offerStateChangeListener);
-
-        if (trade != null)
-            trade.tradeStateProperty().removeListener(tradeStateChangeListener);
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    void initWithData(Coin amount, Offer offer) {
-        dataModel.initWithData(amount, offer);
-
+    // called before doActivate
+    void initWithData(Offer offer) {
+        dataModel.initWithData(offer);
         this.offer = offer;
 
-        directionLabel = offer.getDirection() == Offer.Direction.SELL ? BSResources.get("shared.buyBitcoin") : BSResources.get("shared.sellBitcoin");
-
-        fiatCode.set(offer.getCurrencyCode());
-        if (!dataModel.isMinAmountLessOrEqualAmount())
-            amountValidationResult.set(new InputValidator.ValidationResult(false, BSResources.get("takeOffer.validation.amountSmallerThanMinAmount")));
-
-        if (dataModel.getDirection() == Offer.Direction.BUY) {
-            amountDescription.set(BSResources.get("takeOffer.amountPriceBox.buy.amountDescription", offer.getId()));
-            volumeDescriptionLabel.set(BSResources.get("takeOffer.amountPriceBox.buy.volumeDescription", fiatCode.get()));
-            amountPriceBoxInfo.set(BSResources.get("takeOffer.amountPriceBox.buy.info"));
-            fundsBoxInfoDisplay.set(BSResources.get("takeOffer.fundsBox.buy.info"));
-        }
-        else {
-            amountDescription.set(BSResources.get("takeOffer.amountPriceBox.sell.amountDescription", offer.getId()));
-            volumeDescriptionLabel.set(BSResources.get("takeOffer.amountPriceBox.sell.volumeDescription", fiatCode.get()));
-            amountPriceBoxInfo.set(BSResources.get("takeOffer.amountPriceBox.sell.info"));
-            fundsBoxInfoDisplay.set(BSResources.get("takeOffer.fundsBox.sell.info"));
+        if (offer.getDirection() == Offer.Direction.BUY) {
+            directionLabel = BSResources.get("shared.sellBitcoin");
+            amountDescription = BSResources.get("takeOffer.amountPriceBox.buy.amountDescription");
+        } else {
+            directionLabel = BSResources.get("shared.buyBitcoin");
+            amountDescription = BSResources.get("takeOffer.amountPriceBox.sell.amountDescription");
         }
 
-        amountRange = formatter.formatCoinWithCode(offer.getMinAmount()) + " - " + formatter.formatCoinWithCode(offer.getAmount());
-        price = formatter.formatFiatWithCode(offer.getPrice());
-
+        amountRange = formatter.formatCoin(offer.getMinAmount()) + " - " + formatter.formatCoin(offer.getAmount());
+        price = formatter.formatFiat(offer.getPrice());
         paymentLabel = BSResources.get("takeOffer.fundsBox.paymentLabel", offer.getId());
-        assert dataModel.getAddressEntry() != null;
+
+        checkNotNull(dataModel.getAddressEntry(), "dataModel.getAddressEntry() must not be null");
+
         addressAsString = dataModel.getAddressEntry().getAddress().toString();
         address.set(dataModel.getAddressEntry().getAddress());
 
-        acceptedCountries = formatter.countryLocalesToString(offer.getAcceptedCountries());
-        acceptedLanguages = formatter.languageCodesToString(offer.getAcceptedLanguageCodes());
-        acceptedArbitratorIds = formatter.arbitratorIdsToNames(offer.getArbitratorIds());
-        bankAccountType = BSResources.get(offer.getFiatAccountType().toString());
-        bankAccountCurrency = BSResources.get(CurrencyUtil.getDisplayName(offer.getCurrencyCode()));
-        bankAccountCounty = BSResources.get(offer.getBankAccountCountry().name);
-
-        offer.stateProperty().addListener(offerStateChangeListener);
-        applyOfferState(offer.stateProperty().get());
+        offerErrorListener = (observable, oldValue, newValue) -> {
+            if (newValue != null)
+                errorMessage.set(newValue);
+        };
+        offer.errorMessageProperty().addListener(offerErrorListener);
+        errorMessage.set(offer.errorMessageProperty().get());
     }
 
 
@@ -263,162 +177,27 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
         applyOnTakeOfferResult(false);
 
         isTakeOfferSpinnerVisible.set(true);
-        dataModel.onTakeOffer((trade) -> {
+        dataModel.onTakeOffer(trade -> {
             this.trade = trade;
-            trade.tradeStateProperty().addListener(tradeStateChangeListener);
-            applyTradeState(trade.tradeStateProperty().get());
-            evaluateViewState();
+            trade.stateProperty().addListener(tradeStateListener);
+            applyTradeState(trade.getState());
+            trade.errorMessageProperty().addListener(tradeErrorListener);
+            applyTradeErrorMessage(trade.errorMessageProperty().get());
+            updateButtonDisableState();
         });
     }
 
-    void onShowPaymentScreen() {
-        state.set(TakeOfferViewModel.State.PAYMENT_SCREEN);
+    public void onPaymentAccountSelected(PaymentAccount paymentAccount) {
+        dataModel.onPaymentAccountSelected(paymentAccount);
     }
 
-    void onToggleShowAdvancedSettings() {
-        detailsVisible = !detailsVisible;
+    void onSecurityDepositInfoDisplayed() {
+        dataModel.onSecurityDepositInfoDisplayed();
     }
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // States
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void applyOfferState(Offer.State state) {
-        log.debug("applyOfferState state = " + state);
-
-        switch (state) {
-            case UNDEFINED:
-                // TODO set spinner?
-                break;
-            case AVAILABLE:
-                this.state.set(TakeOfferViewModel.State.AMOUNT_SCREEN);
-                break;
-            case NOT_AVAILABLE:
-                if (takeOfferRequested)
-                    errorMessage.set("Take offer request failed because offer is not available anymore. " +
-                            "Maybe another trader has taken the offer in the meantime.");
-                else
-                    errorMessage.set("You cannot take that offer because the offer was already taken by another trader.");
-                takeOfferRequested = false;
-                break;
-            case REMOVED:
-                if (!takeOfferRequested)
-                    errorMessage.set("You cannot take that offer because the offer has been removed in the meantime.");
-
-                takeOfferRequested = false;
-                break;
-            case OFFERER_OFFLINE:
-                if (takeOfferRequested)
-                    errorMessage.set("Take offer request failed because offerer is not online anymore.");
-                else
-                    errorMessage.set("You cannot take that offer because the offerer is offline.");
-                takeOfferRequested = false;
-                break;
-            case FAULT:
-                if (takeOfferRequested)
-                    errorMessage.set("Take offer request failed.");
-                else
-                    errorMessage.set("The check for the offer availability failed.");
-                takeOfferRequested = false;
-                break;
-            case TIMEOUT:
-                if (takeOfferRequested)
-                    errorMessage.set("Take offer request failed due a timeout.");
-                else
-                    errorMessage.set("The check for the offer availability failed due a timeout.");
-                takeOfferRequested = false;
-                break;
-            default:
-                log.error("Unhandled offer state: " + state);
-                break;
-        }
-
-        if (errorMessage.get() != null) {
-            isTakeOfferSpinnerVisible.set(false);
-        }
-
-        evaluateViewState();
-    }
-
-    private void applyTradeState(TradeState tradeState) {
-        log.debug("applyTradeState state = " + tradeState);
-
-        String msg = "An error occurred.";
-        if (trade.getErrorMessage() != null)
-            msg = "Error message: " + trade.getErrorMessage();
-
-        if (trade instanceof SellerAsTakerTrade) {
-            switch ((TradeState.SellerState) tradeState) {
-                case PREPARATION:
-                    break;
-                case DEPOSIT_PUBLISHED_MSG_RECEIVED:
-                    assert trade.getDepositTx() != null;
-                    transactionId.set(trade.getDepositTx().getHashAsString());
-                    applyOnTakeOfferResult(true);
-                    break;
-                case DEPOSIT_CONFIRMED:
-                case FIAT_PAYMENT_STARTED_MSG_RECEIVED:
-                case FIAT_PAYMENT_RECEIPT:
-                case FIAT_PAYMENT_RECEIPT_MSG_SENT:
-                case PAYOUT_TX_RECEIVED:
-                case PAYOUT_TX_COMMITTED:
-                case PAYOUT_BROAD_CASTED:
-                    break;
-               /* case TIMEOUT:
-                    errorMessage.set("A timeout occurred. Maybe there are connection problems. " +
-                            "Please try later again.\n" + msg);
-                    takeOfferRequested = false;
-                    break;
-                case FAULT:
-                    errorMessage.set(msg);
-                    takeOfferRequested = false;
-                    break;*/
-                default:
-                    log.warn("Unhandled trade state: " + tradeState);
-                    break;
-            }
-        }
-        else if (trade instanceof BuyerAsTakerTrade) {
-            switch ((TradeState.BuyerState) tradeState) {
-                case PREPARATION:
-                    break;
-                case DEPOSIT_PUBLISHED:
-                    assert trade.getDepositTx() != null;
-                    transactionId.set(trade.getDepositTx().getHashAsString());
-                    applyOnTakeOfferResult(true);
-                    break;
-                case DEPOSIT_PUBLISHED_MSG_SENT:
-                case DEPOSIT_CONFIRMED:
-                case FIAT_PAYMENT_STARTED:
-                case FIAT_PAYMENT_STARTED_MSG_SENT:
-                case FIAT_PAYMENT_RECEIPT_MSG_RECEIVED:
-                case PAYOUT_TX_COMMITTED:
-                case PAYOUT_TX_SENT:
-                case PAYOUT_BROAD_CASTED:
-                    break;
-               /* case TIMEOUT:
-                    errorMessage.set("A timeout occurred. Maybe there are connection problems. " +
-                            "Please try later again.\n" + msg);
-                    takeOfferRequested = false;
-                    break;
-                case FAULT:
-                    errorMessage.set(msg);
-                    takeOfferRequested = false;
-                    break;*/
-                default:
-                    log.warn("Unhandled trade state: " + tradeState);
-                    break;
-            }
-        }
-
-        if (errorMessage.get() != null)
-            isTakeOfferSpinnerVisible.set(false);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Focus handling
+    // Handle focus
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     // On focus out we do validation and apply the data to the model
@@ -448,91 +227,199 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
-    // Getters
+    // States
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    boolean isSeller() {
-        return dataModel.getDirection() == Offer.Direction.BUY;
+    private void applyOfferState(Offer.State state) {
+        log.debug("applyOfferState state = " + state);
+        offerWarning.set(null);
+
+        // We have 2 situations handled here: 
+        // 1. when clicking take offer in the offerbook screen, we do the availability check
+        // 2. Before actually taking the offer in the take offer screen, we check again the availability as some time might have passed in the meantime
+        // So we use the takeOfferRequested flag to display different messages depending on the context.
+        switch (state) {
+            case UNDEFINED:
+                break;
+            case OFFER_FEE_PAID:
+                // irrelevant for taker
+                break;
+            case AVAILABLE:
+                isOfferAvailable.set(true);
+                break;
+            case NOT_AVAILABLE:
+                if (takeOfferRequested)
+                    offerWarning.set("Take offer request failed because offer is not available anymore. " +
+                            "Maybe another trader has taken the offer in the meantime.");
+                else
+                    offerWarning.set("You cannot take that offer because the offer was already taken by another trader.");
+                takeOfferRequested = false;
+                break;
+            case REMOVED:
+                if (!takeOfferRequested)
+                    offerWarning.set("You cannot take that offer because the offer has been removed in the meantime.");
+
+                takeOfferRequested = false;
+                break;
+            case OFFERER_OFFLINE:
+                if (takeOfferRequested)
+                    offerWarning.set("Take offer request failed because offerer is not online anymore.");
+                else
+                    offerWarning.set("You cannot take that offer because the offerer is offline.");
+                takeOfferRequested = false;
+                break;
+            default:
+                log.error("Unhandled offer state: " + state);
+                break;
+        }
+
+        if (offerWarning != null)
+            isTakeOfferSpinnerVisible.set(false);
+
+        updateButtonDisableState();
     }
 
-    void onSecurityDepositInfoDisplayed() {
-        dataModel.onSecurityDepositInfoDisplayed();
+    private void applyTradeErrorMessage(String errorMessage) {
+        if (errorMessage != null) {
+            String appendMsg = "";
+            switch (trade.getState().getPhase()) {
+                case PREPARATION:
+                    appendMsg = "\n\nThere have no funds left your wallet yet.\n" +
+                            "Please try to restart you application and check your network connection to see if you can resolve the issue.";
+                    break;
+                case TAKER_FEE_PAID:
+                    appendMsg = "\n\nThe take offer fee is already paid. In the worst case you have lost that fee. " +
+                            "We are sorry about that but keep in mind it is a very small amount.\n" +
+                            "Please try to restart you application and check your network connection to see if you can resolve the issue.";
+                    break;
+                case DEPOSIT_PAID:
+                case FIAT_SENT:
+                case FIAT_RECEIVED:
+                    appendMsg = "\n\nThe deposit transaction is already published.\n" +
+                            "Please try to restart you application and check your network connection to see if you can resolve the issue.\n" +
+                            "If the problem still remains please contact the developers for support.";
+                    break;
+                case PAYOUT_PAID:
+                case WITHDRAWN:
+                    appendMsg = "\n\nThe payout transaction is already published.\n" +
+                            "Please try to restart you application and check your network connection to see if you can resolve the issue.\n" +
+                            "If the problem still remains please contact the developers for support.";
+                    break;
+                case DISPUTE:
+                    appendMsg = "\n\nThe trade is handled already by an arbitrator.\n" +
+                            "Please try to restart you application and check your network connection to see if you can resolve the issue.\n" +
+                            "If the problem still remains please contact the arbitrator or the developers for support.";
+                    break;
+            }
+            this.errorMessage.set(errorMessage + appendMsg);
+        } else {
+            this.errorMessage.set(null);
+        }
     }
 
-    WalletService getWalletService() {
-        return dataModel.getWalletService();
+    private void applyTradeState(Trade.State tradeState) {
+        log.debug("applyTradeState state = " + tradeState);
+
+        if (trade.getState() == Trade.State.DEPOSIT_PUBLISHED
+                || trade.getState() == Trade.State.DEPOSIT_SEEN_IN_NETWORK
+                || trade.getState() == Trade.State.DEPOSIT_PUBLISHED_MSG_SENT
+                || trade.getState() == Trade.State.DEPOSIT_PUBLISHED_MSG_RECEIVED) {
+            if (trade.getDepositTx() != null)
+                applyOnTakeOfferResult(true);
+            else
+                log.error("trade.getDepositTx() == null. That must not happen");
+        }
+
+        if (errorMessage.get() != null)
+            isTakeOfferSpinnerVisible.set(false);
     }
 
-    BSFormatter getFormatter() {
-        return formatter;
+    private void applyOnTakeOfferResult(boolean success) {
+        isTakeOfferSpinnerVisible.set(false);
+        showTransactionPublishedScreen.set(success);
     }
 
-    String getOfferFee() {
-        return offerFee;
+    private void updateButtonDisableState() {
+        isTakeOfferButtonDisabled.set(!(isBtcInputValid(amount.get()).isValid
+                        && dataModel.isMinAmountLessOrEqualAmount()
+                        && !dataModel.isAmountLargerThanOfferAmount()
+                        && dataModel.isWalletFunded.get()
+                        && !takeOfferRequested)
+        );
     }
 
-    String getNetworkFee() {
-        return networkFee;
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Bindings, listeners
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private void addBindings() {
+        volume.bind(createStringBinding(() -> formatter.formatFiat(dataModel.volumeAsFiat.get()), dataModel.volumeAsFiat));
+
+
+        if (dataModel.getDirection() == Offer.Direction.BUY) {
+            volumeDescriptionLabel.set(BSResources.get("createOffer.amountPriceBox.buy.volumeDescription", dataModel.getTradeCurrency().getCode()));
+        } else {
+            volumeDescriptionLabel.set(BSResources.get("createOffer.amountPriceBox.sell.volumeDescription", dataModel.getTradeCurrency().getCode()));
+        }
+        totalToPay.bind(createStringBinding(() -> formatter.formatCoinWithCode(dataModel.totalToPayAsCoin.get()), dataModel.totalToPayAsCoin));
+        totalToPayAsCoin.bind(dataModel.totalToPayAsCoin);
+        btcCode.bind(dataModel.btcCode);
     }
 
-    String getFiatCode() {
-        return fiatCode.get();
+
+    private void removeBindings() {
+        volumeDescriptionLabel.unbind();
+        volume.unbind();
+        totalToPay.unbind();
+        totalToPayAsCoin.unbind();
+        btcCode.unbind();
     }
 
-    String getAmount() {
-        return formatter.formatCoinWithCode(dataModel.amountAsCoin.get());
+    private void createListeners() {
+        amountListener = (ov, oldValue, newValue) -> {
+            if (isBtcInputValid(newValue).isValid) {
+                setAmountToModel();
+                calculateVolume();
+                dataModel.calculateTotalToPay();
+            }
+            updateButtonDisableState();
+        };
+        amountAsCoinListener = (ov, oldValue, newValue) -> amount.set(formatter.formatCoin(newValue));
+        isWalletFundedListener = (ov, oldValue, newValue) -> updateButtonDisableState();
+        tradeStateListener = (ov, oldValue, newValue) -> applyTradeState(newValue);
+        tradeErrorListener = (ov, oldValue, newValue) -> applyTradeErrorMessage(newValue);
+        offerStateListener = (ov, oldValue, newValue) -> applyOfferState(newValue);
     }
 
-    String getAmountRange() {
-        return amountRange;
+    private void addListeners() {
+        // Bidirectional bindings are used for all input fields: amount, price, volume and minAmount
+        // We do volume/amount calculation during input, so user has immediate feedback
+        amount.addListener(amountListener);
+
+        // Binding with Bindings.createObjectBinding does not work because of bi-directional binding
+        dataModel.amountAsCoin.addListener(amountAsCoinListener);
+
+        dataModel.isWalletFunded.addListener(isWalletFundedListener);
+
     }
 
-    String getPrice() {
-        return price;
-    }
+    private void removeListeners() {
+        amount.removeListener(amountListener);
 
-    String getDirectionLabel() {
-        return directionLabel;
-    }
+        // Binding with Bindings.createObjectBinding does not work because of bi-directional binding
+        dataModel.amountAsCoin.removeListener(amountAsCoinListener);
 
-    String getBankAccountType() {
-        return bankAccountType;
-    }
+        dataModel.isWalletFunded.removeListener(isWalletFundedListener);
+        if (offer != null) {
+            offer.stateProperty().removeListener(offerStateListener);
+            offer.errorMessageProperty().addListener(offerErrorListener);
+        }
 
-    String getBankAccountCurrency() {
-        return bankAccountCurrency;
-    }
-
-    String getBankAccountCounty() {
-        return bankAccountCounty;
-    }
-
-    String getAcceptedCountries() {
-        return acceptedCountries;
-    }
-
-    String getAcceptedLanguages() {
-        return acceptedLanguages;
-    }
-
-    String getAcceptedArbitratorIds() {
-        return acceptedArbitratorIds;
-    }
-
-    String getAddressAsString() {
-        return addressAsString;
-    }
-
-    String getPaymentLabel() {
-        return paymentLabel;
-    }
-
-    boolean getDisplaySecurityDepositInfo() {
-        return dataModel.getDisplaySecurityDepositInfo();
-    }
-
-    boolean isDetailsVisible() {
-        return detailsVisible;
+        if (trade != null) {
+            trade.stateProperty().removeListener(tradeStateListener);
+            trade.errorMessageProperty().removeListener(tradeErrorListener);
+        }
     }
 
 
@@ -540,11 +427,6 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
     // Utils
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void applyOnTakeOfferResult(boolean success) {
-        isTakeOfferSpinnerVisible.set(false);
-        showTransactionPublishedScreen.set(success);
-    }
-
     private void calculateVolume() {
         setAmountToModel();
         dataModel.calculateVolume();
@@ -554,20 +436,104 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
         dataModel.amountAsCoin.set(formatter.parseToCoinWith4Decimals(amount.get()));
     }
 
-    private void evaluateViewState() {
-        boolean isAmountAndPriceValidAndWalletFunded = isBtcInputValid(amount.get()).isValid &&
-                dataModel.isMinAmountLessOrEqualAmount() &&
-                !dataModel.isAmountLargerThanOfferAmount() &&
-                dataModel.isWalletFunded.get();
 
-        if (isAmountAndPriceValidAndWalletFunded && state.get() != TakeOfferViewModel.State.CHECK_AVAILABILITY)
-            state.set(TakeOfferViewModel.State.PAYMENT_SCREEN);
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
 
-        takeOfferButtonDisabled.set(!isAmountAndPriceValidAndWalletFunded || takeOfferRequested);
+    BSFormatter getFormatter() {
+        return formatter;
+    }
+
+    boolean getDisplaySecurityDepositInfo() {
+        return dataModel.getDisplaySecurityDepositInfo();
+    }
+
+    boolean isSeller() {
+        return dataModel.getDirection() == Offer.Direction.BUY;
     }
 
     private InputValidator.ValidationResult isBtcInputValid(String input) {
         return btcValidator.validate(input);
     }
 
+    public Offer getOffer() {
+        return dataModel.getOffer();
+    }
+
+    public String getAmountRange() {
+        return amountRange;
+    }
+
+    public String getPaymentLabel() {
+        return paymentLabel;
+    }
+
+    public String getAddressAsString() {
+        return addressAsString;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public String getDirectionLabel() {
+        return directionLabel;
+    }
+
+    public String getAmountDescription() {
+        return amountDescription;
+    }
+
+    String getAmount() {
+        return formatter.formatCoinWithCode(dataModel.amountAsCoin.get());
+    }
+
+    String getOfferFee() {
+        return formatter.formatCoinWithCode(dataModel.getOfferFeeAsCoin());
+    }
+
+    String getNetworkFee() {
+        return formatter.formatCoinWithCode(dataModel.getNetworkFeeAsCoin());
+    }
+
+    public String getSecurityDeposit() {
+        return formatter.formatCoinWithCode(dataModel.getSecurityDepositAsCoin());
+    }
+
+    public PaymentMethod getPaymentMethod() {
+        return dataModel.getPaymentMethod();
+    }
+
+    ObservableList<PaymentAccount> getPossiblePaymentAccounts() {
+        return dataModel.getPossiblePaymentAccounts();
+    }
+
+    public TradeCurrency getTradeCurrency() {
+        return dataModel.getTradeCurrency();
+    }
+
+    public boolean getShowTakeOfferConfirmation() {
+        return dataModel.getShowTakeOfferConfirmation();
+    }
+
+    public List<Arbitrator> getArbitrators() {
+        return dataModel.getArbitrators();
+    }
+
+    boolean hasAcceptedArbitrators() {
+        return dataModel.hasAcceptedArbitrators();
+    }
+
+    public void resetOfferWarning() {
+        offerWarning.set(null);
+    }
+
+    public Trade getTrade() {
+        return trade;
+    }
+
+    public void resetErrorMessage() {
+        offer.setErrorMessage(null);
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
index b6bda3fd26..0a6d687b93 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
@@ -19,11 +19,7 @@ package io.bitsquare.gui.main.portfolio;
 
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
+import io.bitsquare.gui.common.view.*;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView;
 import io.bitsquare.gui.main.portfolio.failedtrades.FailedTradesView;
@@ -31,26 +27,26 @@ import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.failed.FailedTradesManager;
-
-import javax.inject.Inject;
-
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+
+import javax.inject.Inject;
 
 @FxmlView
 public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable> {
 
     @FXML Tab openOffersTab, pendingTradesTab, closedTradesTab;
-    private Tab failedTradesTab = new Tab("Failed");
+    private final Tab failedTradesTab = new Tab("Failed");
     private Tab currentTab;
     private Navigation.Listener navigationListener;
     private ChangeListener<Tab> tabChangeListener;
 
     private final ViewLoader viewLoader;
     private final Navigation navigation;
-    private FailedTradesManager failedTradesManager;
+    private final FailedTradesManager failedTradesManager;
 
     @Inject
     public PortfolioView(CachingViewLoader viewLoader, Navigation navigation, FailedTradesManager failedTradesManager) {
@@ -62,13 +58,11 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
     @Override
     public void initialize() {
         navigationListener = viewPath -> {
-            log.debug("navigationListener");
             if (viewPath.size() == 3 && viewPath.indexOf(PortfolioView.class) == 1)
                 loadView(viewPath.tip());
         };
 
         tabChangeListener = (ov, oldValue, newValue) -> {
-            log.debug("tabChangeListener");
             if (newValue == openOffersTab)
                 navigation.navigateTo(MainView.class, PortfolioView.class, OpenOffersView.class);
             else if (newValue == pendingTradesTab)
@@ -81,17 +75,14 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         failedTradesManager.getFailedTrades().addListener((ListChangeListener<Trade>) c -> {
             if (failedTradesManager.getFailedTrades().size() > 0 && root.getTabs().size() == 3)
                 root.getTabs().add(failedTradesTab);
-            else
-                root.getTabs().remove(failedTradesTab);
         });
         if (failedTradesManager.getFailedTrades().size() > 0 && root.getTabs().size() == 3)
             root.getTabs().add(failedTradesTab);
-        else
-            root.getTabs().remove(failedTradesTab);
+
         root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
         navigation.addListener(navigationListener);
 
@@ -106,7 +97,7 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
         navigation.removeListener(navigationListener);
         currentTab = null;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java
index 8a12cd9e97..42e4567092 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java
@@ -17,25 +17,21 @@
 
 package io.bitsquare.gui.main.portfolio.closedtrades;
 
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
+import com.google.inject.Inject;
+import io.bitsquare.gui.common.model.ActivatableDataModel;
 import io.bitsquare.trade.Tradable;
 import io.bitsquare.trade.closed.ClosedTradableManager;
 import io.bitsquare.trade.offer.Offer;
-
-import com.google.inject.Inject;
-
-import java.util.stream.Collectors;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
-class ClosedTradesDataModel implements Activatable, DataModel {
+import java.util.stream.Collectors;
 
+class ClosedTradesDataModel extends ActivatableDataModel {
     private final ClosedTradableManager closedTradableManager;
 
-    private final ObservableList<ClosedTradesListItem> list = FXCollections.observableArrayList();
+    private final ObservableList<ClosedTradableListItem> list = FXCollections.observableArrayList();
     private final ListChangeListener<Tradable> tradesListChangeListener;
 
     @Inject
@@ -46,17 +42,17 @@ class ClosedTradesDataModel implements Activatable, DataModel {
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
         applyList();
         closedTradableManager.getClosedTrades().addListener(tradesListChangeListener);
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         closedTradableManager.getClosedTrades().removeListener(tradesListChangeListener);
     }
 
-    public ObservableList<ClosedTradesListItem> getList() {
+    public ObservableList<ClosedTradableListItem> getList() {
         return list;
     }
 
@@ -67,7 +63,7 @@ class ClosedTradesDataModel implements Activatable, DataModel {
     private void applyList() {
         list.clear();
 
-        list.addAll(closedTradableManager.getClosedTrades().stream().map(ClosedTradesListItem::new).collect(Collectors.toList()));
+        list.addAll(closedTradableManager.getClosedTrades().stream().map(ClosedTradableListItem::new).collect(Collectors.toList()));
 
         // we sort by date, earliest first
         list.sort((o1, o2) -> o2.getTradable().getDate().compareTo(o1.getTradable().getDate()));
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java
deleted file mode 100644
index c4429b0e65..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.portfolio.closedtrades;
-
-import io.bitsquare.trade.Tradable;
-
-/**
- * We could remove that wrapper if it is not needed for additional UI only fields.
- */
-class ClosedTradesListItem {
-
-    private final Tradable tradable;
-
-    ClosedTradesListItem(Tradable tradable) {
-        this.tradable = tradable;
-    }
-
-    Tradable getTradable() {
-        return tradable;
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml
index a5707b2846..1ebbd9ca71 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml
@@ -17,41 +17,25 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.TitledSeparator?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView"
-          hgap="5.0" vgap="5"
-          xmlns:fx="http://javafx.com/fxml">
+<?import javafx.scene.layout.VBox?>
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView"
+      spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
-        <Insets bottom="20.0" left="25.0" top="30.0" right="25"/>
+        <Insets bottom="0.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
 
-    <TitledSeparator text="Closed trades" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"/>
-
-    <TableView fx:id="table" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2">
-        <GridPane.margin>
-            <Insets top="10.0" left="-10" right="-10" bottom="-15"/>
-        </GridPane.margin>
+    <TableView fx:id="table" VBox.vgrow="ALWAYS">
         <columns>
             <TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="100" sortable="false"/>
-            <TableColumn text="Date" fx:id="dateColumn" minWidth="130"/>
+            <TableColumn text="Date/Time" fx:id="dateColumn" minWidth="130"/>
             <TableColumn text="Trade amount in BTC" fx:id="amountColumn" minWidth="130" sortable="false"/>
             <TableColumn text="Price" fx:id="priceColumn" minWidth="100" sortable="false"/>
-            <TableColumn text="Trade amount in EUR" fx:id="volumeColumn" minWidth="130" sortable="false"/>
+            <TableColumn text="Trade amount" fx:id="volumeColumn" minWidth="130" sortable="false"/>
             <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
             <TableColumn text="State" fx:id="stateColumn" minWidth="80" sortable="false"/>
         </columns>
     </TableView>
 
-    <columnConstraints>
-        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
-        <ColumnConstraints hgrow="ALWAYS"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS"/>
-    </rowConstraints>
-
-</GridPane>
\ No newline at end of file
+</VBox>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
index e8d304a291..0459e80e7d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
@@ -19,26 +19,38 @@ package io.bitsquare.gui.main.portfolio.closedtrades;
 
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.Popups;
-
-import javax.inject.Inject;
-
+import io.bitsquare.gui.popups.OfferDetailsPopup;
+import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.gui.util.BSFormatter;
+import io.bitsquare.trade.Tradable;
+import io.bitsquare.trade.Trade;
+import io.bitsquare.trade.offer.OpenOffer;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import javafx.scene.layout.VBox;
 import javafx.util.Callback;
 
-@FxmlView
-public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTradesViewModel> {
+import javax.inject.Inject;
 
-    @FXML TableView<ClosedTradesListItem> table;
-    @FXML TableColumn<ClosedTradesListItem, ClosedTradesListItem> priceColumn, amountColumn, volumeColumn,
+@FxmlView
+public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTradesViewModel> {
+
+    @FXML
+    TableView<ClosedTradableListItem> table;
+    @FXML
+    TableColumn<ClosedTradableListItem, ClosedTradableListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, tradeIdColumn, stateColumn;
+    private final BSFormatter formatter;
+    private final OfferDetailsPopup offerDetailsPopup;
+    private final TradeDetailsPopup tradeDetailsPopup;
 
     @Inject
-    public ClosedTradesView(ClosedTradesViewModel model) {
+    public ClosedTradesView(ClosedTradesViewModel model, BSFormatter formatter, OfferDetailsPopup offerDetailsPopup, TradeDetailsPopup tradeDetailsPopup) {
         super(model);
+        this.formatter = formatter;
+        this.offerDetailsPopup = offerDetailsPopup;
+        this.tradeDetailsPopup = tradeDetailsPopup;
     }
 
     @Override
@@ -56,38 +68,37 @@ public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTr
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         table.setItems(model.getList());
     }
 
-    private void openOfferDetails(ClosedTradesListItem item) {
-        // TODO Open popup with details view
-        log.debug("Trade details " + item);
-        Popups.openWarningPopup("Under construction", "This will open a details " +
-                "popup but that is not implemented yet.");
-    }
 
     private void setTradeIdColumnCellFactory() {
         tradeIdColumn.setCellValueFactory((offerListItem) -> new ReadOnlyObjectWrapper<>(offerListItem.getValue()));
         tradeIdColumn.setCellFactory(
-                new Callback<TableColumn<ClosedTradesListItem, ClosedTradesListItem>, TableCell<ClosedTradesListItem,
-                        ClosedTradesListItem>>() {
+                new Callback<TableColumn<ClosedTradableListItem, ClosedTradableListItem>, TableCell<ClosedTradableListItem,
+                        ClosedTradableListItem>>() {
 
                     @Override
-                    public TableCell<ClosedTradesListItem, ClosedTradesListItem> call(TableColumn<ClosedTradesListItem,
-                            ClosedTradesListItem> column) {
-                        return new TableCell<ClosedTradesListItem, ClosedTradesListItem>() {
+                    public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(TableColumn<ClosedTradableListItem,
+                            ClosedTradableListItem> column) {
+                        return new TableCell<ClosedTradableListItem, ClosedTradableListItem>() {
                             private Hyperlink hyperlink;
 
                             @Override
-                            public void updateItem(final ClosedTradesListItem item, boolean empty) {
+                            public void updateItem(final ClosedTradableListItem item, boolean empty) {
                                 super.updateItem(item, empty);
 
                                 if (item != null && !empty) {
                                     hyperlink = new Hyperlink(model.getTradeId(item));
-                                    hyperlink.setId("id-link");
                                     Tooltip.install(hyperlink, new Tooltip(model.getTradeId(item)));
-                                    hyperlink.setOnAction(event -> openOfferDetails(item));
+                                    hyperlink.setOnAction(event -> {
+                                        Tradable tradable = item.getTradable();
+                                        if (tradable instanceof Trade)
+                                            tradeDetailsPopup.show((Trade) tradable);
+                                        else if (tradable instanceof OpenOffer)
+                                            offerDetailsPopup.show(tradable.getOffer());
+                                    });
                                     setGraphic(hyperlink);
                                 }
                                 else {
@@ -103,14 +114,14 @@ public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTr
     private void setDateColumnCellFactory() {
         dateColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         dateColumn.setCellFactory(
-                new Callback<TableColumn<ClosedTradesListItem, ClosedTradesListItem>, TableCell<ClosedTradesListItem,
-                        ClosedTradesListItem>>() {
+                new Callback<TableColumn<ClosedTradableListItem, ClosedTradableListItem>, TableCell<ClosedTradableListItem,
+                        ClosedTradableListItem>>() {
                     @Override
-                    public TableCell<ClosedTradesListItem, ClosedTradesListItem> call(
-                            TableColumn<ClosedTradesListItem, ClosedTradesListItem> column) {
-                        return new TableCell<ClosedTradesListItem, ClosedTradesListItem>() {
+                    public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(
+                            TableColumn<ClosedTradableListItem, ClosedTradableListItem> column) {
+                        return new TableCell<ClosedTradableListItem, ClosedTradableListItem>() {
                             @Override
-                            public void updateItem(final ClosedTradesListItem item, boolean empty) {
+                            public void updateItem(final ClosedTradableListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
                                     setText(model.getDate(item));
@@ -125,14 +136,14 @@ public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTr
     private void setStateColumnCellFactory() {
         stateColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         stateColumn.setCellFactory(
-                new Callback<TableColumn<ClosedTradesListItem, ClosedTradesListItem>, TableCell<ClosedTradesListItem,
-                        ClosedTradesListItem>>() {
+                new Callback<TableColumn<ClosedTradableListItem, ClosedTradableListItem>, TableCell<ClosedTradableListItem,
+                        ClosedTradableListItem>>() {
                     @Override
-                    public TableCell<ClosedTradesListItem, ClosedTradesListItem> call(
-                            TableColumn<ClosedTradesListItem, ClosedTradesListItem> column) {
-                        return new TableCell<ClosedTradesListItem, ClosedTradesListItem>() {
+                    public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(
+                            TableColumn<ClosedTradableListItem, ClosedTradableListItem> column) {
+                        return new TableCell<ClosedTradableListItem, ClosedTradableListItem>() {
                             @Override
-                            public void updateItem(final ClosedTradesListItem item, boolean empty) {
+                            public void updateItem(final ClosedTradableListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
                                     setText(model.getState(item));
@@ -148,14 +159,14 @@ public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTr
     private void setAmountColumnCellFactory() {
         amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         amountColumn.setCellFactory(
-                new Callback<TableColumn<ClosedTradesListItem, ClosedTradesListItem>, TableCell<ClosedTradesListItem,
-                        ClosedTradesListItem>>() {
+                new Callback<TableColumn<ClosedTradableListItem, ClosedTradableListItem>, TableCell<ClosedTradableListItem,
+                        ClosedTradableListItem>>() {
                     @Override
-                    public TableCell<ClosedTradesListItem, ClosedTradesListItem> call(
-                            TableColumn<ClosedTradesListItem, ClosedTradesListItem> column) {
-                        return new TableCell<ClosedTradesListItem, ClosedTradesListItem>() {
+                    public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(
+                            TableColumn<ClosedTradableListItem, ClosedTradableListItem> column) {
+                        return new TableCell<ClosedTradableListItem, ClosedTradableListItem>() {
                             @Override
-                            public void updateItem(final ClosedTradesListItem item, boolean empty) {
+                            public void updateItem(final ClosedTradableListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 setText(model.getAmount(item));
                             }
@@ -167,14 +178,14 @@ public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTr
     private void setPriceColumnCellFactory() {
         priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         priceColumn.setCellFactory(
-                new Callback<TableColumn<ClosedTradesListItem, ClosedTradesListItem>, TableCell<ClosedTradesListItem,
-                        ClosedTradesListItem>>() {
+                new Callback<TableColumn<ClosedTradableListItem, ClosedTradableListItem>, TableCell<ClosedTradableListItem,
+                        ClosedTradableListItem>>() {
                     @Override
-                    public TableCell<ClosedTradesListItem, ClosedTradesListItem> call(
-                            TableColumn<ClosedTradesListItem, ClosedTradesListItem> column) {
-                        return new TableCell<ClosedTradesListItem, ClosedTradesListItem>() {
+                    public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(
+                            TableColumn<ClosedTradableListItem, ClosedTradableListItem> column) {
+                        return new TableCell<ClosedTradableListItem, ClosedTradableListItem>() {
                             @Override
-                            public void updateItem(final ClosedTradesListItem item, boolean empty) {
+                            public void updateItem(final ClosedTradableListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 setText(model.getPrice(item));
                             }
@@ -186,14 +197,14 @@ public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTr
     private void setVolumeColumnCellFactory() {
         volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         volumeColumn.setCellFactory(
-                new Callback<TableColumn<ClosedTradesListItem, ClosedTradesListItem>, TableCell<ClosedTradesListItem,
-                        ClosedTradesListItem>>() {
+                new Callback<TableColumn<ClosedTradableListItem, ClosedTradableListItem>, TableCell<ClosedTradableListItem,
+                        ClosedTradableListItem>>() {
                     @Override
-                    public TableCell<ClosedTradesListItem, ClosedTradesListItem> call(
-                            TableColumn<ClosedTradesListItem, ClosedTradesListItem> column) {
-                        return new TableCell<ClosedTradesListItem, ClosedTradesListItem>() {
+                    public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(
+                            TableColumn<ClosedTradableListItem, ClosedTradableListItem> column) {
+                        return new TableCell<ClosedTradableListItem, ClosedTradableListItem>() {
                             @Override
-                            public void updateItem(final ClosedTradesListItem item, boolean empty) {
+                            public void updateItem(final ClosedTradableListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
                                     setText(model.getVolume(item));
@@ -208,14 +219,14 @@ public class ClosedTradesView extends ActivatableViewAndModel<GridPane, ClosedTr
     private void setDirectionColumnCellFactory() {
         directionColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         directionColumn.setCellFactory(
-                new Callback<TableColumn<ClosedTradesListItem, ClosedTradesListItem>, TableCell<ClosedTradesListItem,
-                        ClosedTradesListItem>>() {
+                new Callback<TableColumn<ClosedTradableListItem, ClosedTradableListItem>, TableCell<ClosedTradableListItem,
+                        ClosedTradableListItem>>() {
                     @Override
-                    public TableCell<ClosedTradesListItem, ClosedTradesListItem> call(
-                            TableColumn<ClosedTradesListItem, ClosedTradesListItem> column) {
-                        return new TableCell<ClosedTradesListItem, ClosedTradesListItem>() {
+                    public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(
+                            TableColumn<ClosedTradableListItem, ClosedTradableListItem> column) {
+                        return new TableCell<ClosedTradableListItem, ClosedTradableListItem>() {
                             @Override
-                            public void updateItem(final ClosedTradesListItem item, boolean empty) {
+                            public void updateItem(final ClosedTradableListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 setText(model.getDirectionLabel(item));
                             }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
index 7314439f5c..fd2c60cde5 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
@@ -17,25 +17,15 @@
 
 package io.bitsquare.gui.main.portfolio.closedtrades;
 
+import com.google.inject.Inject;
 import io.bitsquare.gui.common.model.ActivatableWithDataModel;
 import io.bitsquare.gui.common.model.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.trade.BuyerTrade;
-import io.bitsquare.trade.SellerTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
 import io.bitsquare.trade.offer.OpenOffer;
-
-import com.google.inject.Inject;
-
 import javafx.collections.ObservableList;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(ClosedTradesViewModel.class);
-
     private final BSFormatter formatter;
 
 
@@ -46,68 +36,60 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
         this.formatter = formatter;
     }
 
-    public ObservableList<ClosedTradesListItem> getList() {
+    public ObservableList<ClosedTradableListItem> getList() {
         return dataModel.getList();
     }
 
-    String getTradeId(ClosedTradesListItem item) {
-        return item.getTradable().getId();
+    String getTradeId(ClosedTradableListItem item) {
+        return item.getTradable().getShortId();
     }
 
-    String getAmount(ClosedTradesListItem item) {
+    String getAmount(ClosedTradableListItem item) {
         if (item != null && item.getTradable() instanceof Trade)
             return formatter.formatCoinWithCode(((Trade) item.getTradable()).getTradeAmount());
+        else if (item != null && item.getTradable() instanceof OpenOffer)
+            return "-";
         else
             return "";
     }
 
-    String getPrice(ClosedTradesListItem item) {
+    String getPrice(ClosedTradableListItem item) {
         return (item != null) ? formatter.formatFiat(item.getTradable().getOffer().getPrice()) : "";
     }
 
-    String getVolume(ClosedTradesListItem item) {
+    String getVolume(ClosedTradableListItem item) {
         if (item != null && item.getTradable() instanceof Trade)
             return formatter.formatFiatWithCode(((Trade) item.getTradable()).getTradeVolume());
+        else if (item != null && item.getTradable() instanceof OpenOffer)
+            return "-";
         else
             return "";
     }
 
-    String getDirectionLabel(ClosedTradesListItem item) {
-        return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getTradable().getOffer())) : "";
+    String getDirectionLabel(ClosedTradableListItem item) {
+        return (item != null) ? formatter.getDirection(dataModel.getDirection(item.getTradable().getOffer())) : "";
     }
 
-    String getDate(ClosedTradesListItem item) {
+    String getDate(ClosedTradableListItem item) {
         return formatter.formatDateTime(item.getTradable().getDate());
     }
 
-    String getState(ClosedTradesListItem item) {
+    String getState(ClosedTradableListItem item) {
         if (item != null) {
             if (item.getTradable() instanceof Trade) {
                 Trade trade = (Trade) item.getTradable();
-                TradeState tradeState = trade.tradeStateProperty().get();
-                if (trade instanceof BuyerTrade) {
-                    if (tradeState == TradeState.BuyerState.FAILED) {
-                        return "Failed";
-                    }
-                    else if (tradeState == TradeState.BuyerState.WITHDRAW_COMPLETED) {
-                        return "Completed";
-                    }
-                    else {
-                        log.error("That must not happen. We got a pending state but we are in the closed trades list.");
-                        return tradeState.toString();
-                    }
-                }
-                else if (trade instanceof SellerTrade) {
-                    if (tradeState == TradeState.SellerState.FAILED) {
-                        return "Failed";
-                    }
-                    else if (tradeState == TradeState.SellerState.WITHDRAW_COMPLETED) {
-                        return "Completed";
-                    }
-                    else {
-                        log.error("That must not happen. We got a pending state but we are in the closed trades list.");
-                        return tradeState.toString();
-                    }
+
+                // TODO 
+               /* if (trade.isFailedState())
+                    return "Failed";
+                else*/
+                if (trade.getState() == Trade.State.WITHDRAW_COMPLETED) {
+                    return "Completed";
+                } else if (trade.getDisputeState() == Trade.DisputeState.DISPUTE_CLOSED) {
+                    return "Ticket closed";
+                } else {
+                    log.error("That must not happen. We got a pending state but we are in the closed trades list.");
+                    return trade.getState().toString();
                 }
             }
             else if (item.getTradable() instanceof OpenOffer) {
@@ -121,8 +103,6 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
                         return state.toString();
                     case CANCELED:
                         return "Canceled";
-                 /*   case FAILED:
-                        return "Failed";*/
                     default:
                         log.error("Unhandled state {}", state);
                         return state.toString();
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesDataModel.java
index 9fff3e65f0..8c6acc6ed3 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesDataModel.java
@@ -17,21 +17,18 @@
 
 package io.bitsquare.gui.main.portfolio.failedtrades;
 
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
+import com.google.inject.Inject;
+import io.bitsquare.gui.common.model.ActivatableDataModel;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.failed.FailedTradesManager;
 import io.bitsquare.trade.offer.Offer;
-
-import com.google.inject.Inject;
-
-import java.util.stream.Collectors;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
-class FailedTradesDataModel implements Activatable, DataModel {
+import java.util.stream.Collectors;
+
+class FailedTradesDataModel extends ActivatableDataModel {
 
     private final FailedTradesManager failedTradesManager;
 
@@ -46,13 +43,13 @@ class FailedTradesDataModel implements Activatable, DataModel {
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
         applyList();
         failedTradesManager.getFailedTrades().addListener(tradesListChangeListener);
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         failedTradesManager.getFailedTrades().removeListener(tradesListChangeListener);
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml
index 26c620a440..21d3db53c2 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml
@@ -17,23 +17,16 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.TitledSeparator?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.failedtrades.FailedTradesView"
-          hgap="5.0" vgap="5"
-          xmlns:fx="http://javafx.com/fxml">
+<?import javafx.scene.layout.VBox?>
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.failedtrades.FailedTradesView"
+      spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
-        <Insets bottom="20.0" left="25.0" top="30.0" right="25"/>
+        <Insets bottom="0.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
 
-    <TitledSeparator text="Closed trades" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"/>
-
-    <TableView fx:id="table" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2">
-        <GridPane.margin>
-            <Insets top="10.0" left="-10" right="-10" bottom="-15"/>
-        </GridPane.margin>
+    <TableView fx:id="table" VBox.vgrow="ALWAYS">
         <columns>
             <TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="100" sortable="false"/>
             <TableColumn text="Date" fx:id="dateColumn" minWidth="130"/>
@@ -45,13 +38,5 @@
         </columns>
     </TableView>
 
-    <columnConstraints>
-        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
-        <ColumnConstraints hgrow="ALWAYS"/>
-    </columnConstraints>
 
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS"/>
-    </rowConstraints>
-
-</GridPane>
\ No newline at end of file
+</VBox>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
index 991b7c4eba..80238d0771 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
@@ -19,26 +19,28 @@ package io.bitsquare.gui.main.portfolio.failedtrades;
 
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.Popups;
-
-import javax.inject.Inject;
-
+import io.bitsquare.gui.popups.TradeDetailsPopup;
+import io.bitsquare.trade.Trade;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import javafx.scene.layout.VBox;
 import javafx.util.Callback;
 
+import javax.inject.Inject;
+
 @FxmlView
-public class FailedTradesView extends ActivatableViewAndModel<GridPane, FailedTradesViewModel> {
+public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTradesViewModel> {
 
     @FXML TableView<FailedTradesListItem> table;
     @FXML TableColumn<FailedTradesListItem, FailedTradesListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, tradeIdColumn, stateColumn;
+    private final TradeDetailsPopup tradeDetailsPopup;
 
     @Inject
-    public FailedTradesView(FailedTradesViewModel model) {
+    public FailedTradesView(FailedTradesViewModel model, TradeDetailsPopup tradeDetailsPopup) {
         super(model);
+        this.tradeDetailsPopup = tradeDetailsPopup;
     }
 
     @Override
@@ -56,17 +58,10 @@ public class FailedTradesView extends ActivatableViewAndModel<GridPane, FailedTr
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         table.setItems(model.getList());
     }
 
-    private void openOfferDetails(FailedTradesListItem item) {
-        // TODO Open popup with details view
-        log.debug("Trade details " + item);
-        Popups.openWarningPopup("Under construction", "This will open a details " +
-                "popup but that is not implemented yet.");
-    }
-
     private void setTradeIdColumnCellFactory() {
         tradeIdColumn.setCellValueFactory((offerListItem) -> new ReadOnlyObjectWrapper<>(offerListItem.getValue()));
         tradeIdColumn.setCellFactory(
@@ -85,9 +80,11 @@ public class FailedTradesView extends ActivatableViewAndModel<GridPane, FailedTr
 
                                 if (item != null && !empty) {
                                     hyperlink = new Hyperlink(model.getTradeId(item));
-                                    hyperlink.setId("id-link");
                                     Tooltip.install(hyperlink, new Tooltip(model.getTradeId(item)));
-                                    hyperlink.setOnAction(event -> openOfferDetails(item));
+                                    hyperlink.setOnAction(event -> {
+                                        Trade trade = item.getTrade();
+                                        tradeDetailsPopup.show(trade);
+                                    });
                                     setGraphic(hyperlink);
                                 }
                                 else {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
index 712fa85b65..8a0a6e749f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
@@ -17,24 +17,14 @@
 
 package io.bitsquare.gui.main.portfolio.failedtrades;
 
+import com.google.inject.Inject;
 import io.bitsquare.gui.common.model.ActivatableWithDataModel;
 import io.bitsquare.gui.common.model.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.trade.BuyerTrade;
-import io.bitsquare.trade.SellerTrade;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-
-import com.google.inject.Inject;
-
 import javafx.collections.ObservableList;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(FailedTradesViewModel.class);
-
     private final BSFormatter formatter;
 
 
@@ -50,7 +40,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
     }
 
     String getTradeId(FailedTradesListItem item) {
-        return item.getTrade().getId();
+        return item.getTrade().getShortId();
     }
 
     String getAmount(FailedTradesListItem item) {
@@ -72,7 +62,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
     }
 
     String getDirectionLabel(FailedTradesListItem item) {
-        return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getTrade().getOffer())) : "";
+        return (item != null) ? formatter.getDirection(dataModel.getDirection(item.getTrade().getOffer())) : "";
     }
 
     String getDate(FailedTradesListItem item) {
@@ -82,25 +72,13 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
     String getState(FailedTradesListItem item) {
         if (item != null) {
             Trade trade = item.getTrade();
-            TradeState tradeState = trade.tradeStateProperty().get();
-            if (trade instanceof BuyerTrade) {
-                if (tradeState == TradeState.BuyerState.FAILED) {
-                    return "Failed";
-                }
-                else {
-                    log.error("Wrong state " + tradeState);
-                    return tradeState.toString();
-                }
-            }
-            else if (trade instanceof SellerTrade) {
-                if (tradeState == TradeState.SellerState.FAILED) {
-                    return "Failed";
-                }
-                else {
-                    log.error("Wrong state " + tradeState);
-                    return tradeState.toString();
-                }
-            }
+            //TODO
+            //if (trade.isFailedState())
+            return "Failed";
+           /* else {
+                log.error("Wrong state " + trade.getTradeState());
+                return trade.getTradeState().toString();
+            }*/
         }
         return "";
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java
index 8a256b74c8..f04d9139bb 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java
@@ -17,28 +17,20 @@
 
 package io.bitsquare.gui.main.portfolio.openoffer;
 
+import com.google.inject.Inject;
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
+import io.bitsquare.gui.common.model.ActivatableDataModel;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.trade.offer.OpenOffer;
 import io.bitsquare.trade.offer.OpenOfferManager;
-
-import com.google.inject.Inject;
-
-import java.util.stream.Collectors;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class OpenOffersDataModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(OpenOffersDataModel.class);
+import java.util.stream.Collectors;
 
+class OpenOffersDataModel extends ActivatableDataModel {
     private final OpenOfferManager openOfferManager;
 
     private final ObservableList<OpenOfferListItem> list = FXCollections.observableArrayList();
@@ -52,18 +44,18 @@ class OpenOffersDataModel implements Activatable, DataModel {
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
         applyList();
         openOfferManager.getOpenOffers().addListener(tradesListChangeListener);
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         openOfferManager.getOpenOffers().removeListener(tradesListChangeListener);
     }
 
     void onCancelOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        openOfferManager.onCancelOpenOffer(openOffer, resultHandler, errorMessageHandler);
+        openOfferManager.onRemoveOpenOffer(openOffer, resultHandler, errorMessageHandler);
     }
 
 
@@ -81,6 +73,6 @@ class OpenOffersDataModel implements Activatable, DataModel {
         list.addAll(openOfferManager.getOpenOffers().stream().map(OpenOfferListItem::new).collect(Collectors.toList()));
 
         // we sort by date, earliest first
-        list.sort((o1, o2) -> o2.getOffer().getCreationDate().compareTo(o1.getOffer().getCreationDate()));
+        list.sort((o1, o2) -> o2.getOffer().getDate().compareTo(o1.getOffer().getDate()));
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml
index 5f4366ee50..1bfd95b837 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml
@@ -17,41 +17,25 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.TitledSeparator?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView"
-          hgap="5.0" vgap="5"
-          xmlns:fx="http://javafx.com/fxml">
+<?import javafx.scene.layout.VBox?>
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView"
+      spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
-        <Insets bottom="20.0" left="25.0" top="30.0" right="25"/>
+        <Insets bottom="0.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
 
-    <TitledSeparator text="Open offers" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"/>
-
-    <TableView fx:id="table" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2">
-        <GridPane.margin>
-            <Insets top="10.0" left="-10" right="-10" bottom="-15"/>
-        </GridPane.margin>
+    <TableView fx:id="table" VBox.vgrow="ALWAYS">
         <columns>
             <TableColumn text="Offer ID" fx:id="offerIdColumn" minWidth="100" sortable="false"/>
-            <TableColumn text="Date" fx:id="dateColumn" minWidth="130"/>
+            <TableColumn text="Date/Time" fx:id="dateColumn" minWidth="130"/>
             <TableColumn text="Amount in BTC (Min.)" fx:id="amountColumn" minWidth="130" sortable="false"/>
             <TableColumn text="Price" fx:id="priceColumn" minWidth="80" sortable="false"/>
-            <TableColumn text="Amount in EUR (Min.)" fx:id="volumeColumn" minWidth="130" sortable="false"/>
+            <TableColumn text="Amount (Min.)" fx:id="volumeColumn" minWidth="130" sortable="false"/>
             <TableColumn text="Trade type" fx:id="directionColumn" minWidth="70" sortable="false"/>
             <TableColumn text="" fx:id="removeItemColumn" minWidth="100" sortable="false"/>
         </columns>
     </TableView>
 
-    <columnConstraints>
-        <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
-        <ColumnConstraints hgrow="ALWAYS"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS"/>
-    </rowConstraints>
-
-</GridPane>
\ No newline at end of file
+</VBox>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
index 6dda28b77d..92d0d051fb 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
@@ -20,34 +20,35 @@ package io.bitsquare.gui.main.portfolio.openoffer;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
-import io.bitsquare.gui.util.GUIUtil;
+import io.bitsquare.gui.popups.OfferDetailsPopup;
+import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.trade.offer.OpenOffer;
-
-import javax.inject.Inject;
-
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.image.*;
-import javafx.scene.layout.*;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.VBox;
 import javafx.util.Callback;
 
+import javax.inject.Inject;
+
 @FxmlView
-public class OpenOffersView extends ActivatableViewAndModel<GridPane, OpenOffersViewModel> {
+public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersViewModel> {
 
     @FXML TableView<OpenOfferListItem> table;
     @FXML TableColumn<OpenOfferListItem, OpenOfferListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, offerIdColumn, removeItemColumn;
-    private Navigation navigation;
+    private final Navigation navigation;
+    private final OfferDetailsPopup offerDetailsPopup;
 
     @Inject
-    public OpenOffersView(OpenOffersViewModel model, Navigation navigation) {
+    public OpenOffersView(OpenOffersViewModel model, Navigation navigation, OfferDetailsPopup offerDetailsPopup) {
         super(model);
         this.navigation = navigation;
+        this.offerDetailsPopup = offerDetailsPopup;
     }
 
     @Override
@@ -65,7 +66,7 @@ public class OpenOffersView extends ActivatableViewAndModel<GridPane, OpenOffers
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         table.setItems(model.getList());
     }
 
@@ -73,28 +74,59 @@ public class OpenOffersView extends ActivatableViewAndModel<GridPane, OpenOffers
         model.onCancelOpenOffer(openOffer,
                 () -> {
                     log.debug("Remove offer was successful");
-                    Popups.openInfoPopup("You can withdraw the funds you paid in from the funds screens.");
-                    navigation.navigateTo(MainView.class, FundsView.class, WithdrawalView.class);
+                    new Popup().information("You can withdraw the funds you paid in from the funds screens.")
+                            .onClose(() -> navigation.navigateTo(MainView.class, FundsView.class, WithdrawalView.class))
+                            .show();
                 },
                 (message) -> {
                     log.error(message);
-                    Popups.openWarningPopup("Remove offer failed", message);
+                    new Popup().warning("Remove offer failed:\n" + message).show();
                 });
 
     }
 
-    private void openOfferDetails(OpenOfferListItem item) {
-        // TODO Open popup with details view
-        log.debug("openOfferDetails " + item);
-        GUIUtil.copyToClipboard(item.getOffer().getId());
-        Popups.openWarningPopup("Under construction",
-                "The offer ID was copied to the clipboard. " +
-                        "Use that to identify your trading peer in the IRC chat room \n\n" +
-                        "Later this will open a details popup but that is not implemented yet.");
-    }
+ /*   private void openOfferDetails(OpenOfferListItem item) {
+        Offer offer = item.getOffer();
+        int rowIndex = 0;
+        GridPane gridPane = new GridPane();
+        gridPane.setPrefWidth(700);
+        gridPane.setPadding(new Insets(30, 30, 30, 30));
+        gridPane.setHgap(Layout.GRID_GAP);
+        gridPane.setVgap(Layout.GRID_GAP);
+        gridPane.setStyle("-fx-background-color: -bs-content-bg-grey");
+        ColumnConstraints columnConstraints1 = new ColumnConstraints();
+        columnConstraints1.setHalignment(HPos.RIGHT);
+        columnConstraints1.setHgrow(Priority.SOMETIMES);
+        ColumnConstraints columnConstraints2 = new ColumnConstraints();
+        columnConstraints2.setHgrow(Priority.ALWAYS);
+        gridPane.getColumnConstraints().addAll(columnConstraints1, columnConstraints2);
+
+        int rows = offer.getPaymentMethodCountry() == null ? 10 : 11;
+        addTitledGroupBg(gridPane, rowIndex, rows, "Offer details");
+        addLabelTextField(gridPane, rowIndex, "Offer ID:", offer.getId(), Layout.FIRST_ROW_DISTANCE);
+        addLabelTextField(gridPane, ++rowIndex, "Creation date:", formatter.formatDateTime(offer.getDate()));
+        addLabelTextField(gridPane, ++rowIndex, "Offer direction:", formatter.formatDirection(offer.getDirection()));
+        addLabelTextField(gridPane, ++rowIndex, "Currency code:", offer.getCurrencyCode());
+        addLabelTextField(gridPane, ++rowIndex, "Price:", formatter.formatFiat(offer.getPrice()));
+        addLabelTextField(gridPane, ++rowIndex, "Bitcoin amount:", formatter.formatCoin(offer.getAmount()));
+        addLabelTextField(gridPane, ++rowIndex, "Min. amount:", formatter.formatCoin(offer.getMinAmount()));
+        addLabelTextField(gridPane, ++rowIndex, "Payment method:", BSResources.get(offer.getPaymentMethod().getName()));
+        if (offer.getPaymentMethodCountry() != null)
+            addLabelTextField(gridPane, ++rowIndex, "Country of bank:", offer.getPaymentMethodCountry().code);
+        addLabelTextField(gridPane, ++rowIndex, "Accepted arbitrators:", formatter.arbitratorNamesToString(offer.getArbitratorNames()));
+
+        addLabelTxIdTextField(gridPane, ++rowIndex, "Create offer fee transaction ID:", offer.getOfferFeePaymentTxID());
+
+        Button closeButton = addButton(gridPane, ++rowIndex, "Close");
+        GridPane.setMargin(closeButton, new Insets(15, 0, 0, 0));
+        PopOver popover = PopOvers.getPopOver(gridPane);
+        PopOvers.showInCenter(popover);
+
+        closeButton.setOnAction(e -> popover.hide());
+    }*/
 
     private void setOfferIdColumnCellFactory() {
-        offerIdColumn.setCellValueFactory((offerListItem) -> new ReadOnlyObjectWrapper<>(offerListItem.getValue()));
+        offerIdColumn.setCellValueFactory((openOfferListItem) -> new ReadOnlyObjectWrapper<>(openOfferListItem.getValue()));
         offerIdColumn.setCellFactory(
                 new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem, OpenOfferListItem>>() {
 
@@ -102,17 +134,15 @@ public class OpenOffersView extends ActivatableViewAndModel<GridPane, OpenOffers
                     public TableCell<OpenOfferListItem, OpenOfferListItem> call(TableColumn<OpenOfferListItem,
                             OpenOfferListItem> column) {
                         return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
-                            private Hyperlink hyperlink;
 
                             @Override
                             public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
 
                                 if (item != null && !empty) {
-                                    hyperlink = new Hyperlink(model.getTradeId(item));
-                                    hyperlink.setId("id-link");
+                                    Hyperlink hyperlink = new Hyperlink(model.getTradeId(item));
                                     Tooltip.install(hyperlink, new Tooltip(model.getTradeId(item)));
-                                    hyperlink.setOnAction(event -> openOfferDetails(item));
+                                    hyperlink.setOnAction(event -> offerDetailsPopup.show(item.getOffer()));
                                     setGraphic(hyperlink);
                                 }
                                 else {
@@ -126,7 +156,7 @@ public class OpenOffersView extends ActivatableViewAndModel<GridPane, OpenOffers
     }
 
     private void setDateColumnCellFactory() {
-        dateColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
+        dateColumn.setCellValueFactory((openOfferListItem) -> new ReadOnlyObjectWrapper<>(openOfferListItem.getValue()));
         dateColumn.setCellFactory(
                 new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
                         OpenOfferListItem>>() {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java
index 96e8ddb72b..568386e4d1 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java
@@ -17,23 +17,16 @@
 
 package io.bitsquare.gui.main.portfolio.openoffer;
 
+import com.google.inject.Inject;
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
 import io.bitsquare.gui.common.model.ActivatableWithDataModel;
 import io.bitsquare.gui.common.model.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.trade.offer.OpenOffer;
-
-import com.google.inject.Inject;
-
 import javafx.collections.ObservableList;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 class OpenOffersViewModel extends ActivatableWithDataModel<OpenOffersDataModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(OpenOffersViewModel.class);
-
     private final BSFormatter formatter;
 
 
@@ -54,7 +47,7 @@ class OpenOffersViewModel extends ActivatableWithDataModel<OpenOffersDataModel>
     }
 
     String getTradeId(OpenOfferListItem item) {
-        return item.getOffer().getId();
+        return item.getOffer().getShortId();
     }
 
     String getAmount(OpenOfferListItem item) {
@@ -66,15 +59,15 @@ class OpenOffersViewModel extends ActivatableWithDataModel<OpenOffersDataModel>
     }
 
     String getVolume(OpenOfferListItem item) {
-        return (item != null) ? formatter.formatVolumeWithMinVolume(item.getOffer()) : "";
+        return (item != null) ? formatter.formatVolumeWithMinVolumeWithCode(item.getOffer()) : "";
     }
 
     String getDirectionLabel(OpenOfferListItem item) {
-        return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getOffer())) : "";
+        return (item != null) ? formatter.getDirection(dataModel.getDirection(item.getOffer())) : "";
     }
 
     String getDate(OpenOfferListItem item) {
-        return formatter.formatDateTime(item.getOffer().getCreationDate());
+        return formatter.formatDateTime(item.getOffer().getDate());
     }
 
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java
index ba3cf7955d..da3928bbf7 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java
@@ -17,30 +17,20 @@
 
 package io.bitsquare.gui.main.portfolio.pendingtrades;
 
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.CompletedView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.StartFiatView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitFiatReceivedView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitPayoutLockTimeView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitTxInBlockchainView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.*;
 import io.bitsquare.locale.BSResources;
-
 import javafx.beans.value.ChangeListener;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class BuyerSubView extends TradeSubView {
-    private static final Logger log = LoggerFactory.getLogger(BuyerSubView.class);
-
     private TradeWizardItem waitTxInBlockchain;
-    private TradeWizardItem startFiat;
-    private TradeWizardItem waitFiatReceived;
-    private TradeWizardItem payoutUnlock;
+    private TradeWizardItem startPayment;
+    private TradeWizardItem waitPaymentReceived;
+    private TradeWizardItem waitPayoutUnlock;
     private TradeWizardItem completed;
 
     private final ChangeListener<PendingTradesViewModel.BuyerState> stateChangeListener;
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, Initialisation
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -51,14 +41,14 @@ public class BuyerSubView extends TradeSubView {
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
         super.activate();
         model.getBuyerState().addListener(stateChangeListener);
         applyState(model.getBuyerState().get());
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         super.deactivate();
         model.getBuyerState().removeListener(stateChangeListener);
     }
@@ -66,12 +56,15 @@ public class BuyerSubView extends TradeSubView {
     @Override
     protected void addWizards() {
         waitTxInBlockchain = new TradeWizardItem(WaitTxInBlockchainView.class, "Wait for blockchain confirmation");
-        startFiat = new TradeWizardItem(StartFiatView.class, "Start EUR payment");
-        waitFiatReceived = new TradeWizardItem(WaitFiatReceivedView.class, "Wait until EUR payment arrived");
-        payoutUnlock = new TradeWizardItem(WaitPayoutLockTimeView.class, "Wait for payout unlock");
+        startPayment = new TradeWizardItem(StartPaymentView.class, "Start EUR payment");
+        waitPaymentReceived = new TradeWizardItem(WaitPaymentReceivedView.class, "Wait until EUR payment arrived");
+        waitPayoutUnlock = new TradeWizardItem(WaitPayoutLockTimeView.class, "Wait for payout unlock");
         completed = new TradeWizardItem(CompletedView.class, "Completed");
 
-        leftVBox.getChildren().setAll(waitTxInBlockchain, startFiat, waitFiatReceived, payoutUnlock, completed);
+        if (model.getLockTime() > 0)
+            leftVBox.getChildren().setAll(waitTxInBlockchain, startPayment, waitPaymentReceived, waitPayoutUnlock, completed);
+        else
+            leftVBox.getChildren().setAll(waitTxInBlockchain, startPayment, waitPaymentReceived, completed);
     }
 
 
@@ -83,58 +76,54 @@ public class BuyerSubView extends TradeSubView {
         log.debug("applyState " + state);
 
         waitTxInBlockchain.setDisabled();
-        startFiat.setDisabled();
-        waitFiatReceived.setDisabled();
-        payoutUnlock.setDisabled();
+        startPayment.setDisabled();
+        waitPaymentReceived.setDisabled();
+        waitPayoutUnlock.setDisabled();
         completed.setDisabled();
 
         if (tradeStepDetailsView != null)
-            tradeStepDetailsView.deactivate();
+            tradeStepDetailsView.doDeactivate();
 
         switch (state) {
             case UNDEFINED:
-              /*  showItem(waitTxInBlockchain);
-                ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoLabelText("Trade is in an incomplete state.");*/
+                contentPane.getChildren().clear();
+                leftVBox.getChildren().clear();
                 break;
             case WAIT_FOR_BLOCKCHAIN_CONFIRMATION:
                 showItem(waitTxInBlockchain);
 
                 ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoLabelText("Deposit transaction has been published. You need to wait for at least " +
-                        "one block chain confirmation.");
-               /* ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoDisplayField("You need to wait for at least one block chain confirmation to" +
-                        " be sure that the deposit funding has not been double spent. For higher trade volumes we" +
-                        " recommend to wait up to 6 confirmations.");*/
+                        "one blockchain confirmation.");
                 break;
             case REQUEST_START_FIAT_PAYMENT:
                 waitTxInBlockchain.setCompleted();
-                showItem(startFiat);
+                showItem(startPayment);
                 break;
             case WAIT_FOR_FIAT_PAYMENT_RECEIPT:
                 waitTxInBlockchain.setCompleted();
-                startFiat.setCompleted();
-                showItem(waitFiatReceived);
+                startPayment.setCompleted();
+                showItem(waitPaymentReceived);
 
-                ((WaitFiatReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("Waiting for the Bitcoin sellers confirmation " +
+                ((WaitPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("Waiting for the Bitcoin sellers confirmation " +
                                 "that the {0} payment has arrived.",
                         model.getCurrencyCode()));
-              /*  ((WaitFiatReceivedView) tradeStepDetailsView).setInfoDisplayField(BSResources.get("When the confirmation that the {0} payment arrived at " +
-                                "the Bitcoin sellers payment account, the payout transaction will be published.",
-                        model.getCurrencyCode()));*/
                 break;
             case WAIT_FOR_UNLOCK_PAYOUT:
-                waitTxInBlockchain.setCompleted();
-                startFiat.setCompleted();
-                waitFiatReceived.setCompleted();
-                showItem(payoutUnlock);
+                if (model.getLockTime() > 0) {
+                    waitTxInBlockchain.setCompleted();
+                    startPayment.setCompleted();
+                    waitPaymentReceived.setCompleted();
+                    showItem(waitPayoutUnlock);
 
-                ((WaitPayoutLockTimeView) tradeStepDetailsView).setInfoLabelText("The payout transaction is signed and finalized by both parties." +
-                        "\nFor reducing bank charge back risks you need to wait until the payout gets unlocked to transfer your Bitcoin.");
+                    ((WaitPayoutLockTimeView) tradeStepDetailsView).setInfoLabelText("The payout transaction is signed and finalized by both parties." +
+                            "\nFor reducing bank charge back risks you need to wait until the payout gets unlocked to transfer your Bitcoin.");
+                }
                 break;
             case REQUEST_WITHDRAWAL:
                 waitTxInBlockchain.setCompleted();
-                startFiat.setCompleted();
-                waitFiatReceived.setCompleted();
-                payoutUnlock.setCompleted();
+                startPayment.setCompleted();
+                waitPaymentReceived.setCompleted();
+                waitPayoutUnlock.setCompleted();
                 showItem(completed);
 
                 CompletedView completedView = (CompletedView) tradeStepDetailsView;
@@ -144,8 +133,6 @@ public class BuyerSubView extends TradeSubView {
                 completedView.setFiatTradeAmountTextFieldText(model.getFiatVolume());
                 completedView.setFeesTextFieldText(model.getTotalFees());
                 completedView.setSecurityDepositTextFieldText(model.getSecurityDeposit());
-                completedView.setSummaryInfoDisplayText("Your security deposit has been refunded to you. " +
-                        "You can review the details to that trade any time in the closed trades screen.");
                 completedView.setWithdrawAmountTextFieldText(model.getPayoutAmount());
                 break;
             default:
@@ -154,7 +141,7 @@ public class BuyerSubView extends TradeSubView {
         }
 
         if (tradeStepDetailsView != null)
-            tradeStepDetailsView.activate();
+            tradeStepDetailsView.doActivate();
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
index 2a62b171ef..09c7cf6133 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
@@ -17,62 +17,55 @@
 
 package io.bitsquare.gui.main.portfolio.pendingtrades;
 
+import com.google.inject.Inject;
+import io.bitsquare.arbitration.Dispute;
+import io.bitsquare.arbitration.DisputeManager;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
-import io.bitsquare.gui.components.Popups;
+import io.bitsquare.gui.common.model.ActivatableDataModel;
 import io.bitsquare.gui.main.MainView;
+import io.bitsquare.gui.main.disputes.DisputesView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView;
-import io.bitsquare.trade.BuyerTrade;
-import io.bitsquare.trade.Contract;
-import io.bitsquare.trade.SellerTrade;
-import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeManager;
-import io.bitsquare.trade.TradeState;
+import io.bitsquare.gui.popups.Popup;
+import io.bitsquare.gui.popups.WalletPasswordPopup;
+import io.bitsquare.payment.PaymentAccountContractData;
+import io.bitsquare.trade.*;
 import io.bitsquare.trade.offer.Offer;
 import io.bitsquare.user.User;
-
-import org.bitcoinj.core.BlockChainListener;
-import org.bitcoinj.core.Coin;
-
-import com.google.inject.Inject;
-
-import java.util.stream.Collectors;
-
-import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.ReadOnlyStringProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import org.bitcoinj.core.BlockChainListener;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.Transaction;
+import org.spongycastle.crypto.params.KeyParameter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.stream.Collectors;
 
-class PendingTradesDataModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(PendingTradesDataModel.class);
+import static com.google.common.base.Preconditions.checkNotNull;
 
+public class PendingTradesDataModel extends ActivatableDataModel {
     private final TradeManager tradeManager;
+
     private final WalletService walletService;
-    private TradeWalletService tradeWalletService;
-    private final User user;
-    private Navigation navigation;
+    private final TradeWalletService tradeWalletService;
+    private User user;
+    private final KeyRing keyRing;
+    private final DisputeManager disputeManager;
+    private final Navigation navigation;
+    private final WalletPasswordPopup walletPasswordPopup;
 
     private final ObservableList<PendingTradesListItem> list = FXCollections.observableArrayList();
     private PendingTradesListItem selectedItem;
     private final ListChangeListener<Trade> tradesListChangeListener;
-    private boolean isOffererRole;
+    private boolean isOfferer;
 
-    private final ObjectProperty<TradeState> sellerProcessState = new SimpleObjectProperty<>();
-    private final ObjectProperty<TradeState> buyerProcessState = new SimpleObjectProperty<>();
     private final ObjectProperty<Trade> tradeProperty = new SimpleObjectProperty<>();
     private final StringProperty txId = new SimpleStringProperty();
     private Trade trade;
@@ -83,47 +76,51 @@ class PendingTradesDataModel implements Activatable, DataModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public PendingTradesDataModel(TradeManager tradeManager, WalletService walletService, TradeWalletService tradeWalletService, User user, Navigation
-            navigation) {
+    public PendingTradesDataModel(TradeManager tradeManager, WalletService walletService, TradeWalletService tradeWalletService,
+                                  User user, KeyRing keyRing, DisputeManager disputeManager,
+                                  Navigation navigation, WalletPasswordPopup walletPasswordPopup) {
         this.tradeManager = tradeManager;
         this.walletService = walletService;
         this.tradeWalletService = tradeWalletService;
         this.user = user;
+        this.keyRing = keyRing;
+        this.disputeManager = disputeManager;
         this.navigation = navigation;
+        this.walletPasswordPopup = walletPasswordPopup;
 
         tradesListChangeListener = change -> onListChanged();
     }
 
     @Override
-    public void activate() {
-        tradeManager.getPendingTrades().addListener(tradesListChangeListener);
+    protected void activate() {
+        tradeManager.getTrades().addListener(tradesListChangeListener);
         onListChanged();
     }
 
     @Override
-    public void deactivate() {
-        tradeManager.getPendingTrades().removeListener(tradesListChangeListener);
-        unbindStates();
+    protected void deactivate() {
+        tradeManager.getTrades().removeListener(tradesListChangeListener);
     }
 
     private void onListChanged() {
         list.clear();
-        list.addAll(tradeManager.getPendingTrades().stream().map(PendingTradesListItem::new).collect(Collectors.toList()));
+        list.addAll(tradeManager.getTrades().stream().map(PendingTradesListItem::new).collect(Collectors.toList()));
 
         // we sort by date, earliest first
         list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate()));
 
-        if (list.size() > 0)
+        // TODO improve selectedItem handling
+        // selectedItem does not get set to null if we dont have the view visible
+        // So if the item gets removed form the list, and a new item is added we need to check if the old 
+        // selectedItem is in the new list, if not we know it is an invalid one
+        if (list.size() == 1)
+            onSelectTrade(list.get(0));
+        else if (list.size() > 1 && (selectedItem == null || !list.contains(selectedItem)))
             onSelectTrade(list.get(0));
         else if (list.size() == 0)
             onSelectTrade(null);
     }
 
-    private void unbindStates() {
-        sellerProcessState.unbind();
-        buyerProcessState.unbind();
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // UI actions
@@ -131,8 +128,6 @@ class PendingTradesDataModel implements Activatable, DataModel {
 
     void onSelectTrade(PendingTradesListItem item) {
         // clean up previous selectedItem
-        unbindStates();
-
         selectedItem = item;
 
         if (item == null) {
@@ -143,73 +138,98 @@ class PendingTradesDataModel implements Activatable, DataModel {
             trade = item.getTrade();
             tradeProperty.set(trade);
 
-            isOffererRole = tradeManager.isMyOffer(trade.getOffer());
-
-            if (trade instanceof SellerTrade)
-                sellerProcessState.bind(trade.tradeStateProperty());
-            else if (trade instanceof BuyerTrade)
-                buyerProcessState.bind(trade.tradeStateProperty());
+            isOfferer = tradeManager.isMyOffer(trade.getOffer());
 
             if (trade.getDepositTx() != null)
                 txId.set(trade.getDepositTx().getHashAsString());
         }
     }
 
-
     void onFiatPaymentStarted() {
-        assert trade != null;
-        if (trade instanceof BuyerTrade)
+        checkNotNull(trade, "trade must not be null");
+        if (trade instanceof BuyerTrade && trade.getDisputeState() == Trade.DisputeState.NONE)
             ((BuyerTrade) trade).onFiatPaymentStarted();
     }
 
     void onFiatPaymentReceived() {
-        assert trade != null;
-        if (trade instanceof SellerTrade)
+        checkNotNull(trade, "trade must not be null");
+        if (trade instanceof SellerTrade && trade.getDisputeState() == Trade.DisputeState.NONE)
             ((SellerTrade) trade).onFiatPaymentReceived();
     }
 
     void onWithdrawRequest(String toAddress) {
-        assert trade != null;
+        checkNotNull(trade, "trade must not be null");
+        if (walletService.getWallet().isEncrypted())
+            walletPasswordPopup.show().onAesKey(aesKey -> doWithdrawRequest(toAddress, aesKey));
+        else
+            doWithdrawRequest(toAddress, null);
+    }
+
+    private void doWithdrawRequest(String toAddress, KeyParameter aesKey) {
         tradeManager.onWithdrawRequest(
                 toAddress,
+                aesKey,
                 trade,
                 () -> {
-                    Platform.runLater(() -> navigation.navigateTo(MainView.class, PortfolioView.class, ClosedTradesView.class));
+                    UserThread.execute(() -> navigation.navigateTo(MainView.class, PortfolioView.class, ClosedTradesView.class));
                 },
                 (errorMessage, throwable) -> {
                     log.error(errorMessage);
-                    Popups.openExceptionPopup(throwable);
+                    new Popup().error("An error occurred:\n" + throwable.getMessage()).show();
                 });
-            
-    
-    /*
-            Action response = Popups.openConfirmPopup(
-                    "Withdrawal request", "Confirm your request",
-                    "Your withdrawal request:\n\n" + "Amount: " + amountTextField.getText() + " BTC\n" + "Sending" +
-                            " address: " + withdrawFromTextField.getText() + "\n" + "Receiving address: " +
-                            withdrawToTextField.getText() + "\n" + "Transaction fee: " +
-                            formatter.formatCoinWithCode(FeePolicy.TX_FEE) + "\n" +
-                            "You receive in total: " +
-                            formatter.formatCoinWithCode(amount.subtract(FeePolicy.TX_FEE)) + " BTC\n\n" +
-                            "Are you sure you withdraw that amount?");
-    
-            if (Popups.isOK(response)) {
-                try {
-                    walletService.sendFunds(
-                            withdrawFromTextField.getText(), withdrawToTextField.getText(),
-                            changeAddressTextField.getText(), amount, callback);
-                } catch (AddressFormatException e) {
-                    Popups.openErrorPopup("Address invalid",
-                            "The address is not correct. Please check the address format.");
-    
-                } catch (InsufficientMoneyException e) {
-                    Popups.openInsufficientMoneyPopup();
-                } catch (IllegalArgumentException e) {
-                    Popups.openErrorPopup("Wrong inputs", "Please check the inputs.");
-                }
-            }*/
     }
 
+    public void onOpenDispute() {
+        doOpenDispute(false);
+    }
+
+    public void onOpenSupportTicket() {
+        doOpenDispute(true);
+    }
+
+    private void doOpenDispute(boolean isSupportTicket) {
+        if (trade != null) {
+            Transaction depositTx = trade.getDepositTx();
+            log.debug("trade.getDepositTx() " + depositTx);
+            byte[] depositTxSerialized = null;
+            byte[] payoutTxSerialized = null;
+            String depositTxHashAsString = null;
+            String payoutTxHashAsString = null;
+            if (depositTx != null) {
+                depositTxSerialized = depositTx.bitcoinSerialize();
+                depositTxHashAsString = depositTx.getHashAsString();
+            }
+            Transaction payoutTx = trade.getPayoutTx();
+            if (payoutTx != null) {
+                payoutTxSerialized = payoutTx.bitcoinSerialize();
+                payoutTxHashAsString = payoutTx.getHashAsString();
+            }
+
+            Dispute dispute = new Dispute(disputeManager.getDisputeStorage(),
+                    trade.getId(),
+                    keyRing.getPubKeyRing().hashCode(), // traderId
+                    trade.getOffer().getDirection() == Offer.Direction.BUY ? isOfferer : !isOfferer,
+                    isOfferer,
+                    keyRing.getPubKeyRing(),
+                    trade.getDate(),
+                    trade.getContract(),
+                    trade.getContractHash(),
+                    depositTxSerialized,
+                    payoutTxSerialized,
+                    depositTxHashAsString,
+                    payoutTxHashAsString,
+                    trade.getContractAsJson(),
+                    trade.getOffererContractSignature(),
+                    trade.getTakerContractSignature(),
+                    user.getAcceptedArbitratorByAddress(trade.getArbitratorAddress()).getPubKeyRing(),
+                    isSupportTicket
+            );
+
+            trade.setDisputeState(Trade.DisputeState.DISPUTE_REQUESTED);
+            disputeManager.sendOpenNewDisputeMessage(dispute);
+            navigation.navigateTo(MainView.class, DisputesView.class);
+        }
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
@@ -223,16 +243,12 @@ class PendingTradesDataModel implements Activatable, DataModel {
         return trade.getOffer().getDirection() == Offer.Direction.BUY;
     }
 
-    boolean isOffererRole() {
-        return isOffererRole;
+    boolean isOfferer() {
+        return isOfferer;
     }
 
     Coin getTotalFees() {
-        return FeePolicy.TX_FEE.add(isOffererRole() ? FeePolicy.CREATE_OFFER_FEE : FeePolicy.TAKE_OFFER_FEE);
-    }
-
-    WalletService getWalletService() {
-        return walletService;
+        return FeePolicy.TX_FEE.add(isOfferer() ? FeePolicy.CREATE_OFFER_FEE : FeePolicy.TAKE_OFFER_FEE);
     }
 
     PendingTradesListItem getSelectedItem() {
@@ -243,12 +259,8 @@ class PendingTradesDataModel implements Activatable, DataModel {
         return trade.getOffer().getCurrencyCode();
     }
 
-    String getErrorMessage() {
-        return trade.getErrorMessage();
-    }
-
     public Offer.Direction getDirection(Offer offer) {
-        return isOffererRole ? offer.getDirection() : offer.getMirroredDirection();
+        return isOfferer ? offer.getDirection() : offer.getMirroredDirection();
     }
 
     Coin getPayoutAmount() {
@@ -259,18 +271,10 @@ class PendingTradesDataModel implements Activatable, DataModel {
         return trade.getContract();
     }
 
-    Trade getTrade() {
+    public Trade getTrade() {
         return trade;
     }
 
-    ReadOnlyObjectProperty<TradeState> getSellerProcessState() {
-        return sellerProcessState;
-    }
-
-    ReadOnlyObjectProperty<TradeState> getBuyerProcessState() {
-        return buyerProcessState;
-    }
-
     ReadOnlyObjectProperty<Trade> getTradeProperty() {
         return tradeProperty;
     }
@@ -279,10 +283,6 @@ class PendingTradesDataModel implements Activatable, DataModel {
         return txId;
     }
 
-    String getPayoutTxId() {
-        return trade.getPayoutTx().getHashAsString();
-    }
-
     void addBlockChainListener(BlockChainListener blockChainListener) {
         tradeWalletService.addBlockChainListener(blockChainListener);
     }
@@ -292,11 +292,41 @@ class PendingTradesDataModel implements Activatable, DataModel {
     }
 
     public long getLockTime() {
-        return trade.getLockTime();
+        return trade.getLockTimeAsBlockHeight();
+    }
+
+    public long getCheckPaymentTimeAsBlockHeight() {
+        return trade.getCheckPaymentTimeAsBlockHeight();
+    }
+
+    public long getOpenDisputeTimeAsBlockHeight() {
+        return trade.getOpenDisputeTimeAsBlockHeight();
     }
 
     public int getBestChainHeight() {
         return tradeWalletService.getBestChainHeight();
     }
+
+    public PaymentAccountContractData getSellersPaymentAccountContractData() {
+        return trade.getContract().getSellerPaymentAccountContractData();
+    }
+
+    public String getReference() {
+        return trade.getOffer().getReferenceText();
+    }
+
+    public WalletService getWalletService() {
+        return walletService;
+    }
+
+    public DisputeManager getDisputeManager() {
+        return disputeManager;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Utils
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java
index cd5317445c..d91c05e766 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java
@@ -18,14 +18,12 @@
 package io.bitsquare.gui.main.portfolio.pendingtrades;
 
 import io.bitsquare.trade.Trade;
-
+import javafx.beans.property.ReadOnlyObjectProperty;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
 
 import java.util.Date;
 
-import javafx.beans.property.ReadOnlyObjectProperty;
-
 /**
  * We could remove that wrapper if it is not needed for additional UI only fields.
  */
@@ -69,7 +67,7 @@ public class PendingTradesListItem {
     }
 
     public String getId() {
-        return trade.getId();
+        return trade.getShortId();
     }
 
     public Fiat getPrice() {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml
index 3343f9f67b..d55b2af29d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml
@@ -17,58 +17,44 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import io.bitsquare.gui.components.TitledSeparator?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.VBox?>
 <VBox fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView"
-      xmlns:fx="http://javafx.com/fxml">
+      spacing="20" xmlns:fx="http://javafx.com/fxml">
+    <padding>
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+    </padding>
 
-    <AnchorPane minHeight="145" VBox.vgrow="SOMETIMES">
-        <VBox.margin>
-            <Insets top="20.0" left="20" right="20" bottom="0"/>
-        </VBox.margin>
-
-        <TitledSeparator text="Open trades" AnchorPane.topAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0"/>
-
-        <TableView fx:id="table" AnchorPane.topAnchor="20" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0">
-
-            <columns>
-                <TableColumn text="Trade ID" fx:id="idColumn" minWidth="100" sortable="false">
-                    <cellValueFactory>
-                        <PropertyValueFactory property="id"/>
-                    </cellValueFactory>
-                </TableColumn>
-                <TableColumn text="Date" fx:id="dateColumn" minWidth="130">
-                    <cellValueFactory>
-                        <PropertyValueFactory property="date"/>
-                    </cellValueFactory>
-                </TableColumn>
-                <TableColumn text="Trade amount in BTC" fx:id="tradeAmountColumn" minWidth="130" sortable="false">
-                    <cellValueFactory>
-                        <PropertyValueFactory property="tradeAmount"/>
-                    </cellValueFactory>
-                </TableColumn>
-                <TableColumn text="Price" fx:id="priceColumn" minWidth="100" sortable="false">
-                    <cellValueFactory>
-                        <PropertyValueFactory property="price"/>
-                    </cellValueFactory>
-                </TableColumn>
-                <TableColumn text="Trade amount in EUR" fx:id="tradeVolumeColumn" minWidth="130" sortable="false">
-                    <cellValueFactory>
-                        <PropertyValueFactory property="tradeVolume"/>
-                    </cellValueFactory>
-                </TableColumn>
-                <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
-            </columns>
-        </TableView>
-    </AnchorPane>
-
-    <AnchorPane fx:id="tradeStepPane" minHeight="320" VBox.vgrow="SOMETIMES">
-        <VBox.margin>
-            <Insets top="0.0" left="20" right="20" bottom="20"/>
-        </VBox.margin>
-
-    </AnchorPane>
+    <TableView fx:id="table" VBox.vgrow="SOMETIMES">
+        <columns>
+            <TableColumn text="Trade ID" fx:id="idColumn" minWidth="100" sortable="false">
+                <cellValueFactory>
+                    <PropertyValueFactory property="id"/>
+                </cellValueFactory>
+            </TableColumn>
+            <TableColumn text="Date/Time" fx:id="dateColumn" minWidth="130">
+                <cellValueFactory>
+                    <PropertyValueFactory property="date"/>
+                </cellValueFactory>
+            </TableColumn>
+            <TableColumn text="Trade amount in BTC" fx:id="tradeAmountColumn" minWidth="130" sortable="false">
+                <cellValueFactory>
+                    <PropertyValueFactory property="tradeAmount"/>
+                </cellValueFactory>
+            </TableColumn>
+            <TableColumn text="Price" fx:id="priceColumn" minWidth="100" sortable="false">
+                <cellValueFactory>
+                    <PropertyValueFactory property="price"/>
+                </cellValueFactory>
+            </TableColumn>
+            <TableColumn text="Trade amount" fx:id="tradeVolumeColumn" minWidth="130" sortable="false">
+                <cellValueFactory>
+                    <PropertyValueFactory property="tradeVolume"/>
+                </cellValueFactory>
+            </TableColumn>
+            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
+        </columns>
+    </TableView>
 </VBox>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
index 128644d9d0..5cc23ef70c 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
@@ -17,39 +17,41 @@
 
 package io.bitsquare.gui.main.portfolio.pendingtrades;
 
+import io.bitsquare.common.UserThread;
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.util.GUIUtil;
+import io.bitsquare.gui.popups.OpenEmergencyTicketPopup;
+import io.bitsquare.gui.popups.TradeDetailsPopup;
 import io.bitsquare.trade.Trade;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.utils.Fiat;
-
-import java.util.Date;
-
-import javax.inject.Inject;
-
-import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.control.cell.*;
-import javafx.scene.layout.*;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.input.KeyCombination;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.utils.Fiat;
+
+import javax.inject.Inject;
+import java.util.Date;
 
 @FxmlView
 public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTradesViewModel> {
 
-    @FXML AnchorPane tradeStepPane;
+    private final TradeDetailsPopup tradeDetailsPopup;
     @FXML TableView<PendingTradesListItem> table;
     @FXML TableColumn<PendingTradesListItem, Fiat> priceColumn;
     @FXML TableColumn<PendingTradesListItem, Fiat> tradeVolumeColumn;
     @FXML TableColumn<PendingTradesListItem, PendingTradesListItem> directionColumn;
-    @FXML TableColumn<PendingTradesListItem, String> idColumn;
+    @FXML
+    TableColumn<PendingTradesListItem, PendingTradesListItem> idColumn;
     @FXML TableColumn<PendingTradesListItem, Date> dateColumn;
     @FXML TableColumn<PendingTradesListItem, Coin> tradeAmountColumn;
 
@@ -65,8 +67,9 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public PendingTradesView(PendingTradesViewModel model) {
+    public PendingTradesView(PendingTradesViewModel model, TradeDetailsPopup tradeDetailsPopup) {
         super(model);
+        this.tradeDetailsPopup = tradeDetailsPopup;
     }
 
     @Override
@@ -80,63 +83,67 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
 
         table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
         table.setPlaceholder(new Label("No pending trades available"));
-
+        table.setMinHeight(100);
         selectedItemChangeListener = (ov, oldValue, newValue) -> {
             model.onSelectTrade(newValue);
             log.debug("selectedItemChangeListener {} ", newValue);
-            setNewSubView(newValue != null && newValue.getTrade() != null);
+            if (newValue != null)
+                setNewSubView(newValue.getTrade());
         };
 
         appFocusChangeListener = (observable, oldValue, newValue) -> {
             if (newValue && model.getSelectedItem() != null) {
                 // Focus selectedItem from model
                 int index = table.getItems().indexOf(model.getSelectedItem());
-                Platform.runLater(() -> {
+                UserThread.execute(() -> {
                     table.requestFocus();
-                    Platform.runLater(() -> table.getFocusModel().focus(index));
+                    UserThread.execute(() -> table.getFocusModel().focus(index));
                 });
             }
         };
 
         currentTradeChangeListener = (observable, oldValue, newValue) -> {
             log.debug("currentTradeChangeListener {} ", newValue);
-            setNewSubView(newValue != null);
+            setNewSubView(newValue);
         };
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         appFocusProperty = root.getScene().getWindow().focusedProperty();
         appFocusProperty.addListener(appFocusChangeListener);
         model.currentTrade().addListener(currentTradeChangeListener);
+        setNewSubView(model.currentTrade().get());
         table.setItems(model.getList());
         table.getSelectionModel().selectedItemProperty().addListener(selectedItemChangeListener);
         PendingTradesListItem selectedItem = model.getSelectedItem();
         if (selectedItem != null) {
-            // addSubView();
-
             // Select and focus selectedItem from model
             int index = table.getItems().indexOf(selectedItem);
-            Platform.runLater(() -> {
+            UserThread.execute(() -> {
                 table.getSelectionModel().select(index);
                 table.requestFocus();
-                Platform.runLater(() -> table.getFocusModel().focus(index));
+                UserThread.execute(() -> table.getFocusModel().focus(index));
             });
         }
-        else {
-            //removeSubView();
-        }
 
-        /*if (currentSubView != null)
-            currentSubView.activate();*/
+        // we add hidden emergency shortcut to open support ticket
+        root.getScene().setOnKeyReleased(keyEvent -> {
+            if (new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN).match(keyEvent))
+                new OpenEmergencyTicketPopup().onOpenTicket(() -> model.dataModel.onOpenSupportTicket()).show();
+        });
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         table.getSelectionModel().selectedItemProperty().removeListener(selectedItemChangeListener);
-        model.currentTrade().removeListener(currentTradeChangeListener);
-        appFocusProperty.removeListener(appFocusChangeListener);
-        appFocusProperty = null;
+        if (model.currentTrade() != null)
+            model.currentTrade().removeListener(currentTradeChangeListener);
+
+        if (appFocusProperty != null) {
+            appFocusProperty.removeListener(appFocusChangeListener);
+            appFocusProperty = null;
+        }
 
         if (currentSubView != null)
             currentSubView.deactivate();
@@ -147,18 +154,13 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
     // Subviews
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void setNewSubView(boolean isTradeSelected) {
-        log.debug("setNewSubView {}", isTradeSelected);
+    private void setNewSubView(Trade trade) {
         if (currentSubView != null) {
             currentSubView.deactivate();
-
-            if (!isTradeSelected) {
-                tradeStepPane.getChildren().remove(currentSubView);
-                currentSubView = null;
-            }
+            root.getChildren().remove(currentSubView);
         }
 
-        if (isTradeSelected) {
+        if (trade != null) {
             if (model.isOfferer()) {
                 if (model.isBuyOffer())
                     currentSubView = new BuyerSubView(model);
@@ -171,50 +173,38 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
                 else
                     currentSubView = new BuyerSubView(model);
             }
+            currentSubView.setMinHeight(420);
+            VBox.setVgrow(currentSubView, Priority.ALWAYS);
+            root.getChildren().add(1, currentSubView);
 
             currentSubView.activate();
-            AnchorPane.setTopAnchor(currentSubView, 0d);
-            AnchorPane.setRightAnchor(currentSubView, 0d);
-            AnchorPane.setBottomAnchor(currentSubView, 0d);
-            AnchorPane.setLeftAnchor(currentSubView, 0d);
-            tradeStepPane.getChildren().setAll(currentSubView);
         }
     }
 
-    private void openOfferDetails(String id) {
-        // TODO Open popup with details view
-        log.debug("Trade details " + id);
-        GUIUtil.copyToClipboard(id);
-        Popups.openWarningPopup("Under construction",
-                "The trader ID was copied to the clipboard. " +
-                        "Use that to identify your trading peer in the IRC chat room \n\n" +
-                        "Later this will open a details popup but that is not implemented yet.");
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // CellFactories
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private void setTradeIdColumnCellFactory() {
+        idColumn.setCellValueFactory((pendingTradesListItem) -> new ReadOnlyObjectWrapper<>(pendingTradesListItem.getValue()));
         idColumn.setCellFactory(
-                new Callback<TableColumn<PendingTradesListItem, String>, TableCell<PendingTradesListItem, String>>() {
+                new Callback<TableColumn<PendingTradesListItem, PendingTradesListItem>, TableCell<PendingTradesListItem, PendingTradesListItem>>() {
 
                     @Override
-                    public TableCell<PendingTradesListItem, String> call(TableColumn<PendingTradesListItem,
-                            String> column) {
-                        return new TableCell<PendingTradesListItem, String>() {
+                    public TableCell<PendingTradesListItem, PendingTradesListItem> call(TableColumn<PendingTradesListItem,
+                            PendingTradesListItem> column) {
+                        return new TableCell<PendingTradesListItem, PendingTradesListItem>() {
                             private Hyperlink hyperlink;
 
                             @Override
-                            public void updateItem(final String id, boolean empty) {
-                                super.updateItem(id, empty);
+                            public void updateItem(final PendingTradesListItem item, boolean empty) {
+                                super.updateItem(item, empty);
 
-                                if (id != null && !empty) {
-                                    hyperlink = new Hyperlink(model.formatTradeId(id));
-                                    hyperlink.setId("id-link");
-                                    Tooltip.install(hyperlink, new Tooltip(model.formatTradeId(id)));
-                                    hyperlink.setOnAction(event -> openOfferDetails(id));
+                                if (item != null && !empty) {
+                                    hyperlink = new Hyperlink(model.formatTradeId(item.getId()));
+                                    Tooltip.install(hyperlink, new Tooltip(model.formatTradeId(item.getId())));
+                                    hyperlink.setOnAction(event -> tradeDetailsPopup.show(item.getTrade()));
                                     setGraphic(hyperlink);
                                 }
                                 else {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
index 5929dd7d2f..fab95c2942 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
@@ -17,42 +17,32 @@
 
 package io.bitsquare.gui.main.portfolio.pendingtrades;
 
-import io.bitsquare.btc.WalletService;
+import com.google.inject.Inject;
+import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.gui.common.model.ActivatableWithDataModel;
 import io.bitsquare.gui.common.model.ViewModel;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.gui.util.validation.BtcAddressValidator;
+import io.bitsquare.gui.util.validation.*;
 import io.bitsquare.locale.BSResources;
+import io.bitsquare.payment.PaymentMethod;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.trade.TradeState;
-
+import javafx.beans.property.*;
+import javafx.collections.ObservableList;
 import org.bitcoinj.core.BlockChainListener;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
-
-import com.google.inject.Inject;
+import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.Subscription;
 
 import java.util.Date;
 
-import javafx.beans.InvalidationListener;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.ReadOnlyStringProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.ObservableList;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel.SellerState.*;
 
 public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(PendingTradesViewModel.class);
+    private Subscription tradeStateSubscription;
 
-    interface State {
+    private interface State {
     }
 
     enum BuyerState implements State {
@@ -75,12 +65,16 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
     }
 
     private final BSFormatter formatter;
-    private final InvalidationListener sellerStateListener;
-    private final InvalidationListener buyerStateListener;
     private final BtcAddressValidator btcAddressValidator;
 
+    private final IBANValidator ibanValidator;
+    private final BICValidator bicValidator;
+    private final InputValidator inputValidator;
+    private final OKPayValidator okPayValidator;
+    private final AltCoinAddressValidator altCoinAddressValidator;
+
     private final ObjectProperty<BuyerState> buyerState = new SimpleObjectProperty<>(PendingTradesViewModel.BuyerState.UNDEFINED);
-    private final ObjectProperty<SellerState> sellerState = new SimpleObjectProperty<>(PendingTradesViewModel.SellerState.UNDEFINED);
+    private final ObjectProperty<SellerState> sellerState = new SimpleObjectProperty<>(UNDEFINED);
 
     private final StringProperty txId = new SimpleStringProperty();
     private final BooleanProperty withdrawalButtonDisable = new SimpleBooleanProperty(true);
@@ -91,36 +85,55 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public PendingTradesViewModel(PendingTradesDataModel dataModel, BSFormatter formatter,
-                                  BtcAddressValidator btcAddressValidator) {
+    public PendingTradesViewModel(PendingTradesDataModel dataModel,
+                                  BSFormatter formatter,
+                                  BtcAddressValidator btcAddressValidator,
+                                  IBANValidator ibanValidator,
+                                  BICValidator bicValidator,
+                                  InputValidator inputValidator,
+                                  OKPayValidator okPayValidator,
+                                  AltCoinAddressValidator altCoinAddressValidator
+    ) {
         super(dataModel);
 
         this.formatter = formatter;
         this.btcAddressValidator = btcAddressValidator;
-        this.sellerStateListener = (ov) -> applySellerState();
-        this.buyerStateListener = (ov) -> applyBuyerState();
+        this.ibanValidator = ibanValidator;
+        this.bicValidator = bicValidator;
+        this.inputValidator = inputValidator;
+        this.okPayValidator = okPayValidator;
+        this.altCoinAddressValidator = altCoinAddressValidator;
     }
 
     @Override
-    public void doActivate() {
-        txId.bind(dataModel.getTxId());
+    protected void activate() {
+        setTradeStateSubscription();
 
-        dataModel.getSellerProcessState().addListener(sellerStateListener);
-        dataModel.getBuyerProcessState().addListener(buyerStateListener);
+        txId.bind(dataModel.getTxId());
+    }
+
+    @Override
+    protected void deactivate() {
+        if (tradeStateSubscription != null) {
+            tradeStateSubscription.unsubscribe();
+            tradeStateSubscription = null;
+        }
+        txId.unbind();
+    }
+
+    private void setTradeStateSubscription() {
+        if (tradeStateSubscription != null)
+            tradeStateSubscription.unsubscribe();
 
         if (dataModel.getTrade() != null) {
-            applySellerState();
-            applyBuyerState();
+            tradeStateSubscription = EasyBind.subscribe(dataModel.getTrade().stateProperty(), newValue -> {
+                if (newValue != null) {
+                    applyState(newValue);
+                }
+            });
         }
     }
 
-    @Override
-    public void doDeactivate() {
-        txId.unbind();
-
-        dataModel.getSellerProcessState().removeListener(sellerStateListener);
-        dataModel.getBuyerProcessState().removeListener(buyerStateListener);
-    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // UI actions
@@ -128,8 +141,12 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
 
     void onSelectTrade(PendingTradesListItem item) {
         dataModel.onSelectTrade(item);
+
+        // call it after  dataModel.onSelectTrade as trade is set
+        setTradeStateSubscription();
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -146,10 +163,6 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
         return txId;
     }
 
-    public String getPayoutTxId() {
-        return dataModel.getPayoutTxId();
-    }
-
     public ReadOnlyBooleanProperty getWithdrawalButtonDisable() {
         return withdrawalButtonDisable;
     }
@@ -187,11 +200,7 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
     }
 
     public boolean isOfferer() {
-        return dataModel.isOffererRole();
-    }
-
-    public WalletService getWalletService() {
-        return dataModel.getWalletService();
+        return dataModel.isOfferer();
     }
 
     PendingTradesListItem getSelectedItem() {
@@ -206,10 +215,6 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
         return btcAddressValidator;
     }
 
-    String getErrorMessage() {
-        return dataModel.getErrorMessage();
-    }
-
     // columns
     String formatTradeId(String value) {
         return value;
@@ -228,7 +233,7 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
     }
 
     String evaluateDirection(PendingTradesListItem item) {
-        return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getTrade().getOffer())) : "";
+        return (item != null) ? formatter.getDirection(dataModel.getDirection(item.getTrade().getOffer())) : "";
     }
 
     String formatDate(Date value) {
@@ -247,37 +252,54 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
         return dataModel.getLockTime();
     }
 
+    public long getCheckPaymentTimeAsBlockHeight() {
+        return dataModel.getCheckPaymentTimeAsBlockHeight();
+    }
+
+    public long getOpenDisputeTimeAsBlockHeight() {
+        return dataModel.getOpenDisputeTimeAsBlockHeight();
+    }
+
+
     public int getBestChainHeight() {
         return dataModel.getBestChainHeight();
     }
 
-    public String getUnlockDate(long missingBlocks) {
-        return formatter.getUnlockDate(missingBlocks);
+    public String getDateFromBlocks(long missingBlocks) {
+        return formatter.getDateFromBlocks(missingBlocks);
+    }
+
+    public String getReference() {
+        return dataModel.getReference();
     }
 
-    // payment
     public String getPaymentMethod() {
-        assert dataModel.getContract() != null;
-        return BSResources.get(dataModel.getContract().sellerFiatAccount.type.toString());
+        checkNotNull(dataModel.getContract(), "dataModel.getContract() must not be null");
+        return BSResources.get(dataModel.getContract().getPaymentMethodName());
     }
 
     public String getFiatAmount() {
         return formatter.formatFiatWithCode(dataModel.getTrade().getTradeVolume());
     }
 
-    public String getHolderName() {
-        assert dataModel.getContract() != null;
-        return dataModel.getContract().sellerFiatAccount.accountHolderName;
+    public IBANValidator getIbanValidator() {
+        return ibanValidator;
     }
 
-    public String getPrimaryId() {
-        assert dataModel.getContract() != null;
-        return dataModel.getContract().sellerFiatAccount.accountPrimaryID;
+    public AltCoinAddressValidator getAltCoinAddressValidator() {
+        return altCoinAddressValidator;
     }
 
-    public String getSecondaryId() {
-        assert dataModel.getContract() != null;
-        return dataModel.getContract().sellerFiatAccount.accountSecondaryID;
+    public BICValidator getBicValidator() {
+        return bicValidator;
+    }
+
+    public InputValidator getInputValidator() {
+        return inputValidator;
+    }
+
+    public OKPayValidator getOkPayValidator() {
+        return okPayValidator;
     }
 
     // summary
@@ -294,13 +316,15 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
     }
 
     public String getSecurityDeposit() {
-        // securityDeposit is handled different for offerer and taker.
-        // Offerer have paid in the max amount, but taker might have taken less so also paid in less securityDeposit
-        if (dataModel.isOffererRole())
-            return formatter.formatCoinWithCode(dataModel.getTrade().getOffer().getSecurityDeposit());
-        else
-            return formatter.formatCoinWithCode(dataModel.getTrade().getSecurityDeposit());
+        return formatter.formatCoinWithCode(FeePolicy.SECURITY_DEPOSIT);
+    }
 
+    public boolean isBlockChainMethod() {
+        return dataModel.getTrade().getOffer().getPaymentMethod().equals(PaymentMethod.BLOCK_CHAINS);
+    }
+
+    public Trade getTrade() {
+        return dataModel.getTrade();
     }
 
 
@@ -308,112 +332,72 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
     // States
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void applySellerState() {
-        if (dataModel.getSellerProcessState().get() instanceof TradeState.SellerState) {
-            TradeState.SellerState processState = (TradeState.SellerState) dataModel.getSellerProcessState().get();
-            log.debug("updateSellerState (SellerTradeState) " + processState);
-            if (processState != null) {
-                switch (processState) {
-                    case PREPARATION:
-                        sellerState.set(PendingTradesViewModel.SellerState.UNDEFINED);
-                        break;
+    private void applyState(Trade.State tradeState) {
+        log.debug("updateSellerState (SellerTradeState) " + tradeState);
+        switch (tradeState) {
+            case PREPARATION:
+                sellerState.set(UNDEFINED);
+                buyerState.set(PendingTradesViewModel.BuyerState.UNDEFINED);
+                break;
 
-                    case DEPOSIT_PUBLISHED_MSG_RECEIVED:
-                        sellerState.set(PendingTradesViewModel.SellerState.WAIT_FOR_BLOCKCHAIN_CONFIRMATION);
-                        break;
+            case TAKER_FEE_PAID:
+                break;
+
+            case DEPOSIT_PUBLISH_REQUESTED:
+                break;
+            case DEPOSIT_PUBLISHED:
+            case DEPOSIT_SEEN_IN_NETWORK:
+            case DEPOSIT_PUBLISHED_MSG_SENT:
+            case DEPOSIT_PUBLISHED_MSG_RECEIVED:
+                sellerState.set(WAIT_FOR_BLOCKCHAIN_CONFIRMATION);
+                buyerState.set(PendingTradesViewModel.BuyerState.WAIT_FOR_BLOCKCHAIN_CONFIRMATION);
+                break;
+
+            case DEPOSIT_CONFIRMED:
+                sellerState.set(WAIT_FOR_FIAT_PAYMENT_STARTED);
+                buyerState.set(PendingTradesViewModel.BuyerState.REQUEST_START_FIAT_PAYMENT);
+                break;
 
 
-                    case DEPOSIT_CONFIRMED:
-                        sellerState.set(PendingTradesViewModel.SellerState.WAIT_FOR_FIAT_PAYMENT_STARTED);
-                        break;
+            case FIAT_PAYMENT_STARTED:
+                break;
+            case FIAT_PAYMENT_STARTED_MSG_SENT:
+                buyerState.set(PendingTradesViewModel.BuyerState.WAIT_FOR_FIAT_PAYMENT_RECEIPT);
+                break;
+            case FIAT_PAYMENT_STARTED_MSG_RECEIVED:
+                sellerState.set(REQUEST_CONFIRM_FIAT_PAYMENT_RECEIVED);
+                break;
 
 
-                    case FIAT_PAYMENT_STARTED_MSG_RECEIVED:
-                        sellerState.set(PendingTradesViewModel.SellerState.REQUEST_CONFIRM_FIAT_PAYMENT_RECEIVED);
-                        break;
+            case FIAT_PAYMENT_RECEIPT:
+                break;
+            case FIAT_PAYMENT_RECEIPT_MSG_SENT:
+                sellerState.set(WAIT_FOR_PAYOUT_TX);
+                buyerState.set(PendingTradesViewModel.BuyerState.WAIT_FOR_FIAT_PAYMENT_RECEIPT);
+                break;
+            case FIAT_PAYMENT_RECEIPT_MSG_RECEIVED:
+                break;
 
 
-                    case FIAT_PAYMENT_RECEIPT:
-                        break;
-                    case FIAT_PAYMENT_RECEIPT_MSG_SENT:
-                        sellerState.set(PendingTradesViewModel.SellerState.WAIT_FOR_PAYOUT_TX);
-                        break;
+            case PAYOUT_TX_SENT:
+                buyerState.set(PendingTradesViewModel.BuyerState.WAIT_FOR_UNLOCK_PAYOUT);
+                break;
+            case PAYOUT_TX_RECEIVED:
+                break;
+            case PAYOUT_TX_COMMITTED:
+                sellerState.set(WAIT_FOR_UNLOCK_PAYOUT);
+                break;
+            case PAYOUT_BROAD_CASTED:
+                sellerState.set(REQUEST_WITHDRAWAL);
+                buyerState.set(PendingTradesViewModel.BuyerState.REQUEST_WITHDRAWAL);
+                break;
 
+            case WITHDRAW_COMPLETED:
+                break;
 
-                    case PAYOUT_TX_RECEIVED:
-                        break;
-                    case PAYOUT_TX_COMMITTED:
-                        sellerState.set(PendingTradesViewModel.SellerState.WAIT_FOR_UNLOCK_PAYOUT);
-                        break;
-
-
-                    case PAYOUT_BROAD_CASTED:
-                        sellerState.set(PendingTradesViewModel.SellerState.REQUEST_WITHDRAWAL);
-                        break;
-
-                    default:
-                        log.warn("unhandled processState " + processState);
-                        break;
-                }
-            }
-        }
-        else {
-            log.error("Unhandled state " + dataModel.getSellerProcessState().get());
-        }
-    }
-
-    private void applyBuyerState() {
-        if (dataModel.getBuyerProcessState().get() instanceof TradeState.BuyerState) {
-            TradeState.BuyerState processState = (TradeState.BuyerState) dataModel.getBuyerProcessState().get();
-            log.debug("updateBuyerState (BuyerTradeState) " + processState);
-            if (processState != null) {
-                switch (processState) {
-                    case PREPARATION:
-                        sellerState.set(PendingTradesViewModel.SellerState.UNDEFINED);
-                        break;
-
-
-                    case DEPOSIT_PUBLISHED:
-                    case DEPOSIT_PUBLISHED_MSG_SENT:
-                        buyerState.set(PendingTradesViewModel.BuyerState.WAIT_FOR_BLOCKCHAIN_CONFIRMATION);
-                        break;
-
-
-                    case DEPOSIT_CONFIRMED:
-                        buyerState.set(PendingTradesViewModel.BuyerState.REQUEST_START_FIAT_PAYMENT);
-                        break;
-
-
-                    case FIAT_PAYMENT_STARTED:
-                        break;
-                    case FIAT_PAYMENT_STARTED_MSG_SENT:
-                        buyerState.set(PendingTradesViewModel.BuyerState.WAIT_FOR_FIAT_PAYMENT_RECEIPT);
-                        break;
-
-
-                    case FIAT_PAYMENT_RECEIPT_MSG_RECEIVED:
-                    case PAYOUT_TX_COMMITTED:
-                        break;
-                    case PAYOUT_TX_SENT:
-                        buyerState.set(PendingTradesViewModel.BuyerState.WAIT_FOR_UNLOCK_PAYOUT);
-                        break;
-
-
-                    case PAYOUT_BROAD_CASTED:
-                        buyerState.set(PendingTradesViewModel.BuyerState.REQUEST_WITHDRAWAL);
-                        break;
-
-                    case WITHDRAW_COMPLETED:
-                        break;
-
-                    default:
-                        log.warn("unhandled viewState " + processState);
-                        break;
-                }
-            }
-        }
-        else {
-            log.error("Unhandled state " + dataModel.getBuyerProcessState().get());
+            default:
+                log.warn("unhandled processState " + tradeState);
+                break;
         }
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java
index 66909cbc57..ace4eb35ea 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java
@@ -17,30 +17,20 @@
 
 package io.bitsquare.gui.main.portfolio.pendingtrades;
 
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.CompletedView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.ConfirmFiatReceivedView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitPayoutFinalizedView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitPayoutLockTimeView;
-import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitTxInBlockchainView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.*;
 import io.bitsquare.locale.BSResources;
-
 import javafx.beans.value.ChangeListener;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class SellerSubView extends TradeSubView {
-    private static final Logger log = LoggerFactory.getLogger(SellerSubView.class);
-
     private TradeWizardItem waitTxInBlockchain;
-    private TradeWizardItem waitFiatStarted;
-    private TradeWizardItem confirmFiatReceived;
-    private TradeWizardItem payoutUnlock;
+    private TradeWizardItem waitPaymentStarted;
+    private TradeWizardItem confirmPaymentReceived;
+    private TradeWizardItem waitPayoutUnlock;
     private TradeWizardItem completed;
 
     private final ChangeListener<PendingTradesViewModel.SellerState> stateChangeListener;
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, Initialisation
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -51,14 +41,14 @@ public class SellerSubView extends TradeSubView {
     }
 
     @Override
-    public void activate() {
+    protected void activate() {
         super.activate();
         model.getSellerState().addListener(stateChangeListener);
         applyState(model.getSellerState().get());
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         super.deactivate();
         model.getSellerState().removeListener(stateChangeListener);
     }
@@ -66,12 +56,15 @@ public class SellerSubView extends TradeSubView {
     @Override
     protected void addWizards() {
         waitTxInBlockchain = new TradeWizardItem(WaitTxInBlockchainView.class, "Wait for blockchain confirmation");
-        waitFiatStarted = new TradeWizardItem(WaitTxInBlockchainView.class, "Wait until EUR payment has started");
-        confirmFiatReceived = new TradeWizardItem(ConfirmFiatReceivedView.class, "Confirm EUR payment received");
-        payoutUnlock = new TradeWizardItem(WaitPayoutLockTimeView.class, "Wait for payout unlock");
+        waitPaymentStarted = new TradeWizardItem(WaitPaymentStartedView.class, "Wait until EUR payment has started");
+        confirmPaymentReceived = new TradeWizardItem(ConfirmPaymentReceivedView.class, "Confirm EUR payment received");
+        waitPayoutUnlock = new TradeWizardItem(WaitPayoutLockTimeView.class, "Wait for payout unlock");
         completed = new TradeWizardItem(CompletedView.class, "Completed");
 
-        leftVBox.getChildren().setAll(waitTxInBlockchain, waitFiatStarted, confirmFiatReceived, payoutUnlock, completed);
+        if (model.getLockTime() > 0)
+            leftVBox.getChildren().setAll(waitTxInBlockchain, waitPaymentStarted, confirmPaymentReceived, waitPayoutUnlock, completed);
+        else
+            leftVBox.getChildren().setAll(waitTxInBlockchain, waitPaymentStarted, confirmPaymentReceived, completed);
     }
 
 
@@ -79,90 +72,84 @@ public class SellerSubView extends TradeSubView {
     // State
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    protected void applyState(PendingTradesViewModel.SellerState viewState) {
+    private void applyState(PendingTradesViewModel.SellerState viewState) {
         log.debug("applyState " + viewState);
 
         waitTxInBlockchain.setDisabled();
-        waitFiatStarted.setDisabled();
-        confirmFiatReceived.setDisabled();
-        payoutUnlock.setDisabled();
+        waitPaymentStarted.setDisabled();
+        confirmPaymentReceived.setDisabled();
+        waitPayoutUnlock.setDisabled();
         completed.setDisabled();
 
         if (tradeStepDetailsView != null)
-            tradeStepDetailsView.deactivate();
+            tradeStepDetailsView.doDeactivate();
 
         switch (viewState) {
             case UNDEFINED:
-               /* showItem(waitTxInBlockchain);
-                ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoLabelText("Trade is in an incomplete state.");*/
+                contentPane.getChildren().clear();
+                leftVBox.getChildren().clear();
                 break;
             case WAIT_FOR_BLOCKCHAIN_CONFIRMATION:
                 showItem(waitTxInBlockchain);
 
                 ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoLabelText("Deposit transaction has been published. " +
-                        "The Bitcoin buyer need to wait for at least one block chain confirmation.");
-               /* ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoDisplayField(BSResources.get("The Bitcoin buyer needs to wait for at least one " +
-                                "block chain confirmation before starting the {0} payment. " +
-                                "That is needed to assure that the deposit input funding has not been " +
-                                "double-spent. " +
-                                "For higher trade volumes it is recommended to wait up to 6 confirmations.",
-                        model.getCurrencyCode()));*/
+                        "The Bitcoin buyer need to wait for at least one blockchain confirmation.");
                 break;
             case WAIT_FOR_FIAT_PAYMENT_STARTED:
                 waitTxInBlockchain.setCompleted();
-                showItem(waitFiatStarted);
+                showItem(waitPaymentStarted);
 
-                ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoLabelText(BSResources.get("Deposit transaction has at least one block chain " +
+                ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoLabelText(BSResources.get("Deposit transaction has at least one blockchain " +
                                 "confirmation. " +
                                 "Waiting that other trader starts the {0} payment.",
                         model.getCurrencyCode()));
-               /* ((WaitTxInBlockchainView) tradeStepDetailsView).setInfoDisplayField(BSResources.get("You will get informed when the other trader has " +
-                                "indicated " +
-                                "the {0} payment has been started.",
-                        model.getCurrencyCode()));*/
                 break;
             case REQUEST_CONFIRM_FIAT_PAYMENT_RECEIVED:
                 waitTxInBlockchain.setCompleted();
-                waitFiatStarted.setCompleted();
-                showItem(confirmFiatReceived);
+                waitPaymentStarted.setCompleted();
+                showItem(confirmPaymentReceived);
 
-                ((ConfirmFiatReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("The Bitcoin buyer has started the {0} payment." +
-                                "Check your payments account and confirm when you have received the payment.",
-                        model.getCurrencyCode()));
-                /*((ConfirmFiatReceivedView) tradeStepDetailsView).setInfoDisplayField(BSResources.get("It is important that you confirm when you have " +
-                                "received the " +
-                                "{0} payment as this will publish the payout transaction where you get returned " +
-                                "your security deposit and the Bitcoin buyer receive the Bitcoin amount you sold.",
-                        model.getCurrencyCode()));*/
+                if (model.isBlockChainMethod()) {
+                    ((ConfirmPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("The Bitcoin buyer has started the {0} payment." +
+                                    "Check your Altcoin wallet or Block explorer and confirm when you have received the payment.",
+                            model.getCurrencyCode()));
+                } else {
+                    ((ConfirmPaymentReceivedView) tradeStepDetailsView).setInfoLabelText(BSResources.get("The Bitcoin buyer has started the {0} payment." +
+                                    "Check your payment account and confirm when you have received the payment.",
+                            model.getCurrencyCode()));
+                }
 
                 break;
             case WAIT_FOR_PAYOUT_TX:
-                waitTxInBlockchain.setCompleted();
-                waitFiatStarted.setCompleted();
-                confirmFiatReceived.setCompleted();
-                showItem(payoutUnlock);
+                if (model.getLockTime() > 0) {
+                    waitTxInBlockchain.setCompleted();
+                    waitPaymentStarted.setCompleted();
+                    confirmPaymentReceived.setCompleted();
+                    showItem(waitPayoutUnlock);
 
-                // We dont use a wizard for that step as it only gets displayed in case the other peer is offline
-                tradeStepDetailsView = new WaitPayoutFinalizedView(model);
-                contentPane.getChildren().setAll(tradeStepDetailsView);
+                    // We don't use a wizard for that step as it only gets displayed in case the other peer is offline
+                    tradeStepDetailsView = new WaitPayoutFinalizedView(model);
+                    contentPane.getChildren().setAll(tradeStepDetailsView);
 
-                ((WaitPayoutFinalizedView) tradeStepDetailsView).setInfoLabelText("We requested the trading peer to sign and finalize the payout transaction." +
-                        "\nIt might be that the other peer is offline, so we need to wait until he finalize the transaction when he goes online again.");
+                    ((WaitPayoutFinalizedView) tradeStepDetailsView).setInfoLabelText("We requested the trading peer to sign and finalize the payout " +
+                            "transaction.\n" +
+                            "It might be that the other peer is offline, so we need to wait until he finalize the transaction when he goes online again.");
+                }
                 break;
             case WAIT_FOR_UNLOCK_PAYOUT:
                 waitTxInBlockchain.setCompleted();
-                waitFiatStarted.setCompleted();
-                confirmFiatReceived.setCompleted();
-                showItem(payoutUnlock);
+                waitPaymentStarted.setCompleted();
+                confirmPaymentReceived.setCompleted();
+                showItem(waitPayoutUnlock);
 
                 ((WaitPayoutLockTimeView) tradeStepDetailsView).setInfoLabelText("The payout transaction is signed and finalized by both parties." +
                         "\nFor reducing bank charge back risks you need to wait until the payout gets unlocked to transfer your Bitcoin.");
                 break;
             case REQUEST_WITHDRAWAL:
                 waitTxInBlockchain.setCompleted();
-                waitFiatStarted.setCompleted();
-                confirmFiatReceived.setCompleted();
-                payoutUnlock.setCompleted();
+                waitPaymentStarted.setCompleted();
+                confirmPaymentReceived.setCompleted();
+                waitPayoutUnlock.setCompleted();
                 showItem(completed);
 
                 CompletedView completedView = (CompletedView) tradeStepDetailsView;
@@ -172,8 +159,6 @@ public class SellerSubView extends TradeSubView {
                 completedView.setFiatTradeAmountTextFieldText(model.getFiatVolume());
                 completedView.setFeesTextFieldText(model.getTotalFees());
                 completedView.setSecurityDepositTextFieldText(model.getSecurityDeposit());
-                completedView.setSummaryInfoDisplayText("Your security deposit has been refunded to you. " +
-                        "You can review the details to that trade any time in the closed trades screen.");
 
                 completedView.setWithdrawAmountTextFieldText(model.getPayoutAmount());
                 break;
@@ -183,7 +168,7 @@ public class SellerSubView extends TradeSubView {
         }
 
         if (tradeStepDetailsView != null)
-            tradeStepDetailsView.activate();
+            tradeStepDetailsView.doActivate();
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java
index d03d7021b0..8becb18659 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java
@@ -20,14 +20,15 @@ package io.bitsquare.gui.main.portfolio.pendingtrades;
 import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepDetailsView;
 import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem;
 import io.bitsquare.gui.util.Layout;
-
-import javafx.scene.layout.*;
-
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public abstract class TradeSubView extends HBox {
-    private static final Logger log = LoggerFactory.getLogger(TradeSubView.class);
+    protected final Logger log = LoggerFactory.getLogger(this.getClass());
 
     protected final PendingTradesViewModel model;
     protected VBox leftVBox;
@@ -44,15 +45,15 @@ public abstract class TradeSubView extends HBox {
 
         setSpacing(Layout.PADDING_WINDOW);
         buildViews();
-
     }
 
-    public void activate() {
+    protected void activate() {
+        // don't call tradeStepDetailsView.activate() as that will be called when state is set
     }
 
-    public void deactivate() {
+    protected void deactivate() {
         if (tradeStepDetailsView != null)
-            tradeStepDetailsView.deactivate();
+            tradeStepDetailsView.doDeactivate();
     }
 
 
@@ -60,6 +61,7 @@ public abstract class TradeSubView extends HBox {
     // Misc
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+
     private void buildViews() {
         addLeftBox();
         addContentPane();
@@ -76,11 +78,10 @@ public abstract class TradeSubView extends HBox {
     private void createAndAddTradeStepView(Class<? extends TradeStepDetailsView> viewClass) {
         try {
             tradeStepDetailsView = viewClass.getDeclaredConstructor(PendingTradesViewModel.class).newInstance(model);
+            contentPane.getChildren().setAll(tradeStepDetailsView);
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-        contentPane.getChildren().setAll(tradeStepDetailsView);
     }
 
     private void addLeftBox() {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java
index 3b5189775a..abb452a81f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java
@@ -18,35 +18,27 @@
 package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.app.BitsquareApp;
-import io.bitsquare.gui.components.InfoDisplay;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.util.Tuple2;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
-
-import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
-import javafx.event.ActionEvent;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static io.bitsquare.gui.util.ComponentBuilder.*;
+import static io.bitsquare.gui.util.FormBuilder.*;
 
 public class CompletedView extends TradeStepDetailsView {
-    private static final Logger log = LoggerFactory.getLogger(WaitTxInBlockchainView.class);
-
     private final ChangeListener<Boolean> focusedPropertyListener;
 
     private Label btcTradeAmountLabel;
     private TextField btcTradeAmountTextField;
     private Label fiatTradeAmountLabel;
     private TextField fiatTradeAmountTextField;
-    private Label feesLabel;
     private TextField feesTextField;
-    private Label securityDepositLabel;
     private TextField securityDepositTextField;
-    private InfoDisplay summaryInfoDisplay;
     private InputTextField withdrawAddressTextField;
     private TextField withdrawAmountTextField;
     private Button withdrawButton;
@@ -66,74 +58,60 @@ public class CompletedView extends TradeStepDetailsView {
     }
 
     @Override
-    public void activate() {
-        super.activate();
+    public void doActivate() {
+        super.doActivate();
         withdrawAddressTextField.focusedProperty().addListener(focusedPropertyListener);
         withdrawAddressTextField.setValidator(model.getBtcAddressValidator());
         withdrawButton.disableProperty().bind(model.getWithdrawalButtonDisable());
 
         // We need to handle both cases: Address not set and address already set (when returning from other view)
         // We get address validation after focus out, so first make sure we loose focus and then set it again as hint for user to put address in
-        Platform.runLater(() -> {
+        UserThread.execute(() -> {
             withdrawAddressTextField.requestFocus();
-            Platform.runLater(() -> {
+            UserThread.execute(() -> {
                 this.requestFocus();
-                Platform.runLater(() -> {
-                    withdrawAddressTextField.requestFocus();
-                });
+                UserThread.execute(() -> withdrawAddressTextField.requestFocus());
             });
         });
     }
 
     @Override
-    public void deactivate() {
-        super.deactivate();
+    public void doDeactivate() {
+        super.doDeactivate();
         withdrawAddressTextField.focusedProperty().removeListener(focusedPropertyListener);
         withdrawButton.disableProperty().unbind();
     }
 
 
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // UI Handlers
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void onWithdrawRequest(ActionEvent actionEvent) {
-        model.onWithdrawRequest(withdrawAddressTextField.getText());
-    }
-
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Build view
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
     protected void buildGridEntries() {
-        getAndAddTitledGroupBg(gridPane, gridRow, 5, "Summary");
-        LabelTextFieldPair btcTradeAmountPair = getAndAddLabelTextFieldPair(gridPane, gridRow++, "You have bought:", Layout.FIRST_ROW_DISTANCE);
-        btcTradeAmountLabel = btcTradeAmountPair.label;
-        btcTradeAmountTextField = btcTradeAmountPair.textField;
+        addTitledGroupBg(gridPane, gridRow, 4, "Summary", 0);
+        Tuple2<Label, TextField> btcTradeAmountPair = addLabelTextField(gridPane, gridRow, "You have bought:", "", Layout.FIRST_ROW_DISTANCE);
+        btcTradeAmountLabel = btcTradeAmountPair.first;
+        btcTradeAmountTextField = btcTradeAmountPair.second;
 
-        LabelTextFieldPair fiatTradeAmountPair = getAndAddLabelTextFieldPair(gridPane, gridRow++, "You have paid:");
-        fiatTradeAmountLabel = fiatTradeAmountPair.label;
-        fiatTradeAmountTextField = fiatTradeAmountPair.textField;
+        Tuple2<Label, TextField> fiatTradeAmountPair = addLabelTextField(gridPane, ++gridRow, "You have paid:");
+        fiatTradeAmountLabel = fiatTradeAmountPair.first;
+        fiatTradeAmountTextField = fiatTradeAmountPair.second;
 
-        LabelTextFieldPair feesPair = getAndAddLabelTextFieldPair(gridPane, gridRow++, "Total fees paid:");
-        feesLabel = feesPair.label;
-        feesTextField = feesPair.textField;
+        Tuple2<Label, TextField> feesPair = addLabelTextField(gridPane, ++gridRow, "Total fees paid:");
+        feesTextField = feesPair.second;
 
-        LabelTextFieldPair securityDepositPair = getAndAddLabelTextFieldPair(gridPane, gridRow++, "Refunded security deposit:");
-        securityDepositLabel = securityDepositPair.label;
-        securityDepositTextField = securityDepositPair.textField;
+        Tuple2<Label, TextField> securityDepositPair = addLabelTextField(gridPane, ++gridRow, "Refunded security deposit:");
+        securityDepositTextField = securityDepositPair.second;
 
-        summaryInfoDisplay = getAndAddInfoDisplay(gridPane, gridRow++, "infoDisplay", this::onOpenHelp);
-
-        getAndAddTitledGroupBg(gridPane, gridRow, 2, "Withdraw your bitcoins", Layout.GROUP_DISTANCE);
-        withdrawAmountTextField = getAndAddLabelTextFieldPair(gridPane, gridRow++, "Amount to withdraw:", Layout.FIRST_ROW_AND_GROUP_DISTANCE).textField;
-        withdrawAddressTextField = getAndAddLabelInputTextFieldPair(gridPane, gridRow++, "Withdraw to address:").inputTextField;
-        withdrawButton = getAndAddButton(gridPane, gridRow++, "Withdraw to external wallet", this::onWithdrawRequest);
+        addTitledGroupBg(gridPane, ++gridRow, 2, "Withdraw your bitcoins", Layout.GROUP_DISTANCE);
+        withdrawAmountTextField = addLabelTextField(gridPane, gridRow, "Amount to withdraw:", "", Layout.FIRST_ROW_AND_GROUP_DISTANCE).second;
+        withdrawAddressTextField = addLabelInputTextField(gridPane, ++gridRow, "Withdraw to address:").second;
+        withdrawButton = addButtonAfterGroup(gridPane, ++gridRow, "Withdraw to external wallet");
+        withdrawButton.setOnAction(e -> model.onWithdrawRequest(withdrawAddressTextField.getText()));
 
         if (BitsquareApp.DEV_MODE)
-            withdrawAddressTextField.setText("mkNW1omJFA7RD3AZ94mfKqubRff2gx21KE");
+            withdrawAddressTextField.setText("mwajQdfYnve1knXnmv7JdeiVpeogTsck6S");
     }
 
     public void setBtcTradeAmountLabelText(String text) {
@@ -160,12 +138,7 @@ public class CompletedView extends TradeStepDetailsView {
         securityDepositTextField.setText(text);
     }
 
-    public void setSummaryInfoDisplayText(String text) {
-        summaryInfoDisplay.setText(text);
-    }
-
     public void setWithdrawAmountTextFieldText(String text) {
         withdrawAmountTextField.setText(text);
     }
-
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java
deleted file mode 100644
index 68223d0b5c..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.portfolio.pendingtrades.steps;
-
-import io.bitsquare.gui.components.InfoDisplay;
-import io.bitsquare.gui.components.TxIdTextField;
-import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
-import io.bitsquare.gui.util.Layout;
-
-import javafx.beans.value.ChangeListener;
-import javafx.event.ActionEvent;
-import javafx.scene.*;
-import javafx.scene.control.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static io.bitsquare.gui.util.ComponentBuilder.*;
-
-public class ConfirmFiatReceivedView extends TradeStepDetailsView {
-    private static final Logger log = LoggerFactory.getLogger(ConfirmFiatReceivedView.class);
-
-    private final ChangeListener<String> txIdChangeListener;
-
-    private TxIdTextField txIdTextField;
-    private Label infoLabel;
-    private InfoDisplay infoDisplay;
-    private Button confirmFiatReceivedButton;
-    private Label statusLabel;
-    private ProgressIndicator statusProgressIndicator;
-    private Parent root;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor, Initialisation
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public ConfirmFiatReceivedView(PendingTradesViewModel model) {
-        super(model);
-
-        txIdChangeListener = (ov, oldValue, newValue) -> txIdTextField.setup(model.getWalletService(), newValue);
-    }
-
-    @Override
-    public void activate() {
-        super.activate();
-
-        model.getTxId().addListener(txIdChangeListener);
-        txIdTextField.setup(model.getWalletService(), model.getTxId().get());
-    }
-
-    @Override
-    public void deactivate() {
-        super.deactivate();
-
-        model.getTxId().removeListener(txIdChangeListener);
-        txIdTextField.cleanup();
-        if (root != null)
-            root.setMouseTransparent(false);
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    // UI Handlers
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void onPaymentReceived(ActionEvent actionEvent) {
-        log.debug("onPaymentReceived");
-        confirmFiatReceivedButton.setDisable(true);
-        statusLabel.setText("Sending message to trading peer...");
-        statusProgressIndicator.setVisible(true);
-        statusProgressIndicator.setProgress(-1);
-        root = statusProgressIndicator.getScene().getRoot();
-        // We deactivate mouse interaction to avoid that user leaves screen
-        root.setMouseTransparent(true);
-
-        model.fiatPaymentReceived();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setInfoLabelText(String text) {
-        if (infoLabel != null)
-            infoLabel.setText(text);
-    }
-
-    public void setInfoDisplayField(String text) {
-        if (infoDisplay != null)
-            infoDisplay.setText(text);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Build view
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void buildGridEntries() {
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Blockchain confirmation");
-        txIdTextField = getAndAddLabelTxIdTextFieldPair(gridPane, gridRow++, "Deposit transaction ID:", Layout.FIRST_ROW_DISTANCE).txIdTextField;
-
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Information", Layout.GROUP_DISTANCE);
-        infoLabel = getAndAddInfoLabel(gridPane, gridRow++, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
-
-        ButtonWithProgressIndicatorAndLabel bucket = getAndAddButtonWithStatus(gridPane, gridRow++, "Confirm payment receipt", this::onPaymentReceived);
-        confirmFiatReceivedButton = bucket.button;
-        statusProgressIndicator = bucket.progressIndicator;
-        statusLabel = bucket.label;
-    }
-
-
-}
-
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java
deleted file mode 100644
index ecf87fd099..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.portfolio.pendingtrades.steps;
-
-import io.bitsquare.gui.components.InfoDisplay;
-import io.bitsquare.gui.components.TextFieldWithCopyIcon;
-import io.bitsquare.gui.components.TxIdTextField;
-import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
-import io.bitsquare.gui.util.Layout;
-import io.bitsquare.locale.BSResources;
-
-import javafx.beans.value.ChangeListener;
-import javafx.event.ActionEvent;
-import javafx.scene.*;
-import javafx.scene.control.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static io.bitsquare.gui.util.ComponentBuilder.*;
-
-public class StartFiatView extends TradeStepDetailsView {
-    private static final Logger log = LoggerFactory.getLogger(WaitTxInBlockchainView.class);
-
-    private TxIdTextField txIdTextField;
-    private TextFieldWithCopyIcon fiatAmountTextField;
-    private TextField paymentMethodTextField;
-    private TextFieldWithCopyIcon holderNameTextField;
-    private TextFieldWithCopyIcon primaryIdTextField;
-    private TextFieldWithCopyIcon secondaryIdTextField;
-    private InfoDisplay paymentsInfoDisplay;
-    private Button paymentStartedButton;
-    private Label statusLabel;
-
-    private final ChangeListener<String> txIdChangeListener;
-    private ProgressIndicator statusProgressIndicator;
-    private Parent root;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor, Initialisation
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public StartFiatView(PendingTradesViewModel model) {
-        super(model);
-
-        txIdChangeListener = (ov, oldValue, newValue) -> txIdTextField.setup(model.getWalletService(), newValue);
-
-        paymentMethodTextField.setText(model.getPaymentMethod());
-        fiatAmountTextField.setText(model.getFiatAmount());
-        holderNameTextField.setText(model.getHolderName());
-        primaryIdTextField.setText(model.getPrimaryId());
-        secondaryIdTextField.setText(model.getSecondaryId());
-        paymentsInfoDisplay.setText(BSResources.get("Copy and paste the payment account data to your " +
-                        "internet banking web page and transfer the {0} amount to the other traders " +
-                        "payment account. When the transfer is completed inform the other trader by " +
-                        "clicking the button below.",
-                model.getCurrencyCode()));
-        
-        /*
-              statusTextField.setText("Deposit transaction has at least one block chain confirmation. " +
-                            "Please start now the payment.");
-                    infoDisplay.setText("You are now safe to start the payment. You can wait for up to 6 block chain " +
-                            "confirmations if you want more security.");
-
-         */
-    }
-
-    @Override
-    public void activate() {
-        super.activate();
-
-        model.getTxId().addListener(txIdChangeListener);
-        txIdTextField.setup(model.getWalletService(), model.getTxId().get());
-    }
-
-    @Override
-    public void deactivate() {
-        super.deactivate();
-
-        model.getTxId().removeListener(txIdChangeListener);
-        txIdTextField.cleanup();
-        if (root != null)
-            root.setMouseTransparent(false);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // UI Handlers
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    private void onPaymentStarted(ActionEvent actionEvent) {
-        log.debug("onPaymentStarted");
-        paymentStartedButton.setDisable(true);
-        statusProgressIndicator.setVisible(true);
-        statusProgressIndicator.setProgress(-1);
-        statusLabel.setText("Sending message to trading partner...");
-        root = statusProgressIndicator.getScene().getRoot();
-        // We deactivate mouse interaction to avoid that user leaves screen
-        root.setMouseTransparent(true);
-
-        model.fiatPaymentStarted();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Build view
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void buildGridEntries() {
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Blockchain confirmation");
-        txIdTextField = getAndAddLabelTxIdTextFieldPair(gridPane, gridRow++, "Deposit transaction ID:", Layout.FIRST_ROW_DISTANCE).txIdTextField;
-
-        getAndAddTitledGroupBg(gridPane, gridRow, 6, "Payments details", Layout.GROUP_DISTANCE);
-        fiatAmountTextField = getAndAddLabelTextFieldWithCopyIconPair(gridPane, gridRow++, "Amount to transfer:", Layout.FIRST_ROW_AND_GROUP_DISTANCE)
-                .textFieldWithCopyIcon;
-        paymentMethodTextField = getAndAddLabelTextFieldPair(gridPane, gridRow++, "Payment method:").textField;
-        holderNameTextField = getAndAddLabelTextFieldWithCopyIconPair(gridPane, gridRow++, "Receiver:").textFieldWithCopyIcon;
-        primaryIdTextField = getAndAddLabelTextFieldWithCopyIconPair(gridPane, gridRow++, "IBAN:").textFieldWithCopyIcon;
-        secondaryIdTextField = getAndAddLabelTextFieldWithCopyIconPair(gridPane, gridRow++, "BIC:").textFieldWithCopyIcon;
-        paymentsInfoDisplay = getAndAddInfoDisplay(gridPane, gridRow++, "infoDisplay", this::onOpenHelp);
-        ButtonWithProgressIndicatorAndLabel bucket = getAndAddButtonWithStatus(gridPane, gridRow++, "Payment started", this::onPaymentStarted);
-        paymentStartedButton = bucket.button;
-        statusProgressIndicator = bucket.progressIndicator;
-        statusLabel = bucket.label;
-    }
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java
index 51fc6e779d..736905f6cc 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java
@@ -17,24 +17,47 @@
 
 package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
+import io.bitsquare.arbitration.Dispute;
+import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
-
-import javafx.event.ActionEvent;
-import javafx.scene.layout.*;
-
+import io.bitsquare.gui.util.Layout;
+import io.bitsquare.trade.Trade;
+import javafx.geometry.HPos;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
+import org.bitcoinj.core.*;
+import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.Subscription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.bitsquare.gui.util.ComponentBuilder.getAndAddGridPane;
+import java.util.List;
+import java.util.Optional;
+
+import static io.bitsquare.gui.util.FormBuilder.*;
 
 public abstract class TradeStepDetailsView extends AnchorPane {
-    private static final Logger log = LoggerFactory.getLogger(TradeStepDetailsView.class);
-
+    protected final Logger log = LoggerFactory.getLogger(this.getClass());
     protected final PendingTradesViewModel model;
     protected final GridPane gridPane;
     protected int gridRow = 0;
+    private final BlockChainListener blockChainListener;
+
+    private long checkPaymentTimeInBlocks;
+    protected long openDisputeTimeInBlocks;
+    protected Label infoLabel;
+    protected TitledGroupBg infoTitledGroupBg;
+    protected Button openDisputeButton;
+    private Button openSupportTicketButton;
+
+    private Trade trade;
+    private Subscription errorMessageSubscription;
+    private Subscription disputeStateSubscription;
+    private Subscription tradePeriodStateSubscription;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -49,16 +72,196 @@ public abstract class TradeStepDetailsView extends AnchorPane {
         AnchorPane.setTopAnchor(this, -10d);
         AnchorPane.setBottomAnchor(this, 0d);
 
-        gridPane = getAndAddGridPane(this);
+        gridPane = addGridPane(this);
 
         buildGridEntries();
+
+        blockChainListener = new BlockChainListener() {
+            @Override
+            public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
+                setDateFromBlocks(block.getHeight());
+            }
+
+            @Override
+            public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List<StoredBlock> newBlocks) throws VerificationException {
+                setDateFromBlocks(model.getBestChainHeight());
+            }
+
+            @Override
+            public boolean isTransactionRelevant(Transaction tx) throws ScriptException {
+                return false;
+            }
+
+            @Override
+            public void receiveFromBlock(Transaction tx, StoredBlock block, AbstractBlockChain.NewBlockType blockType, int relativityOffset) throws
+                    VerificationException {
+            }
+
+            @Override
+            public boolean notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block, AbstractBlockChain.NewBlockType blockType, int relativityOffset)
+                    throws VerificationException {
+                return false;
+            }
+        };
     }
 
     // That is called at every state change!
-    public void activate() {
+    public void doActivate() {
+        trade = model.getTrade();
+
+        errorMessageSubscription = EasyBind.subscribe(trade.errorMessageProperty(), newValue -> {
+            if (newValue != null) {
+                addErrorLabel();
+            }
+        });
+
+        disputeStateSubscription = EasyBind.subscribe(trade.disputeStateProperty(), newValue -> {
+            if (newValue != null) {
+                updateDisputeState(newValue);
+            }
+        });
+
+        tradePeriodStateSubscription = EasyBind.subscribe(trade.getTradePeriodStateProperty(), newValue -> {
+            if (newValue != null) {
+                updateTradePeriodState(newValue);
+            }
+        });
+
+
+        // first call updateTradePeriodState as there is the dispute button created in case we are in period over time
+        updateTradePeriodState(trade.getTradePeriodState());
+        updateDisputeState(trade.getDisputeState());
+
+        model.addBlockChainListener(blockChainListener);
+        setDateFromBlocks(model.getBestChainHeight());
     }
 
-    public void deactivate() {
+    public void doDeactivate() {
+        model.removeBlockChainListener(blockChainListener);
+
+        if (errorMessageSubscription != null)
+            errorMessageSubscription.unsubscribe();
+        if (disputeStateSubscription != null)
+            disputeStateSubscription.unsubscribe();
+        if (tradePeriodStateSubscription != null)
+            tradePeriodStateSubscription.unsubscribe();
+
+        if (openDisputeButton != null)
+            openDisputeButton.setOnAction(null);
+        if (openSupportTicketButton != null)
+            openSupportTicketButton.setOnAction(null);
+    }
+
+    protected void disputeInProgress() {
+        if (openDisputeButton != null)
+            openDisputeButton.setDisable(true);
+
+        addDisputeInfoLabel();
+    }
+
+    protected void addDisputeInfoLabel() {
+        if (infoLabel == null) {
+            infoTitledGroupBg = addTitledGroupBg(gridPane, ++gridRow, 1, "Information", Layout.GROUP_DISTANCE);
+            infoLabel = addMultilineLabel(gridPane, gridRow, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
+        }
+        infoLabel.setStyle(" -fx-text-fill: -bs-error-red;");
+    }
+
+    protected void addOpenDisputeButton() {
+        if (openDisputeButton == null) {
+            openDisputeButton = addButtonAfterGroup(gridPane, ++gridRow, "Open a dispute with arbitrator");
+            GridPane.setColumnIndex(openDisputeButton, 0);
+            GridPane.setHalignment(openDisputeButton, HPos.LEFT);
+            openDisputeButton.setOnAction(e -> {
+                openDisputeButton.setDisable(true);
+                disputeInProgress();
+                model.dataModel.onOpenDispute();
+            });
+        }
+    }
+
+    private void addErrorLabel() {
+        if (infoLabel == null) {
+            infoTitledGroupBg = addTitledGroupBg(gridPane, ++gridRow, 1, "Error", Layout.GROUP_DISTANCE);
+            infoLabel = addMultilineLabel(gridPane, gridRow, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
+        }
+        infoTitledGroupBg.setText("Error message");
+        infoLabel.setText(trade.errorMessageProperty().getValue()
+                + "\n\nPlease report the problem to your arbitrator. He will forward it to the developers to investigate the problem.\n" +
+                "After the problem has be analysed you will get back all the funds you paid in.\n" +
+                "There will be no arbitration fee charged if it was a technical error.");
+        infoLabel.setStyle(" -fx-text-fill: -bs-error-red;");
+
+        if (openSupportTicketButton == null) {
+            openSupportTicketButton = addButtonAfterGroup(gridPane, ++gridRow, "Request support");
+            GridPane.setColumnIndex(openSupportTicketButton, 0);
+            GridPane.setHalignment(openSupportTicketButton, HPos.LEFT);
+            openSupportTicketButton.setOnAction(e -> model.dataModel.onOpenSupportTicket());
+        }
+    }
+
+
+    private void updateDisputeState(Trade.DisputeState disputeState) {
+        Optional<Dispute> ownDispute = model.dataModel.getDisputeManager().findOwnDispute(trade.getId());
+
+        switch (disputeState) {
+            case NONE:
+                break;
+            case DISPUTE_REQUESTED:
+                disputeInProgress();
+                ownDispute.ifPresent(dispute -> {
+                    String msg;
+                    if (dispute.isSupportTicket())
+                        msg = "You opened already a support ticket.\n" +
+                                "Please communicate in the support section with the arbitrator.";
+                    else
+                        msg = "You opened already a dispute.\n" +
+                                "Please communicate in the support section with the arbitrator.";
+
+                    infoLabel.setText(msg);
+                });
+
+                break;
+            case DISPUTE_STARTED_BY_PEER:
+                disputeInProgress();
+                ownDispute.ifPresent(dispute -> {
+                    String msg;
+                    if (dispute.isSupportTicket())
+                        msg = "Your trading peer opened a support ticket due technical problems.\n" +
+                                "Please communicate in the support section with the arbitrator.";
+                    else
+                        msg = "Your trading peer opened a dispute.\n" +
+                                "Please communicate in the support section with the arbitrator.";
+
+                    infoLabel.setText(msg);
+                });
+                break;
+            case DISPUTE_CLOSED:
+                break;
+        }
+    }
+
+
+    private void updateTradePeriodState(Trade.TradePeriodState tradePeriodState) {
+        switch (tradePeriodState) {
+            case NORMAL:
+                break;
+            case HALF_REACHED:
+                displayRequestCheckPayment();
+                break;
+            case TRADE_PERIOD_OVER:
+                displayOpenForDisputeForm();
+                break;
+        }
+    }
+
+    private void setDateFromBlocks(long bestBlocKHeight) {
+        checkPaymentTimeInBlocks = model.getCheckPaymentTimeAsBlockHeight() - bestBlocKHeight;
+        openDisputeTimeInBlocks = model.getOpenDisputeTimeAsBlockHeight() - bestBlocKHeight;
+        updateDateFromBlocks(bestBlocKHeight);
+    }
+
+    protected void updateDateFromBlocks(long bestBlocKHeight) {
     }
 
 
@@ -66,7 +269,7 @@ public abstract class TradeStepDetailsView extends AnchorPane {
     // UI Handlers
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    protected void onOpenHelp(ActionEvent actionEvent) {
+    protected void onOpenHelp() {
         Help.openWindow(model.isOfferer() ? HelpId.PENDING_TRADE_OFFERER : HelpId.PENDING_TRADE_TAKER);
     }
 
@@ -76,4 +279,12 @@ public abstract class TradeStepDetailsView extends AnchorPane {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     abstract void buildGridEntries();
+
+    protected void displayRequestCheckPayment() {
+    }
+
+    protected void displayOpenForDisputeForm() {
+    }
+
+
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java
deleted file mode 100644
index 253b73f5c8..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.portfolio.pendingtrades.steps;
-
-import io.bitsquare.gui.components.InfoDisplay;
-import io.bitsquare.gui.components.TxIdTextField;
-import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
-import io.bitsquare.gui.util.Layout;
-
-import javafx.beans.value.ChangeListener;
-import javafx.scene.control.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static io.bitsquare.gui.util.ComponentBuilder.*;
-
-public class WaitFiatReceivedView extends TradeStepDetailsView {
-    private static final Logger log = LoggerFactory.getLogger(WaitFiatReceivedView.class);
-
-    private final ChangeListener<String> txIdChangeListener;
-    private TxIdTextField txIdTextField;
-    private Label infoLabel;
-    private InfoDisplay infoDisplay;
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Constructor, Initialisation
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public WaitFiatReceivedView(PendingTradesViewModel model) {
-        super(model);
-
-        txIdChangeListener = (ov, oldValue, newValue) -> txIdTextField.setup(model.getWalletService(), newValue);
-    }
-
-    @Override
-    public void activate() {
-        super.activate();
-
-        model.getTxId().addListener(txIdChangeListener);
-        txIdTextField.setup(model.getWalletService(), model.getTxId().get());
-    }
-
-    @Override
-    public void deactivate() {
-        super.deactivate();
-
-        model.getTxId().removeListener(txIdChangeListener);
-        txIdTextField.cleanup();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Setters
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    public void setInfoLabelText(String text) {
-        if (infoLabel != null)
-            infoLabel.setText(text);
-    }
-
-    public void setInfoDisplayField(String text) {
-        if (infoDisplay != null)
-            infoDisplay.setText(text);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Build view
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void buildGridEntries() {
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Blockchain confirmation");
-        txIdTextField = getAndAddLabelTxIdTextFieldPair(gridPane, gridRow++, "Deposit transaction ID:", Layout.FIRST_ROW_DISTANCE).txIdTextField;
-
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Information", Layout.GROUP_DISTANCE);
-        infoLabel = getAndAddInfoLabel(gridPane, gridRow++, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
-    }
-}
-
-
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutFinalizedView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutFinalizedView.java
index 575ad17cb0..21dba0665d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutFinalizedView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutFinalizedView.java
@@ -20,17 +20,10 @@ package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
 
-import javafx.scene.control.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static io.bitsquare.gui.util.ComponentBuilder.*;
+import static io.bitsquare.gui.util.FormBuilder.addMultilineLabel;
+import static io.bitsquare.gui.util.FormBuilder.addTitledGroupBg;
 
 public class WaitPayoutFinalizedView extends TradeStepDetailsView {
-    private static final Logger log = LoggerFactory.getLogger(WaitPayoutFinalizedView.class);
-
-    private Label infoLabel;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, Initialisation
@@ -41,13 +34,13 @@ public class WaitPayoutFinalizedView extends TradeStepDetailsView {
     }
 
     @Override
-    public void activate() {
-        super.activate();
+    public void doActivate() {
+        super.doActivate();
     }
 
     @Override
-    public void deactivate() {
-        super.deactivate();
+    public void doDeactivate() {
+        super.doDeactivate();
     }
 
     public void setInfoLabelText(String text) {
@@ -55,14 +48,36 @@ public class WaitPayoutFinalizedView extends TradeStepDetailsView {
             infoLabel.setText(text);
     }
 
+    @Override
+    protected void displayRequestCheckPayment() {
+        // we cannot do anything here, beside restart in case of software bugs
+    }
+
+    @Override
+    protected void displayOpenForDisputeForm() {
+        infoLabel.setStyle(" -fx-text-fill: -bs-error-red;");
+        infoLabel.setText("The trading peer has not finalized the payout transaction!\n" +
+                "The max. period for the trade has elapsed (" +
+                model.getDateFromBlocks(openDisputeTimeInBlocks) + ")." +
+                "\nPlease contact now the arbitrator for opening a dispute.");
+
+        addOpenDisputeButton();
+    }
+
+    @Override
+    protected void disputeInProgress() {
+        super.disputeInProgress();
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Build view
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Override
     protected void buildGridEntries() {
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Information");
-        infoLabel = getAndAddInfoLabel(gridPane, gridRow++, Layout.FIRST_ROW_DISTANCE);
+        infoTitledGroupBg = addTitledGroupBg(gridPane, gridRow, 1, "Information");
+        infoLabel = addMultilineLabel(gridPane, gridRow, Layout.FIRST_ROW_DISTANCE);
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java
index b337e3dded..d17dc93187 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitPayoutLockTimeView.java
@@ -19,82 +19,38 @@ package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
+import javafx.scene.control.TextField;
 
-import org.bitcoinj.core.AbstractBlockChain;
-import org.bitcoinj.core.BlockChainListener;
-import org.bitcoinj.core.ScriptException;
-import org.bitcoinj.core.Sha256Hash;
-import org.bitcoinj.core.StoredBlock;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.VerificationException;
-
-import java.util.List;
-
-import javafx.scene.control.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static io.bitsquare.gui.util.ComponentBuilder.*;
+import static io.bitsquare.gui.util.FormBuilder.*;
 
 public class WaitPayoutLockTimeView extends TradeStepDetailsView {
-    private static final Logger log = LoggerFactory.getLogger(WaitPayoutLockTimeView.class);
-
-    private final BlockChainListener blockChainListener;
-
     private TextField blockTextField;
-    private Label infoLabel;
     private TextField timeTextField;
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, Initialisation
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public WaitPayoutLockTimeView(PendingTradesViewModel model) {
         super(model);
-
-        blockChainListener = new BlockChainListener() {
-            @Override
-            public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
-                setLockTime(block.getHeight());
-            }
-
-            @Override
-            public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List<StoredBlock> newBlocks) throws VerificationException {
-                setLockTime(model.getBestChainHeight());
-            }
-
-            @Override
-            public boolean isTransactionRelevant(Transaction tx) throws ScriptException {
-                return false;
-            }
-
-            @Override
-            public void receiveFromBlock(Transaction tx, StoredBlock block, AbstractBlockChain.NewBlockType blockType, int relativityOffset) throws
-                    VerificationException {
-            }
-
-            @Override
-            public boolean notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block, AbstractBlockChain.NewBlockType blockType, int relativityOffset)
-                    throws VerificationException {
-                return false;
-            }
-        };
     }
 
     @Override
-    public void activate() {
-        super.activate();
-
-        model.addBlockChainListener(blockChainListener);
-        setLockTime(model.getBestChainHeight());
+    public void doActivate() {
+        super.doActivate();
     }
 
     @Override
-    public void deactivate() {
-        super.deactivate();
+    public void doDeactivate() {
+        super.doDeactivate();
+    }
 
-        model.removeBlockChainListener(blockChainListener);
+    @Override
+    protected void updateDateFromBlocks(long bestBlocKHeight) {
+        long missingBlocks = model.getLockTime() - bestBlocKHeight;
+        blockTextField.setText(String.valueOf(missingBlocks));
+        timeTextField.setText(model.getDateFromBlocks(missingBlocks));
     }
 
 
@@ -107,12 +63,6 @@ public class WaitPayoutLockTimeView extends TradeStepDetailsView {
             infoLabel.setText(text);
     }
 
-    private void setLockTime(int bestBlocKHeight) {
-        long missingBlocks = model.getLockTime() - (long) bestBlocKHeight;
-        blockTextField.setText(String.valueOf(missingBlocks));
-        timeTextField.setText(model.getUnlockDate(missingBlocks));
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Build view
@@ -120,12 +70,12 @@ public class WaitPayoutLockTimeView extends TradeStepDetailsView {
 
     @Override
     protected void buildGridEntries() {
-        getAndAddTitledGroupBg(gridPane, gridRow, 2, "Payout transaction lock time");
-        blockTextField = getAndAddLabelTextFieldPair(gridPane, gridRow++, "Block(s) to wait until unlock:", Layout.FIRST_ROW_DISTANCE).textField;
-        timeTextField = getAndAddLabelTextFieldPair(gridPane, gridRow++, "Approx. date when payout gets unlocked:").textField;
+        addTitledGroupBg(gridPane, gridRow, 2, "Payout transaction lock time");
+        blockTextField = addLabelTextField(gridPane, gridRow, "Block(s) to wait until unlock:", "", Layout.FIRST_ROW_DISTANCE).second;
+        timeTextField = addLabelTextField(gridPane, ++gridRow, "Approx. date when payout gets unlocked:").second;
 
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Information", Layout.GROUP_DISTANCE);
-        infoLabel = getAndAddInfoLabel(gridPane, gridRow++, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
+        infoTitledGroupBg = addTitledGroupBg(gridPane, ++gridRow, 1, "Information", Layout.GROUP_DISTANCE);
+        infoLabel = addMultilineLabel(gridPane, gridRow, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java
index 4d22cf29b6..8ebe459759 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java
@@ -17,26 +17,16 @@
 
 package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
-import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.TxIdTextField;
 import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
-
 import javafx.beans.value.ChangeListener;
-import javafx.scene.control.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static io.bitsquare.gui.util.ComponentBuilder.*;
+import static io.bitsquare.gui.util.FormBuilder.*;
 
 public class WaitTxInBlockchainView extends TradeStepDetailsView {
-    private static final Logger log = LoggerFactory.getLogger(WaitTxInBlockchainView.class);
-
     private final ChangeListener<String> txIdChangeListener;
     private TxIdTextField txIdTextField;
-    private Label infoLabel;
-    private InfoDisplay infoDisplay;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -46,20 +36,20 @@ public class WaitTxInBlockchainView extends TradeStepDetailsView {
     public WaitTxInBlockchainView(PendingTradesViewModel model) {
         super(model);
 
-        txIdChangeListener = (ov, oldValue, newValue) -> txIdTextField.setup(model.getWalletService(), newValue);
+        txIdChangeListener = (ov, oldValue, newValue) -> txIdTextField.setup(newValue);
     }
 
     @Override
-    public void activate() {
-        super.activate();
+    public void doActivate() {
+        super.doActivate();
 
         model.getTxId().addListener(txIdChangeListener);
-        txIdTextField.setup(model.getWalletService(), model.getTxId().get());
+        txIdTextField.setup(model.getTxId().get());
     }
 
     @Override
-    public void deactivate() {
-        super.deactivate();
+    public void doDeactivate() {
+        super.doDeactivate();
 
         model.getTxId().removeListener(txIdChangeListener);
         txIdTextField.cleanup();
@@ -75,11 +65,6 @@ public class WaitTxInBlockchainView extends TradeStepDetailsView {
             infoLabel.setText(text);
     }
 
-    public void setInfoDisplayField(String text) {
-        if (infoDisplay != null)
-            infoDisplay.setText(text);
-    }
-
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Build view
@@ -87,11 +72,11 @@ public class WaitTxInBlockchainView extends TradeStepDetailsView {
 
     @Override
     protected void buildGridEntries() {
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Blockchain confirmation");
-        txIdTextField = getAndAddLabelTxIdTextFieldPair(gridPane, gridRow++, "Deposit transaction ID:", Layout.FIRST_ROW_DISTANCE).txIdTextField;
+        addTitledGroupBg(gridPane, gridRow, 1, "Blockchain confirmation");
+        txIdTextField = addLabelTxIdTextField(gridPane, gridRow, "Deposit transaction ID:", Layout.FIRST_ROW_DISTANCE).second;
 
-        getAndAddTitledGroupBg(gridPane, gridRow, 1, "Information", Layout.GROUP_DISTANCE);
-        infoLabel = getAndAddInfoLabel(gridPane, gridRow++, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
+        infoTitledGroupBg = addTitledGroupBg(gridPane, ++gridRow, 1, "Information", Layout.GROUP_DISTANCE);
+        infoLabel = addMultilineLabel(gridPane, gridRow, Layout.FIRST_ROW_AND_GROUP_DISTANCE);
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
index 3bfd559a12..26ef765445 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
@@ -17,14 +17,14 @@
   ~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Tab?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.layout.AnchorPane?>
 <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">
 
-    <Tab fx:id="networkSettingsTab" text="Network info" closable="false"/>
     <Tab fx:id="preferencesTab" text="Preferences" closable="false"/>
-
+    <Tab fx:id="networkSettingsTab" text="Network info" closable="false"/>
 </TabPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
index e2a786546d..cd5536e5aa 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
@@ -19,20 +19,16 @@ package io.bitsquare.gui.main.settings;
 
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.view.ActivatableViewAndModel;
-import io.bitsquare.gui.common.view.CachingViewLoader;
-import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.View;
-import io.bitsquare.gui.common.view.ViewLoader;
+import io.bitsquare.gui.common.view.*;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.settings.application.PreferencesView;
 import io.bitsquare.gui.main.settings.network.NetworkSettingsView;
-
-import javax.inject.Inject;
-
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+
+import javax.inject.Inject;
 
 @FxmlView
 public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable> {
@@ -67,7 +63,7 @@ public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable>
     }
 
     @Override
-    public void doActivate() {
+    protected void activate() {
         root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
         navigation.addListener(navigationListener);
 
@@ -78,7 +74,7 @@ public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable>
     }
 
     @Override
-    public void doDeactivate() {
+    protected void deactivate() {
         root.getSelectionModel().selectedItemProperty().removeListener(tabChangeListener);
         navigation.removeListener(navigationListener);
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
index f563bbc2c5..15fc978d74 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
@@ -17,12 +17,9 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.gui.common.model.Activatable;
-import io.bitsquare.gui.common.model.DataModel;
-import io.bitsquare.user.Preferences;
-
 import com.google.inject.Inject;
-
+import io.bitsquare.gui.common.model.ActivatableDataModel;
+import io.bitsquare.user.Preferences;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -31,7 +28,7 @@ import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-class PreferencesDataModel implements Activatable, DataModel {
+class PreferencesDataModel extends ActivatableDataModel {
 
     private final Preferences preferences;
 
@@ -39,11 +36,11 @@ class PreferencesDataModel implements Activatable, DataModel {
     private final ChangeListener<Boolean> useEffectsListener;
     private final ChangeListener<String> btcDenominationListener;
 
-    final ObservableList<String> btcDenominations;
+    private final ObservableList<String> btcDenominations;
 
-    final BooleanProperty useAnimations = new SimpleBooleanProperty();
-    final BooleanProperty useEffects = new SimpleBooleanProperty();
-    final StringProperty btcDenomination = new SimpleStringProperty();
+    private final BooleanProperty useAnimations = new SimpleBooleanProperty();
+    private final BooleanProperty useEffects = new SimpleBooleanProperty();
+    private final StringProperty btcDenomination = new SimpleStringProperty();
 
 
     @Inject
@@ -58,7 +55,7 @@ class PreferencesDataModel implements Activatable, DataModel {
 
 
     @Override
-    public void activate() {
+    protected void activate() {
         useAnimations.set(preferences.getUseAnimations());
         useEffects.set(preferences.getUseEffects());
         btcDenomination.set(preferences.getBtcDenomination());
@@ -69,7 +66,7 @@ class PreferencesDataModel implements Activatable, DataModel {
     }
 
     @Override
-    public void deactivate() {
+    protected void deactivate() {
         useAnimations.removeListener(useAnimationsListener);
         useEffects.removeListener(useEffectsListener);
         btcDenomination.removeListener(btcDenominationListener);
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml
index ec443a4fa4..ddb028d92e 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml
@@ -18,60 +18,19 @@
   -->
 
 
-<?import io.bitsquare.gui.components.TitledGroupBg?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <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"
           xmlns:fx="http://javafx.com/fxml">
-
     <padding>
         <Insets bottom="10.0" left="25.0" top="30.0" right="25"/>
     </padding>
 
-    <TitledGroupBg text="Preferences" GridPane.rowSpan="8"/>
-
-    <Label text="Bitcoin denomination:" GridPane.rowIndex="0">
-        <GridPane.margin>
-            <Insets top="10"/>
-        </GridPane.margin>
-    </Label>
-    <ComboBox fx:id="btcDenominationComboBox" promptText="Select bitcoin denomination"
-              onAction="#onSelectBtcDenomination"
-              GridPane.rowIndex="0" GridPane.columnIndex="1">
-        <GridPane.margin>
-            <Insets top="10"/>
-        </GridPane.margin>
-    </ComboBox>
-
-    <Label text="Use animations:" GridPane.rowIndex="1"/>
-    <CheckBox fx:id="useAnimationsCheckBox"
-              GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-
-    <Label text="Use effects:" GridPane.rowIndex="2">
-        <GridPane.margin>
-            <Insets bottom="-15"/>
-        </GridPane.margin>
-    </Label>
-    <CheckBox fx:id="useEffectsCheckBox"
-              GridPane.columnIndex="1" GridPane.rowIndex="2">
-        <GridPane.margin>
-            <Insets bottom="-15"/>
-        </GridPane.margin>
-    </CheckBox>
-
     <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="200.0"/>
+        <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="140.0"/>
         <ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
     </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-        <RowConstraints vgrow="NEVER"/>
-    </rowConstraints>
-
-</GridPane>
+</GridPane>
\ No newline at end of file
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
index d8ffd3c5be..b1b480a955 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
@@ -19,18 +19,26 @@ package io.bitsquare.gui.main.settings.application;
 
 import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
+import io.bitsquare.gui.util.Layout;
+import io.bitsquare.user.BlockChainExplorer;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.layout.GridPane;
+import javafx.util.StringConverter;
 
 import javax.inject.Inject;
 
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
+import static io.bitsquare.gui.util.FormBuilder.*;
 
 @FxmlView
 public class PreferencesView extends ActivatableViewAndModel<GridPane, PreferencesViewModel> {
 
-    @FXML ComboBox<String> btcDenominationComboBox;
-    @FXML CheckBox useAnimationsCheckBox, useEffectsCheckBox;
+    private ComboBox<String> btcDenominationComboBox;
+    private ComboBox<BlockChainExplorer> blockExplorerComboBox;
+
+    private CheckBox useAnimationsCheckBox, useEffectsCheckBox, showPlaceOfferConfirmationCheckBox, showTakeOfferConfirmationCheckBox,
+            autoSelectArbitratorsCheckBox;
+    private int gridRow = 0;
 
     @Inject
     public PreferencesView(PreferencesViewModel model) {
@@ -38,26 +46,64 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
     }
 
     @Override
-    public void doActivate() {
-        btcDenominationComboBox.setItems(model.getBtcDenominationItems());
-        btcDenominationComboBox.getSelectionModel().select(model.btcDenomination().get());
+    public void initialize() {
+        addTitledGroupBg(root, gridRow, 7, "Preferences");
 
-        // TODO for alpha
+        btcDenominationComboBox = addLabelComboBox(root, gridRow, "Bitcoin denomination:", Layout.FIRST_ROW_DISTANCE).second;
+        blockExplorerComboBox = addLabelComboBox(root, ++gridRow, "Bitcoin block explorer:").second;
+        useAnimationsCheckBox = addLabelCheckBox(root, ++gridRow, "Use animations:", "").second;
+        useEffectsCheckBox = addLabelCheckBox(root, ++gridRow, "Use efects:", "").second;
+        showPlaceOfferConfirmationCheckBox = addLabelCheckBox(root, ++gridRow, "Show confirmation at place offer:", "").second;
+        showTakeOfferConfirmationCheckBox = addLabelCheckBox(root, ++gridRow, "Show confirmation at take offer:", "").second;
+        autoSelectArbitratorsCheckBox = addLabelCheckBox(root, ++gridRow, "Auto select arbitrators by language:", "").second;
+    }
+
+    @Override
+    protected void activate() {
         btcDenominationComboBox.setDisable(true);
+        btcDenominationComboBox.setItems(model.btcDenominations);
+        btcDenominationComboBox.getSelectionModel().select(model.getBtcDenomination());
+        btcDenominationComboBox.setOnAction(e -> model.onSelectBtcDenomination(btcDenominationComboBox.getSelectionModel().getSelectedItem()));
 
-        useAnimationsCheckBox.selectedProperty().bindBidirectional(model.useAnimations());
-        useEffectsCheckBox.selectedProperty().bindBidirectional(model.useEffects());
+        blockExplorerComboBox.setItems(model.blockExplorers);
+        blockExplorerComboBox.getSelectionModel().select(model.getBlockExplorer());
+        blockExplorerComboBox.setConverter(new StringConverter<BlockChainExplorer>() {
+            @Override
+            public String toString(BlockChainExplorer blockChainExplorer) {
+                return blockChainExplorer.name;
+            }
+
+            @Override
+            public BlockChainExplorer fromString(String string) {
+                return null;
+            }
+        });
+        blockExplorerComboBox.setOnAction(e -> model.onSelectBlockExplorer(blockExplorerComboBox.getSelectionModel().getSelectedItem()));
+
+        useAnimationsCheckBox.setSelected(model.getUseAnimations());
+        useAnimationsCheckBox.setOnAction(e -> model.onSelectUseAnimations(useAnimationsCheckBox.isSelected()));
+
+        useEffectsCheckBox.setSelected(model.getUseEffects());
+        useEffectsCheckBox.setOnAction(e -> model.onSelectUseEffects(useEffectsCheckBox.isSelected()));
+
+        showPlaceOfferConfirmationCheckBox.setSelected(model.getShowPlaceOfferConfirmation());
+        showPlaceOfferConfirmationCheckBox.setOnAction(e -> model.onSelectShowPlaceOfferConfirmation(showPlaceOfferConfirmationCheckBox.isSelected()));
+
+        showTakeOfferConfirmationCheckBox.setSelected(model.getShowTakeOfferConfirmation());
+        showTakeOfferConfirmationCheckBox.setOnAction(e -> model.onSelectShowTakeOfferConfirmation(showTakeOfferConfirmationCheckBox.isSelected()));
+
+        autoSelectArbitratorsCheckBox.setSelected(model.getAutoSelectArbitrators());
+        autoSelectArbitratorsCheckBox.setOnAction(e -> model.onSelectAutoSelectArbitratorsCheckBox(autoSelectArbitratorsCheckBox.isSelected()));
 
     }
 
     @Override
-    public void doDeactivate() {
-        useAnimationsCheckBox.selectedProperty().unbind();
-        useEffectsCheckBox.selectedProperty().unbind();
-    }
-
-    @FXML
-    void onSelectBtcDenomination() {
-        model.btcDenomination().set(btcDenominationComboBox.getSelectionModel().getSelectedItem());
+    protected void deactivate() {
+        btcDenominationComboBox.setOnAction(null);
+        useAnimationsCheckBox.setOnAction(null);
+        useEffectsCheckBox.setOnAction(null);
+        showPlaceOfferConfirmationCheckBox.setOnAction(null);
+        showTakeOfferConfirmationCheckBox.setOnAction(null);
+        autoSelectArbitratorsCheckBox.setOnAction(null);
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
index 5b3f1f9249..619d497f9f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
@@ -17,37 +17,101 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.gui.common.model.ActivatableWithDataModel;
-import io.bitsquare.gui.common.model.ViewModel;
-
 import com.google.inject.Inject;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.StringProperty;
+import io.bitsquare.gui.common.model.ActivatableViewModel;
+import io.bitsquare.user.BlockChainExplorer;
+import io.bitsquare.user.Preferences;
+import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-class PreferencesViewModel extends ActivatableWithDataModel<PreferencesDataModel> implements ViewModel {
+class PreferencesViewModel extends ActivatableViewModel {
+
+    private final Preferences preferences;
+    final ObservableList<String> btcDenominations = FXCollections.observableArrayList(Preferences.getBtcDenominations());
+    final ObservableList<BlockChainExplorer> blockExplorers;
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor, initialisation
+    ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public PreferencesViewModel(PreferencesDataModel dataModel) {
-        super(dataModel);
+    public PreferencesViewModel(Preferences preferences) {
+        this.preferences = preferences;
+        blockExplorers = FXCollections.observableArrayList(preferences.getBlockChainExplorers());
     }
 
-    public ObservableList<String> getBtcDenominationItems() {
-        return dataModel.btcDenominations;
+    @Override
+    protected void activate() {
     }
 
-    BooleanProperty useAnimations() {
-        return dataModel.useAnimations;
-    }
-
-    BooleanProperty useEffects() {
-        return dataModel.useEffects;
-    }
-
-    StringProperty btcDenomination() {
-        return dataModel.btcDenomination;
+    @Override
+    protected void deactivate() {
     }
 
 
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // UI actions
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void onSelectBtcDenomination(String selectedItem) {
+        preferences.setBtcDenomination(selectedItem);
+    }
+
+    public void onSelectUseEffects(boolean selected) {
+        preferences.setUseEffects(selected);
+    }
+
+    public void onSelectUseAnimations(boolean selected) {
+        preferences.setUseAnimations(selected);
+    }
+
+    public void onSelectShowPlaceOfferConfirmation(boolean selected) {
+        preferences.setShowPlaceOfferConfirmation(selected);
+    }
+
+    public void onSelectShowTakeOfferConfirmation(boolean selected) {
+        preferences.setShowTakeOfferConfirmation(selected);
+    }
+
+    public void onSelectAutoSelectArbitratorsCheckBox(boolean selected) {
+        preferences.setAutoSelectArbitrators(selected);
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public String getBtcDenomination() {
+        return preferences.getBtcDenomination();
+    }
+
+    public boolean getUseAnimations() {
+        return preferences.getUseAnimations();
+    }
+
+    public boolean getUseEffects() {
+        return preferences.getUseEffects();
+    }
+
+    public boolean getShowPlaceOfferConfirmation() {
+        return preferences.getShowPlaceOfferConfirmation();
+    }
+
+    public boolean getShowTakeOfferConfirmation() {
+        return preferences.getShowTakeOfferConfirmation();
+    }
+
+    public boolean getAutoSelectArbitrators() {
+        return preferences.getAutoSelectArbitrators();
+    }
+
+    public BlockChainExplorer getBlockExplorer() {
+        return preferences.getBlockChainExplorer();
+    }
+
+    public void onSelectBlockExplorer(BlockChainExplorer selectedItem) {
+        preferences.setBlockChainExplorer(selectedItem);
+    }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
index 57df3c7aa0..45d6129147 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
@@ -18,7 +18,7 @@
   -->
 
 <?import io.bitsquare.gui.components.TitledGroupBg?>
-<?import javafx.geometry.Insets?>
+<?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.network.NetworkSettingsView"
@@ -87,7 +87,7 @@
 
     <Label text="P2P bootstrap node addresses:" GridPane.rowIndex="7" GridPane.valignment="TOP"/>
     <TextArea fx:id="bootstrapNodeAddress" GridPane.rowIndex="7" GridPane.columnIndex="1"
-               mouseTransparent="true" focusTraversable="false"/>
+              mouseTransparent="true" focusTraversable="false"/>
 
     <columnConstraints>
         <ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="200.0"/>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index ca4811998d..813f29349b 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -20,30 +20,23 @@ package io.bitsquare.gui.main.settings.network;
 import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.UserThread;
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.common.view.InitializableView;
-import io.bitsquare.gui.components.Popups;
+import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.locale.BSResources;
-import io.bitsquare.p2p.BootstrapNodes;
-import io.bitsquare.p2p.ClientNode;
+import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.seed.SeedNodesRepository;
 import io.bitsquare.user.Preferences;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
 
 import javax.inject.Inject;
 
-import javafx.application.Platform;
-import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-
-import org.controlsfx.control.action.AbstractAction;
-import org.controlsfx.control.action.Action;
-
 import static javafx.beans.binding.Bindings.createStringBinding;
 
 @FxmlView
@@ -51,23 +44,27 @@ public class NetworkSettingsView extends InitializableView {
 
     private final String bitcoinNetworkString;
     private final WalletService walletService;
-    private BootstrapNodes bootstrapNodes;
+    private final SeedNodesRepository bootstrapNodes;
     private final Preferences preferences;
-    private final ClientNode clientNode;
+    private final P2PService p2PService;
 
-    @FXML TextField bitcoinNetwork, connectionType, nodeAddress, connectedPeersBTC, connectedPeersP2P;
-    @FXML CheckBox useUPnP;
-    @FXML ComboBox<BitcoinNetwork> netWorkComboBox;
-    @FXML TextArea bootstrapNodeAddress;
+    @FXML
+    TextField bitcoinNetwork, connectionType, nodeAddress, connectedPeersBTC, connectedPeersP2P;
+    @FXML
+    CheckBox useUPnP;
+    @FXML
+    ComboBox<BitcoinNetwork> netWorkComboBox;
+    @FXML
+    TextArea bootstrapNodeAddress;
 
     @Inject
-    public NetworkSettingsView(WalletService walletService, ClientNode clientNode, BootstrapNodes bootstrapNodes, Preferences preferences, BSFormatter
+    public NetworkSettingsView(WalletService walletService, P2PService p2PService, SeedNodesRepository bootstrapNodes, Preferences preferences, BSFormatter
             formatter) {
         this.walletService = walletService;
         this.bootstrapNodes = bootstrapNodes;
         this.preferences = preferences;
         this.bitcoinNetworkString = formatter.formatBitcoinNetwork(preferences.getBitcoinNetwork());
-        this.clientNode = clientNode;
+        this.p2PService = p2PService;
     }
 
     public void initialize() {
@@ -75,13 +72,18 @@ public class NetworkSettingsView extends InitializableView {
         connectedPeersBTC.textProperty().bind(createStringBinding(() -> String.valueOf(walletService.numPeersProperty().get()), walletService
                 .numPeersProperty()));
 
-        connectionType.setText(clientNode.getConnectionType().toString());
-        connectedPeersP2P.textProperty().bind(createStringBinding(() -> String.valueOf(clientNode.numPeersProperty().get()), clientNode.numPeersProperty()));
-        nodeAddress.setText(clientNode.getClientNodeInfo());
-        String bootstrapNodesText = bootstrapNodes.getBootstrapNodes().stream().map(e -> e.toString() + "\n").collect(Collectors.toList()).toString()
+       /* if (networkService.getNetworkInfo() instanceof TomP2PNetworkInfo) {
+            TomP2PNetworkInfo networkInfo = (TomP2PNetworkInfo) networkService.getNetworkInfo();
+            connectionType.setText(networkInfo.getConnectionType().toString());
+            connectedPeersP2P.textProperty().bind(createStringBinding(() -> String.valueOf(networkInfo.numPeersProperty().get()), networkInfo.numPeersProperty()));
+            nodeAddress.setText(networkInfo.getClientNodeInfo());
+        }*/
+
+        /*List<NodeSpec> bootstrapNodeSpecs = bootstrapNodes.getBootstrapNodes();
+        String bootstrapNodesText = bootstrapNodeSpecs.stream().map(e -> e.toString() + "\n").collect(Collectors.toList()).toString()
                 .replace(", ", "").replace("[", "").replace("\n]", "");
-        bootstrapNodeAddress.setPrefRowCount(bootstrapNodes.getBootstrapNodes().size());
-        bootstrapNodeAddress.setText(bootstrapNodesText);
+        bootstrapNodeAddress.setPrefRowCount(bootstrapNodeSpecs.size());
+        bootstrapNodeAddress.setText(bootstrapNodesText);*/
 
         useUPnP.setSelected(preferences.getUseUPnP());
 
@@ -95,65 +97,27 @@ public class NetworkSettingsView extends InitializableView {
         preferences.setUseUPnP(useUPnP.isSelected());
     }
 
-    void onSelectNetwork() {
+    private void onSelectNetwork() {
         if (netWorkComboBox.getSelectionModel().getSelectedItem() != preferences.getBitcoinNetwork()) {
             if (netWorkComboBox.getSelectionModel().getSelectedItem() == BitcoinNetwork.MAINNET) {
-                List<Action> actions = new ArrayList<>();
-                actions.add(new AbstractAction(BSResources.get("shared.no")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "NO");
-                        org.controlsfx.dialog.Dialog.Actions.NO.handle(actionEvent);
-                    }
-                });
-
-                actions.add(new AbstractAction(BSResources.get("shared.yes")) {
-                    @Override
-                    public void handle(ActionEvent actionEvent) {
-                        getProperties().put("type", "YES");
-                        org.controlsfx.dialog.Dialog.Actions.YES.handle(actionEvent);
-                    }
-                });
-
-                Action response = Popups.openConfirmPopup("Warning", "The application is under heavy development. " +
-                                "Using the mainnet network with Bitcoin is not recommended at that stage.",
-                        "Are you sure you want to switch to mainnet?", actions);
-
-                if (Popups.isYes(response))
-                    selectNetwork();
-                else
-                    Platform.runLater(() -> netWorkComboBox.getSelectionModel().select(preferences.getBitcoinNetwork()));
-            }
-            else {
+                new Popup().warning("The application is under heavy development. " +
+                        "Using the mainnet network with Bitcoin is not recommended at that stage.\n\n" +
+                        "Are you sure you want to switch to mainnet?")
+                        .onAction(() -> selectNetwork())
+                        .onClose(() -> UserThread.execute(() -> netWorkComboBox.getSelectionModel().select(preferences.getBitcoinNetwork())))
+                        .show();
+            } else {
                 selectNetwork();
             }
         }
     }
 
-    void selectNetwork() {
+    private void selectNetwork() {
         preferences.setBitcoinNetwork(netWorkComboBox.getSelectionModel().getSelectedItem());
-
-        List<Action> actions = new ArrayList<>();
-        actions.add(new AbstractAction(BSResources.get("shared.no")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "NO");
-                org.controlsfx.dialog.Dialog.Actions.NO.handle(actionEvent);
-            }
-        });
-        actions.add(new AbstractAction(BSResources.get("shared.yes")) {
-            @Override
-            public void handle(ActionEvent actionEvent) {
-                getProperties().put("type", "YES");
-                org.controlsfx.dialog.Dialog.Actions.YES.handle(actionEvent);
-            }
-        });
-
-        Action response = Popups.openConfirmPopup("Info", "You need to restart the application to apply the change of the Bitcoin network.",
-                "Do you want to restart now?", actions);
-
-        if (Popups.isYes(response))
-            BitsquareApp.restartDownHandler.run();
+        new Popup().warning("You need to restart the application to apply the change of the Bitcoin network..\n\n" +
+                "Do you want to restart now?")
+                .onAction(() -> BitsquareApp.restartDownHandler.run())
+                .show();
     }
 }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
index 94ae3d533d..606145ec5c 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
@@ -17,47 +17,39 @@
 
 package io.bitsquare.gui.util;
 
-import io.bitsquare.arbitration.ArbitrationRepository;
-import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.btc.BitcoinNetwork;
-import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.Country;
-import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.locale.LanguageUtil;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.trade.offer.Offer;
-import io.bitsquare.user.User;
-
+import io.bitsquare.user.Preferences;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
 import org.bitcoinj.utils.MonetaryFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
 import java.math.BigDecimal;
-
 import java.text.DateFormat;
 import java.text.DecimalFormat;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 //TODO convert to non static
 
 /**
  * Central point for formatting and input parsing.
- * <p/>
+ * <p>
  * Note that we never use for text input values any coin or currency symbol or code.
  * BtcFormat does not support
  */
 public class BSFormatter {
     private static final Logger log = LoggerFactory.getLogger(BSFormatter.class);
 
-    private Locale locale = Locale.getDefault();
+    private Locale locale = Preferences.getDefaultLocale();
     private boolean useMilliBit;
     private int scale = 3;
 
@@ -70,25 +62,23 @@ public class BSFormatter {
     // no way to remove grouping separator). It seems to be not optimal for user input formatting.
     private MonetaryFormat coinFormat = MonetaryFormat.BTC.repeatOptionalDecimals(2, 2);
 
-    private String currencyCode = CurrencyUtil.getDefaultCurrencyAsCode();
+    //  private String currencyCode = CurrencyUtil.getDefaultFiatCurrencyAsCode();
 
     // format is like: 1,00  never more then 2 decimals
-    private final MonetaryFormat fiatFormat = MonetaryFormat.FIAT.repeatOptionalDecimals(0, 0).code(0, currencyCode);
-    private final ArbitrationRepository arbitrationRepository;
+    private final MonetaryFormat fiatFormat = MonetaryFormat.FIAT.repeatOptionalDecimals(0, 0);
 
 
     @Inject
-    public BSFormatter(User user, ArbitrationRepository arbitrationRepository) {
-        this.arbitrationRepository = arbitrationRepository;
-        if (user.currentFiatAccountProperty().get() == null)
-            setFiatCurrencyCode(CurrencyUtil.getDefaultCurrencyAsCode());
-        else if (user.currentFiatAccountProperty().get() != null)
-            setFiatCurrencyCode(user.currentFiatAccountProperty().get().currencyCode);
+    public BSFormatter() {
+      /*  if (user.tradeCurrencyProperty().get() == null)
+            setFiatCurrencyCode(CurrencyUtil.getDefaultFiatCurrencyAsCode());
+        else if (user.tradeCurrencyProperty().get() != null)
+            setFiatCurrencyCode(user.tradeCurrencyProperty().get().getCode());
 
-        user.currentFiatAccountProperty().addListener((ov, oldValue, newValue) -> {
+        user.tradeCurrencyProperty().addListener((ov, oldValue, newValue) -> {
             if (newValue != null)
-                setFiatCurrencyCode(newValue.currencyCode);
-        });
+                setFiatCurrencyCode(newValue.getCode());
+        });*/
     }
 
 
@@ -117,10 +107,10 @@ public class BSFormatter {
             return MonetaryFormat.BTC.repeatOptionalDecimals(2, 2);
     }
 
-    public void setFiatCurrencyCode(String currencyCode) {
+  /*  public void setFiatCurrencyCode(String currencyCode) {
         this.currencyCode = currencyCode;
         fiatFormat.code(0, currencyCode);
-    }
+    }*/
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -227,7 +217,8 @@ public class BSFormatter {
     public String formatFiatWithCode(Fiat fiat) {
         if (fiat != null) {
             try {
-                return fiatFormat.postfixCode().format(fiat).toString();
+                //return fiatFormat.postfixCode().format(fiat).toString();
+                return fiatFormat.noCode().format(fiat).toString() + " " + fiat.getCurrencyCode();
             } catch (Throwable t) {
                 log.warn("Exception at formatFiatWithCode: " + t.toString());
                 return "";
@@ -238,7 +229,7 @@ public class BSFormatter {
         }
     }
 
-    public Fiat parseToFiat(String input) {
+    private Fiat parseToFiat(String input, String currencyCode) {
         if (input != null && input.length() > 0) {
             try {
                 return Fiat.parseFiat(currencyCode, cleanInput(input));
@@ -262,10 +253,10 @@ public class BSFormatter {
      * @return
      */
 
-    public Fiat parseToFiatWith2Decimals(String input) {
+    public Fiat parseToFiatWith2Decimals(String input, String currencyCode) {
         if (input != null && input.length() > 0) {
             try {
-                return parseToFiat(new BigDecimal(cleanInput(input)).setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+                return parseToFiat(new BigDecimal(cleanInput(input)).setScale(2, BigDecimal.ROUND_HALF_UP).toString(), currencyCode);
             } catch (Throwable t) {
                 log.warn("Exception at parseCoinTo4Decimals: " + t.toString());
                 return Fiat.valueOf(currencyCode, 0);
@@ -275,8 +266,8 @@ public class BSFormatter {
         return Fiat.valueOf(currencyCode, 0);
     }
 
-    public boolean hasFiatValidDecimals(String input) {
-        return parseToFiat(input).equals(parseToFiatWith2Decimals(input));
+    public boolean hasFiatValidDecimals(String input, String currencyCode) {
+        return parseToFiat(input, currencyCode).equals(parseToFiatWith2Decimals(input, currencyCode));
     }
 
 
@@ -285,11 +276,11 @@ public class BSFormatter {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
 
-    public String formatDirection(Offer.Direction direction) {
-        return formatDirection(direction, true);
+    public String getDirection(Offer.Direction direction) {
+        return getDirection(direction, true);
     }
 
-    public String formatDirection(Offer.Direction direction, boolean allUpperCase) {
+    private String getDirection(Offer.Direction direction, boolean allUpperCase) {
         String result = (direction == Offer.Direction.BUY) ? "Buy" : "Sell";
         if (allUpperCase) {
             result = result.toUpperCase();
@@ -306,39 +297,46 @@ public class BSFormatter {
                 " (" + formatFiat(offer.getMinOfferVolume()) + ")";
     }
 
+    public String formatVolumeWithMinVolumeWithCode(Offer offer) {
+        return formatFiatWithCode(offer.getOfferVolume()) +
+                " (" + formatFiatWithCode(offer.getMinOfferVolume()) + ")";
+    }
+
     public String countryLocalesToString(List<Country> countries) {
         return countries.stream().map(e -> e.name).collect(Collectors.joining(", "));
     }
 
-    public String arbitratorsToNames(List<Arbitrator> arbitrators) {
-        return arbitrators.stream().map(Arbitrator::getName).collect(Collectors.joining(", "));
+
+    public String arbitratorAddressesToString(List<Address> addresses) {
+        //return addresses.stream().map(e -> e.getFullAddress().substring(0, 8)).collect(Collectors.joining(", "));
+        return addresses.stream().map(e -> e.getFullAddress()).collect(Collectors.joining(", "));
     }
 
-    public String arbitratorIdsToNames(List<String> ids) {
-        return ids.stream().map(e -> arbitrationRepository.getArbitratorsMap().get(e).getName()).collect(Collectors.joining(", "));
+    public String arbitratorAddressToShortAddress(Address address) {
+        return address.getFullAddress().substring(0, 8);
     }
 
     public String languageCodesToString(List<String> languageLocales) {
         return languageLocales.stream().map(LanguageUtil::getDisplayName).collect(Collectors.joining(", "));
     }
 
-    public String arbitrationMethodsToString(List<Arbitrator.METHOD> methods) {
-        return methods.stream().map(e -> BSResources.get(e.toString())).collect(Collectors.joining(", "));
-    }
-
-    public String arbitrationIDVerificationsToString(List<Arbitrator.ID_VERIFICATION> items) {
-        return items.stream().map(e -> BSResources.get(e.toString())).collect(Collectors.joining(", "));
-    }
-
-    public String mnemonicCodeToString(List<String> mnemonicCode) {
-        return mnemonicCode.stream().collect(Collectors.joining(" "));
-    }
-
-
     public String formatDateTime(Date date) {
-        DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, locale);
-        DateFormat timeFormatter = DateFormat.getTimeInstance(DateFormat.DEFAULT, locale);
-        return dateFormatter.format(date) + " " + timeFormatter.format(date);
+        if (date != null) {
+            DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, locale);
+            DateFormat timeFormatter = DateFormat.getTimeInstance(DateFormat.DEFAULT, locale);
+            return dateFormatter.format(date) + " " + timeFormatter.format(date);
+        } else {
+            return "";
+        }
+    }
+
+    public String formatDate(Date date) {
+        if (date != null) {
+            DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, locale);
+            return dateFormatter.format(date);
+        } else {
+            return "";
+        }
     }
 
     public String formatToPercent(double value) {
@@ -358,11 +356,15 @@ public class BSFormatter {
         return input;
     }
 
-    public String getUnlockDate(long missingBlocks) {
+    public String getDateFromBlocks(long blocks) {
         DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, locale);
         DateFormat timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
-        Date unlockDate = new Date(new Date().getTime() + missingBlocks * 10 * 60 * 1000);
-        return dateFormatter.format(unlockDate) + " " + timeFormatter.format(unlockDate);
+        Date date = new Date(new Date().getTime() + blocks * 10 * 60 * 1000);
+        return dateFormatter.format(date) + " " + timeFormatter.format(date);
+    }
+
+    public String booleanToYesNo(boolean value) {
+        return value ? "Yes" : "No";
     }
 
     public String formatBitcoinNetwork(BitcoinNetwork bitcoinNetwork) {
diff --git a/gui/src/main/java/io/bitsquare/gui/util/Colors.java b/gui/src/main/java/io/bitsquare/gui/util/Colors.java
index 92a23e9300..74ec1b0f53 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/Colors.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/Colors.java
@@ -17,13 +17,12 @@
 
 package io.bitsquare.gui.util;
 
-import javafx.scene.paint.*;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
 
 public class Colors {
     public static final Paint BLUE = Color.valueOf("#0f87c3");
     public static final Paint LIGHT_GREY = Color.valueOf("#CCCCCC");
-    public static final Paint MID_GREY = Color.valueOf("#666666");
-    public static final Paint DARK_GREY = Color.valueOf("#333333");
     public static final Paint GREEN = Color.valueOf("#00aa33");
 
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/util/ComponentBuilder.java b/gui/src/main/java/io/bitsquare/gui/util/ComponentBuilder.java
deleted file mode 100644
index 7116b1909b..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/util/ComponentBuilder.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * 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.util;
-
-import io.bitsquare.gui.components.InfoDisplay;
-import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.components.TextFieldWithCopyIcon;
-import io.bitsquare.gui.components.TitledGroupBg;
-import io.bitsquare.gui.components.TxIdTextField;
-
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ComponentBuilder {
-    private static final Logger log = LoggerFactory.getLogger(ComponentBuilder.class);
-
-    public static GridPane getAndAddGridPane(Pane parent) {
-        GridPane gridPane = new GridPane();
-        AnchorPane.setLeftAnchor(gridPane, 10d);
-        AnchorPane.setRightAnchor(gridPane, 10d);
-        AnchorPane.setTopAnchor(gridPane, 10d);
-        AnchorPane.setBottomAnchor(gridPane, 10d);
-        gridPane.setHgap(Layout.GRID_GAP);
-        gridPane.setVgap(Layout.GRID_GAP);
-        ColumnConstraints columnConstraints1 = new ColumnConstraints();
-        columnConstraints1.setHalignment(HPos.RIGHT);
-        columnConstraints1.setHgrow(Priority.SOMETIMES);
-
-        ColumnConstraints columnConstraints2 = new ColumnConstraints();
-        columnConstraints2.setHgrow(Priority.ALWAYS);
-
-        gridPane.getColumnConstraints().addAll(columnConstraints1, columnConstraints2);
-
-        parent.getChildren().add(gridPane);
-        return gridPane;
-    }
-
-    public static TitledGroupBg getAndAddTitledGroupBg(GridPane gridPane, int rowIndex, int rowSpan, String title) {
-        return getAndAddTitledGroupBg(gridPane, rowIndex, rowSpan, title, 0);
-    }
-
-    public static TitledGroupBg getAndAddTitledGroupBg(GridPane gridPane, int rowIndex, int rowSpan, String title, double top) {
-        TitledGroupBg titledGroupBg = new TitledGroupBg();
-        titledGroupBg.setText(title);
-        titledGroupBg.prefWidthProperty().bind(gridPane.widthProperty());
-        GridPane.setRowIndex(titledGroupBg, rowIndex);
-        GridPane.setRowSpan(titledGroupBg, rowSpan);
-        GridPane.setColumnSpan(titledGroupBg, 2);
-        GridPane.setMargin(titledGroupBg, new Insets(top, -10, -10, -10));
-        gridPane.getChildren().add(titledGroupBg);
-        return titledGroupBg;
-    }
-
-    private static Label getAndAddLabel(GridPane gridPane, int rowIndex, String title, double top) {
-        Label label = new Label(title);
-        GridPane.setRowIndex(label, rowIndex);
-        GridPane.setMargin(label, new Insets(top, 0, 0, 0));
-        gridPane.getChildren().add(label);
-        return label;
-    }
-
-    public static Label getAndAddInfoLabel(GridPane gridPane, int rowIndex, double top) {
-        Label label = new Label();
-        label.setWrapText(true);
-        GridPane.setHalignment(label, HPos.LEFT);
-        GridPane.setRowIndex(label, rowIndex);
-        GridPane.setColumnSpan(label, 2);
-        GridPane.setMargin(label, new Insets(top, 0, 0, 0));
-        gridPane.getChildren().add(label);
-        return label;
-    }
-
-    public static LabelTextFieldPair getAndAddLabelTextFieldPair(GridPane gridPane, int rowIndex, String title) {
-        return getAndAddLabelTextFieldPair(gridPane, rowIndex, title, 0);
-    }
-
-    public static LabelTextFieldPair getAndAddLabelTextFieldPair(GridPane gridPane, int rowIndex, String title, double top) {
-        Label label = getAndAddLabel(gridPane, rowIndex, title, top);
-
-        TextField textField = new TextField();
-        textField.setEditable(false);
-        textField.setMouseTransparent(true);
-        textField.setFocusTraversable(false);
-        GridPane.setRowIndex(textField, rowIndex);
-        GridPane.setColumnIndex(textField, 1);
-        GridPane.setMargin(textField, new Insets(top, 0, 0, 0));
-        gridPane.getChildren().add(textField);
-
-        return new LabelTextFieldPair(label, textField);
-    }
-
-    public static LabelInputTextFieldPair getAndAddLabelInputTextFieldPair(GridPane gridPane, int rowIndex, String title) {
-        return getAndAddLabelInputTextFieldPair(gridPane, rowIndex, title, 0);
-    }
-
-    public static LabelInputTextFieldPair getAndAddLabelInputTextFieldPair(GridPane gridPane, int rowIndex, String title, double top) {
-        Label label = getAndAddLabel(gridPane, rowIndex, title, top);
-
-        InputTextField inputTextField = new InputTextField();
-        GridPane.setRowIndex(inputTextField, rowIndex);
-        GridPane.setColumnIndex(inputTextField, 1);
-        GridPane.setMargin(inputTextField, new Insets(top, 0, 0, 0));
-        gridPane.getChildren().add(inputTextField);
-
-        return new LabelInputTextFieldPair(label, inputTextField);
-    }
-
-    public static LabelTxIdTextFieldPair getAndAddLabelTxIdTextFieldPair(GridPane gridPane, int rowIndex, String title) {
-        return getAndAddLabelTxIdTextFieldPair(gridPane, rowIndex, title, 0);
-    }
-
-    public static LabelTxIdTextFieldPair getAndAddLabelTxIdTextFieldPair(GridPane gridPane, int rowIndex, String title, double top) {
-        Label label = getAndAddLabel(gridPane, rowIndex, title, top);
-
-        TxIdTextField txIdTextField = new TxIdTextField();
-        GridPane.setRowIndex(txIdTextField, rowIndex);
-        GridPane.setColumnIndex(txIdTextField, 1);
-        GridPane.setMargin(txIdTextField, new Insets(top, 0, 0, 0));
-        gridPane.getChildren().add(txIdTextField);
-
-        return new LabelTxIdTextFieldPair(label, txIdTextField);
-    }
-
-    public static LabelTextFieldWithCopyIconPair getAndAddLabelTextFieldWithCopyIconPair(GridPane gridPane, int rowIndex, String title) {
-        return getAndAddLabelTextFieldWithCopyIconPair(gridPane, rowIndex, title, 0);
-    }
-
-    public static LabelTextFieldWithCopyIconPair getAndAddLabelTextFieldWithCopyIconPair(GridPane gridPane, int rowIndex, String title, double top) {
-        Label label = getAndAddLabel(gridPane, rowIndex, title, top);
-
-        TextFieldWithCopyIcon textFieldWithCopyIcon = new TextFieldWithCopyIcon();
-        GridPane.setRowIndex(textFieldWithCopyIcon, rowIndex);
-        GridPane.setColumnIndex(textFieldWithCopyIcon, 1);
-        GridPane.setMargin(textFieldWithCopyIcon, new Insets(top, 0, 0, 0));
-        gridPane.getChildren().add(textFieldWithCopyIcon);
-
-        return new LabelTextFieldWithCopyIconPair(label, textFieldWithCopyIcon);
-    }
-
-    public static InfoDisplay getAndAddInfoDisplay(GridPane gridPane,
-                                                   int rowIndex,
-                                                   String text,
-                                                   EventHandler<ActionEvent> onActionHandler) {
-        return getAndAddInfoDisplay(gridPane, rowIndex, text, onActionHandler, 0);
-    }
-
-    public static InfoDisplay getAndAddInfoDisplay(GridPane gridPane,
-                                                   int rowIndex,
-                                                   String text,
-                                                   EventHandler<ActionEvent> onActionHandler,
-                                                   double top) {
-        InfoDisplay infoDisplay = new InfoDisplay();
-        infoDisplay.setText(text);
-        infoDisplay.setOnAction(onActionHandler);
-        GridPane.setRowIndex(infoDisplay, rowIndex);
-        GridPane.setMargin(infoDisplay, new Insets(top, 0, 0, 0));
-        gridPane.getChildren().add(infoDisplay);
-
-        return infoDisplay;
-    }
-
-    public static Button getAndAddButton(GridPane gridPane,
-                                         int rowIndex,
-                                         String title,
-                                         EventHandler<ActionEvent> onActionHandler) {
-        Button button = new Button(title);
-        button.setDefaultButton(true);
-        button.setOnAction(onActionHandler);
-        GridPane.setRowIndex(button, rowIndex);
-        GridPane.setColumnIndex(button, 1);
-        GridPane.setMargin(button, new Insets(15, 0, 40, 0));
-        gridPane.getChildren().add(button);
-        return button;
-    }
-
-    public static ButtonWithProgressIndicatorAndLabel getAndAddButtonWithStatus(GridPane gridPane,
-                                                                                int rowIndex,
-                                                                                String ButtonTitle,
-                                                                                EventHandler<ActionEvent> onActionHandler) {
-        HBox hBox = new HBox();
-        hBox.setSpacing(10);
-        Button button = new Button(ButtonTitle);
-        button.setDefaultButton(true);
-        button.setOnAction(onActionHandler);
-
-        ProgressIndicator progressIndicator = new ProgressIndicator(0);
-        progressIndicator.setPrefHeight(24);
-        progressIndicator.setPrefWidth(24);
-        progressIndicator.setVisible(false);
-
-        Label label = new Label();
-        label.setPadding(new Insets(5, 0, 0, 0));
-
-        hBox.getChildren().addAll(button, progressIndicator, label);
-
-        GridPane.setRowIndex(hBox, rowIndex);
-        GridPane.setColumnIndex(hBox, 1);
-        GridPane.setMargin(hBox, new Insets(15, 0, 40, 0));
-        gridPane.getChildren().add(hBox);
-
-        return new ButtonWithProgressIndicatorAndLabel(button, progressIndicator, label);
-    }
-
-    public static class LabelTextFieldPair {
-        public Label label;
-        public TextField textField;
-
-        public LabelTextFieldPair(Label label, TextField textField) {
-            this.label = label;
-            this.textField = textField;
-        }
-    }
-
-    public static class LabelInputTextFieldPair {
-        public Label label;
-        public InputTextField inputTextField;
-
-        public LabelInputTextFieldPair(Label label, InputTextField inputTextField) {
-            this.label = label;
-            this.inputTextField = inputTextField;
-        }
-    }
-
-    public static class LabelTxIdTextFieldPair {
-        public Label label;
-        public TxIdTextField txIdTextField;
-
-        public LabelTxIdTextFieldPair(Label label, TxIdTextField txIdTextField) {
-            this.label = label;
-            this.txIdTextField = txIdTextField;
-        }
-    }
-
-    public static class LabelTextFieldWithCopyIconPair {
-        public Label label;
-        public TextFieldWithCopyIcon textFieldWithCopyIcon;
-
-        public LabelTextFieldWithCopyIconPair(Label label, TextFieldWithCopyIcon textFieldWithCopyIcon) {
-            this.label = label;
-            this.textFieldWithCopyIcon = textFieldWithCopyIcon;
-        }
-    }
-
-    public static class ButtonWithProgressIndicatorAndLabel {
-        public Button button;
-        public ProgressIndicator progressIndicator;
-        public Label label;
-
-        public ButtonWithProgressIndicatorAndLabel(Button button, ProgressIndicator progressIndicator, Label label) {
-            this.button = button;
-            this.progressIndicator = progressIndicator;
-            this.label = label;
-        }
-    }
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java b/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
index c896bffd00..aa9e074a40 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
@@ -17,20 +17,22 @@
 
 package io.bitsquare.gui.util;
 
-import javafx.scene.input.*;
-
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollBar;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class GUIUtil {
     private static final Logger log = LoggerFactory.getLogger(GUIUtil.class);
 
-    public static void copyToClipboard(String content) {
-        if (content != null && content.length() > 0) {
-            Clipboard clipboard = Clipboard.getSystemClipboard();
-            ClipboardContent clipboardContent = new ClipboardContent();
-            clipboardContent.putString(content);
-            clipboard.setContent(clipboardContent);
+    public static double getScrollbarWidth(Node scrollablePane) {
+        Node node = scrollablePane.lookup(".scroll-bar");
+        if (node instanceof ScrollBar) {
+            final ScrollBar bar = (ScrollBar) node;
+            if (bar.getOrientation().equals(Orientation.VERTICAL))
+                return bar.getWidth();
         }
+        return 0;
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
index 6fd7496b2b..1ba41e07f5 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
@@ -17,12 +17,10 @@
 
 package io.bitsquare.gui.util;
 
-import io.bitsquare.locale.Country;
-
-import javafx.scene.image.*;
-
 import com.sun.javafx.tk.quantum.QuantumToolkit;
-
+import io.bitsquare.locale.Country;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,8 +29,6 @@ public class ImageUtil {
     private static final Logger log = LoggerFactory.getLogger(ImageUtil.class);
 
     public static final String REMOVE_ICON = "image-remove";
-    public static final String EXPAND = "image-expand";
-    public static final String COLLAPSE = "image-collapse";
 
     public static ImageView getImageViewById(String id) {
         ImageView imageView = new ImageView();
@@ -44,7 +40,7 @@ public class ImageUtil {
         return new Image(ImageUtil.class.getResourceAsStream(url));
     }
 
-    public static ImageView getImageViewByUrl(String url) {
+    private static ImageView getImageViewByUrl(String url) {
         return new ImageView(getImageByUrl(url));
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/util/Layout.java b/gui/src/main/java/io/bitsquare/gui/util/Layout.java
index c395ffac2c..e280dcfb7b 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/Layout.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/Layout.java
@@ -21,10 +21,12 @@ public class Layout {
     public static final double FIRST_ROW_DISTANCE = 20d;
     public static final double GROUP_DISTANCE = 40d;
     public static final double FIRST_ROW_AND_GROUP_DISTANCE = GROUP_DISTANCE + FIRST_ROW_DISTANCE;
-    public static double PADDING_WINDOW = 20d;
+    public static final double PADDING_WINDOW = 20d;
     public static double PADDING = 10d;
     public static double SPACING_HBOX = 10d;
-    public static double SPACING_VBOX = 5d;
-    public static double GRID_GAP = 5d;
+    public static final double SPACING_VBOX = 5d;
+    public static final double GRID_GAP = 5d;
+    public static final double LIST_ROW_HEIGHT = 34;
+
 
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/util/Transitions.java b/gui/src/main/java/io/bitsquare/gui/util/Transitions.java
index e876410ead..7f322a8564 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/Transitions.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/Transitions.java
@@ -17,23 +17,19 @@
 
 package io.bitsquare.gui.util;
 
+import io.bitsquare.common.UserThread;
 import io.bitsquare.user.Preferences;
-
-import javax.inject.Inject;
-
-import javafx.animation.FadeTransition;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.application.Platform;
+import javafx.animation.*;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
-import javafx.scene.*;
-import javafx.scene.effect.*;
-import javafx.scene.layout.*;
+import javafx.scene.Node;
+import javafx.scene.effect.ColorAdjust;
+import javafx.scene.effect.GaussianBlur;
+import javafx.scene.layout.Pane;
 import javafx.util.Duration;
 
+import javax.inject.Inject;
+
 public class Transitions {
 
     public final static int DEFAULT_DURATION = 400;
@@ -46,7 +42,7 @@ public class Transitions {
         this.preferences = preferences;
     }
 
-    private int evaluateDuration(int duration) {
+    private int getDuration(int duration) {
         return preferences.getUseAnimations() ? duration : 1;
     }
 
@@ -56,23 +52,18 @@ public class Transitions {
     }
 
     public void fadeIn(Node node, int duration) {
-        if (preferences.getUseEffects()) {
-            FadeTransition fade = new FadeTransition(Duration.millis(evaluateDuration(duration)), node);
-            fade.setFromValue(node.getOpacity());
-            fade.setToValue(1.0);
-            fade.play();
-        }
+        FadeTransition fade = new FadeTransition(Duration.millis(getDuration(duration)), node);
+        fade.setFromValue(node.getOpacity());
+        fade.setToValue(1.0);
+        fade.play();
     }
 
     public FadeTransition fadeOut(Node node) {
         return fadeOut(node, DEFAULT_DURATION);
     }
 
-    public FadeTransition fadeOut(Node node, int duration) {
-        if (!preferences.getUseEffects())
-            duration = 1;
-
-        FadeTransition fade = new FadeTransition(Duration.millis(evaluateDuration(duration)), node);
+    private FadeTransition fadeOut(Node node, int duration) {
+        FadeTransition fade = new FadeTransition(Duration.millis(getDuration(duration)), node);
         fade.setFromValue(node.getOpacity());
         fade.setToValue(0.0);
         fade.play();
@@ -83,15 +74,12 @@ public class Transitions {
         fadeOutAndRemove(node, DEFAULT_DURATION);
     }
 
-    public void fadeOutAndRemove(Node node, int duration) {
+    private void fadeOutAndRemove(Node node, int duration) {
         fadeOutAndRemove(node, duration, null);
     }
 
     public void fadeOutAndRemove(Node node, int duration, EventHandler<ActionEvent> handler) {
-        if (!preferences.getUseEffects())
-            duration = 1;
-
-        FadeTransition fade = fadeOut(node, evaluateDuration(duration));
+        FadeTransition fade = fadeOut(node, getDuration(duration));
         fade.setInterpolator(Interpolator.EASE_IN);
         fade.setOnFinished(actionEvent -> {
             ((Pane) (node.getParent())).getChildren().remove(node);
@@ -103,71 +91,65 @@ public class Transitions {
 
     // Blur
     public void blur(Node node) {
-        blur(node, DEFAULT_DURATION, true, false);
+        blur(node, DEFAULT_DURATION, true, false, 15);
     }
 
-    public void blur(Node node, int duration, boolean useDarken, boolean removeNode) {
-        if (preferences.getUseEffects()) {
-            if (removeBlurTimeLine != null)
-                removeBlurTimeLine.stop();
+    public void blur(Node node, int duration, boolean useDarken, boolean removeNode, double blurRadius) {
+        if (removeBlurTimeLine != null)
+            removeBlurTimeLine.stop();
 
-            node.setMouseTransparent(true);
-            GaussianBlur blur = new GaussianBlur(0.0);
-            Timeline timeline = new Timeline();
-            KeyValue kv1 = new KeyValue(blur.radiusProperty(), 15.0);
-            KeyFrame kf1 = new KeyFrame(Duration.millis(evaluateDuration(duration)), kv1);
+        node.setMouseTransparent(true);
+        GaussianBlur blur = new GaussianBlur(0.0);
+        Timeline timeline = new Timeline();
+        KeyValue kv1 = new KeyValue(blur.radiusProperty(), blurRadius);
+        KeyFrame kf1 = new KeyFrame(Duration.millis(getDuration(duration)), kv1);
 
-            if (useDarken) {
-                ColorAdjust darken = new ColorAdjust();
-                darken.setBrightness(0.0);
-                blur.setInput(darken);
+        if (useDarken) {
+            ColorAdjust darken = new ColorAdjust();
+            darken.setBrightness(0.0);
+            blur.setInput(darken);
 
-                KeyValue kv2 = new KeyValue(darken.brightnessProperty(), -0.1);
-                KeyFrame kf2 = new KeyFrame(Duration.millis(evaluateDuration(duration)), kv2);
-                timeline.getKeyFrames().addAll(kf1, kf2);
-            }
-            else {
-                timeline.getKeyFrames().addAll(kf1);
-            }
-            node.setEffect(blur);
-            if (removeNode) timeline.setOnFinished(actionEvent -> Platform.runLater(() -> ((Pane) (node.getParent()))
-                    .getChildren().remove(node)));
-            timeline.play();
+            KeyValue kv2 = new KeyValue(darken.brightnessProperty(), -0.1);
+            KeyFrame kf2 = new KeyFrame(Duration.millis(getDuration(duration)), kv2);
+            timeline.getKeyFrames().addAll(kf1, kf2);
+        } else {
+            timeline.getKeyFrames().addAll(kf1);
         }
+        node.setEffect(blur);
+        if (removeNode) timeline.setOnFinished(actionEvent -> UserThread.execute(() -> ((Pane) (node.getParent()))
+                .getChildren().remove(node)));
+        timeline.play();
     }
 
     public void removeBlur(Node node) {
         removeBlur(node, DEFAULT_DURATION, false);
     }
 
-    public void removeBlur(Node node, int duration, boolean useDarken) {
-        if (preferences.getUseEffects()) {
-            if (node != null) {
-                node.setMouseTransparent(false);
-                GaussianBlur blur = (GaussianBlur) node.getEffect();
-                if (blur != null) {
-                    removeBlurTimeLine = new Timeline();
-                    KeyValue kv1 = new KeyValue(blur.radiusProperty(), 0.0);
-                    KeyFrame kf1 = new KeyFrame(Duration.millis(evaluateDuration(duration)), kv1);
+    private void removeBlur(Node node, int duration, boolean useDarken) {
+        if (node != null) {
+            node.setMouseTransparent(false);
+            GaussianBlur blur = (GaussianBlur) node.getEffect();
+            if (blur != null) {
+                removeBlurTimeLine = new Timeline();
+                KeyValue kv1 = new KeyValue(blur.radiusProperty(), 0.0);
+                KeyFrame kf1 = new KeyFrame(Duration.millis(getDuration(duration)), kv1);
 
 
-                    if (useDarken) {
-                        ColorAdjust darken = (ColorAdjust) blur.getInput();
+                if (useDarken) {
+                    ColorAdjust darken = (ColorAdjust) blur.getInput();
 
-                        KeyValue kv2 = new KeyValue(darken.brightnessProperty(), 0.0);
-                        KeyFrame kf2 = new KeyFrame(Duration.millis(evaluateDuration(duration)), kv2);
-                        removeBlurTimeLine.getKeyFrames().addAll(kf1, kf2);
-                    }
-                    else {
-                        removeBlurTimeLine.getKeyFrames().addAll(kf1);
-                    }
-
-                    removeBlurTimeLine.setOnFinished(actionEvent -> {
-                        node.setEffect(null);
-                        removeBlurTimeLine = null;
-                    });
-                    removeBlurTimeLine.play();
+                    KeyValue kv2 = new KeyValue(darken.brightnessProperty(), 0.0);
+                    KeyFrame kf2 = new KeyFrame(Duration.millis(getDuration(duration)), kv2);
+                    removeBlurTimeLine.getKeyFrames().addAll(kf1, kf2);
+                } else {
+                    removeBlurTimeLine.getKeyFrames().addAll(kf1);
                 }
+
+                removeBlurTimeLine.setOnFinished(actionEvent -> {
+                    node.setEffect(null);
+                    removeBlurTimeLine = null;
+                });
+                removeBlurTimeLine.play();
             }
         }
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java
deleted file mode 100644
index c0e772dc90..0000000000
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.util.validation;
-
-
-public final class BankAccountNumberValidator extends InputValidator {
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Public methods
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public ValidationResult validate(String input) {
-        // TODO Add validation for primary and secondary IDs according to the selected type
-        return super.validate(input);
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private methods
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
-
-}
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
index 6f15e60b90..d4a15f5f15 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
@@ -18,7 +18,6 @@
 package io.bitsquare.gui.util.validation;
 
 import io.bitsquare.user.Preferences;
-
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
 
@@ -26,7 +25,7 @@ import javax.inject.Inject;
 
 public final class BtcAddressValidator extends InputValidator {
 
-    private Preferences preferences;
+    private final Preferences preferences;
 
     @Inject
     public BtcAddressValidator(Preferences preferences) {
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
index 76a09a52bf..95383d4c65 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
@@ -17,14 +17,22 @@
 
 package io.bitsquare.gui.util.validation;
 
+import io.bitsquare.btc.Restrictions;
+import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
 
-import org.bitcoinj.core.NetworkParameters;
-
+import javax.inject.Inject;
 import java.math.BigDecimal;
 
 public class BtcValidator extends NumberValidator {
 
+    private final BSFormatter formatter;
+
+    @Inject
+    public BtcValidator(BSFormatter formatter) {
+        this.formatter = formatter;
+    }
+
     @Override
     public ValidationResult validate(String input) {
         ValidationResult result = validateIfNotEmpty(input);
@@ -55,8 +63,8 @@ public class BtcValidator extends NumberValidator {
     protected ValidationResult validateIfNotExceedsMaxBtcValue(String input) {
         BigDecimal bd = new BigDecimal(input);
         final BigDecimal satoshis = bd.movePointRight(8);
-        if (satoshis.longValue() > NetworkParameters.MAX_MONEY.longValue())
-            return new ValidationResult(false, BSResources.get("validation.btc.toLarge"));
+        if (satoshis.longValue() > Restrictions.MAX_TRADE_AMOUNT.longValue())
+            return new ValidationResult(false, BSResources.get("validation.btc.toLarge", formatter.formatCoinWithCode(Restrictions.MAX_TRADE_AMOUNT)));
         else
             return new ValidationResult(true);
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
index baee71e3f0..24a9bd5714 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
@@ -18,8 +18,6 @@
 package io.bitsquare.gui.util.validation;
 
 import io.bitsquare.locale.BSResources;
-import io.bitsquare.locale.CurrencyUtil;
-import io.bitsquare.user.User;
 
 import javax.inject.Inject;
 
@@ -27,22 +25,10 @@ public class FiatValidator extends NumberValidator {
 
     //TODO Find appropriate values - depends on currencies
     public static final double MIN_FIAT_VALUE = 0.01; // usually a cent is the smallest currency unit
-    public static final double MAX_FIAT_VALUE = 1000000;
-    protected String currencyCode = "Fiat";
+    public static final double MAX_FIAT_VALUE = 1000000000000D; //TODO just set it super high for now. needs better solution by currency/altcoin
 
     @Inject
-    public FiatValidator(User user) {
-        if (user != null) {
-            if (user.currentFiatAccountProperty().get() == null)
-                setFiatCurrencyCode(CurrencyUtil.getDefaultCurrencyAsCode());
-            else if (user.currentFiatAccountProperty().get() != null)
-                setFiatCurrencyCode(user.currentFiatAccountProperty().get().currencyCode);
-
-            user.currentFiatAccountProperty().addListener((ov, oldValue, newValue) -> {
-                if (newValue != null)
-                    setFiatCurrencyCode(newValue.currencyCode);
-            });
-        }
+    public FiatValidator() {
     }
 
     @Override
@@ -63,14 +49,10 @@ public class FiatValidator extends NumberValidator {
         return result;
     }
 
-    public void setFiatCurrencyCode(String currencyCode) {
-        this.currencyCode = currencyCode;
-    }
-
     protected ValidationResult validateIfNotExceedsMinFiatValue(String input) {
         double d = Double.parseDouble(input);
         if (d < MIN_FIAT_VALUE)
-            return new ValidationResult(false, BSResources.get("validation.fiat.toSmall", currencyCode));
+            return new ValidationResult(false, BSResources.get("validation.fiat.toSmall"));
         else
             return new ValidationResult(true);
     }
@@ -78,7 +60,7 @@ public class FiatValidator extends NumberValidator {
     protected ValidationResult validateIfNotExceedsMaxFiatValue(String input) {
         double d = Double.parseDouble(input);
         if (d > MAX_FIAT_VALUE)
-            return new ValidationResult(false, BSResources.get("validation.fiat.toLarge", currencyCode));
+            return new ValidationResult(false, BSResources.get("validation.fiat.toLarge"));
         else
             return new ValidationResult(true);
     }
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
index dc17b6589e..29ce89fe9d 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
@@ -17,11 +17,20 @@
 
 package io.bitsquare.gui.util.validation;
 
+import io.bitsquare.gui.util.BSFormatter;
+
+import javax.inject.Inject;
+
 /**
  * That validator accepts empty inputs
  */
 public class OptionalBtcValidator extends BtcValidator {
 
+    @Inject
+    public OptionalBtcValidator(BSFormatter formatter) {
+        super(formatter);
+    }
+
     @Override
     public ValidationResult validate(String input) {
         ValidationResult result = validateIfNotEmpty(input);
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
index 5d16a95d63..a0e9c5f8b5 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
@@ -17,8 +17,6 @@
 
 package io.bitsquare.gui.util.validation;
 
-import io.bitsquare.user.User;
-
 import javax.inject.Inject;
 
 /**
@@ -27,8 +25,8 @@ import javax.inject.Inject;
 public class OptionalFiatValidator extends FiatValidator {
 
     @Inject
-    public OptionalFiatValidator(User user) {
-        super(user);
+    public OptionalFiatValidator() {
+        super();
     }
 
     @Override
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java
index b57f5fbad7..6062ae368c 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java
@@ -21,14 +21,24 @@ import io.bitsquare.locale.BSResources;
 
 public final class PasswordValidator extends InputValidator {
 
+    private ValidationResult externalValidationResult;
+
     @Override
     public ValidationResult validate(String input) {
         ValidationResult result = validateIfNotEmpty(input);
         if (result.isValid)
             result = validateMinLength(input);
+
+        if (externalValidationResult != null && !externalValidationResult.isValid)
+            return externalValidationResult;
+        
         return result;
     }
 
+    public void setExternalValidationResult(ValidationResult externalValidationResult) {
+        this.externalValidationResult = externalValidationResult;
+    }
+
     private ValidationResult validateMinLength(String input) {
         if (input.length() > 7)
             return new ValidationResult(true);
diff --git a/gui/src/main/resources/i18n/displayStrings.properties b/gui/src/main/resources/i18n/displayStrings.properties
index 51bc5e1c40..7e07b5daaf 100644
--- a/gui/src/main/resources/i18n/displayStrings.properties
+++ b/gui/src/main/resources/i18n/displayStrings.properties
@@ -21,10 +21,10 @@ validation.empty=Empty input is not allowed.
 validation.NaN=Input is not a valid number.
 validation.zero=Input of 0 is not allowed.
 validation.negative=A negative value is not allowed.
-validation.fiat.toSmall=Input smaller as minimum possible {0} value is not allowed.
-validation.fiat.toLarge=Input larger as maximum possible {0} value is not allowed.
+validation.fiat.toSmall=Input smaller as minimum possible amount is not allowed.
+validation.fiat.toLarge=Input larger as maximum possible amount is not allowed.
 validation.btc.toSmall=Input results in a Bitcoin value with a fraction of the smallest unit (Satoshi).
-validation.btc.toLarge=Input larger as maximum possible Bitcoin value is not allowed..
+validation.btc.toLarge=Input larger as maximum trading amount of {0} is not allowed.
 validation.passwordTooShort=The password you entered is too short. It needs to have min. 8 characters.
 
 # Create offer
@@ -45,7 +45,7 @@ createOffer.amountPriceBox.next=Next step
 createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted to 4 decimal places.
 createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places. The amount has been adjusted to 2 decimal places.
 createOffer.amountPriceBox.warning.adjustedVolume=The total volume you have entered leads to invalid fractional Bitcoin amounts. The amount has been adjusted and a new total volume be calculated from it.
-createOffer.amountPriceBox.error.message=An error occurred when placing the offer:\n\n {0}
+createOffer.amountPriceBox.error.message=An error occurred when placing the offer:\n\n{0}
 createOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount.
 createOffer.validation.minAmountLargerThanAmount=Minimum amount cannot be larger than amount.
 
@@ -78,7 +78,7 @@ createOffer.advancedBox.info=Your trading partners must fulfill your offer restr
 createOffer.success.headline=Your offer has been successfully published to the distributed offerbook.
 createOffer.success.info=In the portfolio screen you can manage your open offers.
    
-createOffer.error.message=An error occurred when placing the offer.\n{0}
+createOffer.error.message=An error occurred when placing the offer.\n\n{0}
 
 
 # Take offer
@@ -103,7 +103,7 @@ takeOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than mi
 takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher than the amount defined in the offer.
 
 takeOffer.fundsBox.title=Fund your trade wallet
-takeOffer.fundsBox.isOfferAvailable=Check if offer is available:
+takeOffer.fundsBox.isOfferAvailable=Check if offer is available...
 takeOffer.fundsBox.totalsNeeded=Funds needed for that trade:
 takeOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the Bitcoin amount entered above
 takeOffer.fundsBox.address=Trade wallet address:
@@ -113,7 +113,7 @@ takeOffer.fundsBox.buy.info=For every offer there is a dedicated trade wallet. Y
   buyer.
 takeOffer.fundsBox.sell.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary Bitcoin amount. Those \
   funds will be paid in to a locked deposit address. At the end of a successful trade you will get back your security deposit.
-takeOffer.fundsBox.amount=Amount to sell:
+takeOffer.fundsBox.tradeAmount=Amount to sell:
 takeOffer.fundsBox.securityDeposit=Security deposit:
 takeOffer.fundsBox.offerFee=Offer fee:
 takeOffer.fundsBox.networkFee=Mining fee:
@@ -136,24 +136,20 @@ takeOffer.advancedBox.info=These are the offer restrictions your trading partner
 
 takeOffer.success.headline=Your have successfully published the deposit.
 takeOffer.success.info=You need to wait now for the Bitcoin buyer to transfer the money to you. \nYou will get a \
-  notification when he has started the EUR payment. You can see the status of your trade in the portfolio screen \
+  notification when he has started the EUR payment. You can see the status of your trade in the <portfolio> screen \
   under open trades.
-takeOffer.error.message=An error occurred when taking the offer.\n{0}
+takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
 
-
-
-# TODO Update the following string when doing the UI (old stuff...)
-# generic
-OTHER=Other
-
-# BankAccountTypeInfo.BankAccountType
-IRC=Demo (E.g. SEPA)
-SEPA=Sepa
-WIRE=Wire
-INTERNATIONAL=International
-OK_PAY=OK Pay
-NET_TELLER=Netteller
+# Payment methods
+OK_PAY=OKPay
 PERFECT_MONEY=Perfect Money
+ALI_PAY=AliPay
+SEPA=Sepa
+FED_WIRE=Fed Wire
+SWISH= Swish
+TRANSFER_WISE=TransferWise
+US_POSTAL_MONEY_ORDER=US Postal money order
+BLOCK_CHAINS=Blockchains
 
 # Arbitrator.ID_TYPE
 REAL_LIFE_ID=Real life ID
diff --git a/gui/src/main/resources/images/nav/home.png b/gui/src/main/resources/images/nav/home.png
deleted file mode 100644
index ae7b0e4da4..0000000000
Binary files a/gui/src/main/resources/images/nav/home.png and /dev/null differ
diff --git a/gui/src/main/resources/images/nav/home@2x.png b/gui/src/main/resources/images/nav/home@2x.png
deleted file mode 100644
index f14b22a6b4..0000000000
Binary files a/gui/src/main/resources/images/nav/home@2x.png and /dev/null differ
diff --git a/gui/src/main/resources/images/nav/home_active.png b/gui/src/main/resources/images/nav/home_active.png
deleted file mode 100644
index adc79e518e..0000000000
Binary files a/gui/src/main/resources/images/nav/home_active.png and /dev/null differ
diff --git a/gui/src/main/resources/images/nav/home_active@2x.png b/gui/src/main/resources/images/nav/home_active@2x.png
deleted file mode 100644
index a551b649ca..0000000000
Binary files a/gui/src/main/resources/images/nav/home_active@2x.png and /dev/null differ
diff --git a/gui/src/main/resources/images/nav/msg.png b/gui/src/main/resources/images/nav/msg.png
deleted file mode 100644
index 69ab9cbd5f..0000000000
Binary files a/gui/src/main/resources/images/nav/msg.png and /dev/null differ
diff --git a/gui/src/main/resources/images/nav/msg@2x.png b/gui/src/main/resources/images/nav/msg@2x.png
deleted file mode 100644
index bcd0f84bf3..0000000000
Binary files a/gui/src/main/resources/images/nav/msg@2x.png and /dev/null differ
diff --git a/gui/src/main/resources/images/nav/msg_active.png b/gui/src/main/resources/images/nav/msg_active.png
deleted file mode 100644
index 86b0d5404a..0000000000
Binary files a/gui/src/main/resources/images/nav/msg_active.png and /dev/null differ
diff --git a/gui/src/main/resources/images/nav/msg_active@2x.png b/gui/src/main/resources/images/nav/msg_active@2x.png
deleted file mode 100644
index 13a0864a7d..0000000000
Binary files a/gui/src/main/resources/images/nav/msg_active@2x.png and /dev/null differ
diff --git a/gui/src/main/resources/logback.xml b/gui/src/main/resources/logback.xml
index a39914ed59..562173ce01 100644
--- a/gui/src/main/resources/logback.xml
+++ b/gui/src/main/resources/logback.xml
@@ -6,18 +6,25 @@
         </encoder>
     </appender>
 
-    <root level="INFO">
+    <root level="TRACE">
         <appender-ref ref="CONSOLE_APPENDER"/>
     </root>
 
-    <logger name="io.bitsquare" level="DEBUG"/>
+    <logger name="io.bitsquare.p2p" level="TRACE"/>
+
+
+    <logger name="io.bitsquare" level="TRACE"/>
+    <logger name="com.msopentech.thali.toronionproxy.OnionProxyManagerEventHandler" level="WARN"/>
+
     <logger name="io.bitsquare.btc.AddressBasedCoinSelector" level="OFF"/>
 
     <logger name="io.bitsquare.gui.util.Profiler" level="ERROR"/>
     <logger name="io.bitsquare.locale.BSResources" level="ERROR"/>
+    <logger name="io.bitsquare.temp.storage.RemoteStorage" level="WARN"/>
+    <logger name="io.bitsquare.storage.FileManager" level="WARN"/>
 
-    <logger name="org.bitcoinj" level="INFO"/>
-    <logger name="net.tomp2p" level="INFO"/>
+    <logger name="org.bitcoinj" level="WARN"/>
+    <logger name="net.tomp2p" level="WARN"/>
 
     <logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
     <logger name="org.bitcoinj.core.Peer" level="WARN"/>
diff --git a/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java b/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
index c921f25b7a..6953fe48c1 100644
--- a/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
+++ b/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
@@ -17,21 +17,18 @@
 
 package io.bitsquare.gui.util;
 
-import io.bitsquare.user.User;
-
 import org.bitcoinj.core.Coin;
+import org.junit.Test;
 
 import java.util.Locale;
 
-import org.junit.Test;
-
 import static org.junit.Assert.*;
 
 public class BSFormatterTest {
 
     @Test
     public void testParseToBtc() {
-        BSFormatter formatter = new BSFormatter(new User(), null);
+        BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         assertEquals(Coin.ZERO, formatter.parseToCoin("0"));
         assertEquals(Coin.COIN, formatter.parseToCoin("1"));
@@ -64,7 +61,7 @@ public class BSFormatterTest {
 
     @Test
     public void testFormatCoin() {
-        BSFormatter formatter = new BSFormatter(new User(), null);
+        BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         assertEquals("1.00", formatter.formatCoin(Coin.COIN));
         assertEquals("1.0120", formatter.formatCoin(Coin.parseCoin("1.012")));
@@ -97,7 +94,7 @@ public class BSFormatterTest {
 
     @Test
     public void testFormatCoinWithCode() {
-        BSFormatter formatter = new BSFormatter(new User(), null);
+        BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         assertEquals("1.00 BTC", formatter.formatCoinWithCode(Coin.COIN));
         assertEquals("1.01 BTC", formatter.formatCoinWithCode(Coin.parseCoin("1.01")));
@@ -132,7 +129,7 @@ public class BSFormatterTest {
 
     @Test
     public void testParseToBtcWith4Decimals() {
-        BSFormatter formatter = new BSFormatter(new User(), null);
+        BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         assertEquals(Coin.parseCoin("0"), formatter.parseToCoinWith4Decimals("0"));
         assertEquals(Coin.parseCoin("0"), formatter.parseToCoinWith4Decimals(null));
@@ -143,7 +140,7 @@ public class BSFormatterTest {
 
     @Test
     public void testHasBtcValidDecimals() {
-        BSFormatter formatter = new BSFormatter(new User(), null);
+        BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         formatter.setLocale(Locale.GERMAN);
         assertTrue(formatter.hasBtcValidDecimals(null));
@@ -159,31 +156,31 @@ public class BSFormatterTest {
 
     @Test
     public void testParseToFiatWith2Decimals() {
-        BSFormatter formatter = new BSFormatter(new User(), null);
+        BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         formatter.setLocale(Locale.GERMAN);
-        assertEquals("0", formatter.parseToFiatWith2Decimals("0").toPlainString());
-        assertEquals("0", formatter.parseToFiatWith2Decimals(null).toPlainString());
-        assertEquals("0", formatter.parseToFiatWith2Decimals("s").toPlainString());
-        assertEquals("0.12", formatter.parseToFiatWith2Decimals("0.123").toPlainString());
-        assertEquals("0.13", formatter.parseToFiatWith2Decimals("0.125").toPlainString());
-        assertEquals("0.13", formatter.parseToFiatWith2Decimals("0,125").toPlainString());
+        assertEquals("0", formatter.parseToFiatWith2Decimals("0", "EUR").toPlainString());
+        assertEquals("0", formatter.parseToFiatWith2Decimals(null, "EUR").toPlainString());
+        assertEquals("0", formatter.parseToFiatWith2Decimals("s", "EUR").toPlainString());
+        assertEquals("0.12", formatter.parseToFiatWith2Decimals("0.123", "EUR").toPlainString());
+        assertEquals("0.13", formatter.parseToFiatWith2Decimals("0.125", "EUR").toPlainString());
+        assertEquals("0.13", formatter.parseToFiatWith2Decimals("0,125", "EUR").toPlainString());
     }
 
     @Test
     public void testHasFiatValidDecimals() {
-        BSFormatter formatter = new BSFormatter(new User(), null);
+        BSFormatter formatter = new BSFormatter();
         formatter.useMilliBitFormat(false);
         formatter.setLocale(Locale.GERMAN);
-        assertTrue(formatter.hasFiatValidDecimals(null));
-        assertTrue(formatter.hasFiatValidDecimals("0"));
-        assertTrue(formatter.hasFiatValidDecimals("0,01"));
-        assertTrue(formatter.hasFiatValidDecimals("0.01"));
-        assertTrue(formatter.hasFiatValidDecimals("0.09"));
-        assertTrue(formatter.hasFiatValidDecimals("20000000.01"));
-        assertFalse(formatter.hasFiatValidDecimals("20000000.0123"));
-        assertFalse(formatter.hasFiatValidDecimals("0.012"));
-        assertFalse(formatter.hasFiatValidDecimals("0.01222312312312313"));
+        assertTrue(formatter.hasFiatValidDecimals(null, "EUR"));
+        assertTrue(formatter.hasFiatValidDecimals("0", "EUR"));
+        assertTrue(formatter.hasFiatValidDecimals("0,01", "EUR"));
+        assertTrue(formatter.hasFiatValidDecimals("0.01", "EUR"));
+        assertTrue(formatter.hasFiatValidDecimals("0.09", "EUR"));
+        assertTrue(formatter.hasFiatValidDecimals("20000000.01", "EUR"));
+        assertFalse(formatter.hasFiatValidDecimals("20000000.0123", "EUR"));
+        assertFalse(formatter.hasFiatValidDecimals("0.012", "EUR"));
+        assertFalse(formatter.hasFiatValidDecimals("0.01222312312312313", "EUR"));
     }
 
 }
diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java b/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
index 6c2e28bfde..9246cceb16 100644
--- a/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
+++ b/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
@@ -17,26 +17,28 @@
 
 package io.bitsquare.gui.util.validation;
 
+import io.bitsquare.btc.Restrictions;
+import io.bitsquare.gui.util.BSFormatter;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.NetworkParameters;
-
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class BtcValidatorTest {
     @Test
     public void testIsValid() {
-        BtcValidator validator = new BtcValidator();
+        BtcValidator validator = new BtcValidator(new BSFormatter());
 
         assertTrue(validator.validate("1").isValid);
-        assertTrue(validator.validate("1,1").isValid);
-        assertTrue(validator.validate("1.1").isValid);
+        assertTrue(validator.validate("0,1").isValid);
+        assertTrue(validator.validate("0.1").isValid);
         assertTrue(validator.validate(",1").isValid);
         assertTrue(validator.validate(".1").isValid);
         assertTrue(validator.validate("0.12345678").isValid);
         assertTrue(validator.validate(Coin.SATOSHI.toPlainString()).isValid);
-        assertTrue(validator.validate(NetworkParameters.MAX_MONEY.toPlainString()).isValid);
+        assertTrue(validator.validate(Restrictions.MAX_TRADE_AMOUNT.toPlainString()).isValid);
 
         assertFalse(validator.validate(null).isValid);
         assertFalse(validator.validate("").isValid);
@@ -44,12 +46,13 @@ public class BtcValidatorTest {
         assertFalse(validator.validate("0.0").isValid);
         assertFalse(validator.validate("0,1,1").isValid);
         assertFalse(validator.validate("0.1.1").isValid);
-        assertFalse(validator.validate("1,000.1").isValid);
-        assertFalse(validator.validate("1.000,1").isValid);
+        assertFalse(validator.validate("0,000.1").isValid);
+        assertFalse(validator.validate("0.000,1").isValid);
         assertFalse(validator.validate("0.123456789").isValid);
         assertFalse(validator.validate("-1").isValid);
-        assertFalse(validator.validate(String.valueOf(NetworkParameters.MAX_MONEY.longValue() + Coin.SATOSHI
+        assertFalse(validator.validate(String.valueOf(Restrictions.MAX_TRADE_AMOUNT.longValue() + Coin.SATOSHI
                 .longValue())).isValid);
+        assertFalse(validator.validate(NetworkParameters.MAX_MONEY.toPlainString()).isValid);
     }
 
 }
diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java b/gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java
index 78f9984e64..b0789302e3 100644
--- a/gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java
+++ b/gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java
@@ -19,12 +19,13 @@ package io.bitsquare.gui.util.validation;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class FiatValidatorTest {
     @Test
     public void testValidate() {
-        FiatValidator validator = new FiatValidator(null);
+        FiatValidator validator = new FiatValidator();
         NumberValidator.ValidationResult validationResult;
 
 
@@ -51,10 +52,8 @@ public class FiatValidatorTest {
         assertFalse(validator.validate("1,000.1").isValid);
         assertFalse(validator.validate("1.000,1").isValid);
         assertFalse(validator.validate("0.009").isValid);
-        assertFalse(validator.validate("1000000.01").isValid);
-
-        assertFalse(validator.validate(String.valueOf(FiatValidator.MIN_FIAT_VALUE - 0.0000001)).isValid);
-        assertFalse(validator.validate(String.valueOf(FiatValidator.MAX_FIAT_VALUE + 0.0000001)).isValid);
+        assertFalse(validator.validate(String.valueOf(FiatValidator.MIN_FIAT_VALUE - 1)).isValid);
+        assertFalse(validator.validate(String.valueOf(FiatValidator.MAX_FIAT_VALUE + 1)).isValid);
         assertFalse(validator.validate(String.valueOf(Double.MIN_VALUE)).isValid);
         assertFalse(validator.validate(String.valueOf(Double.MAX_VALUE)).isValid);
 
diff --git a/network/src/main/java/io/bitsquare/crypto/EncryptionService.java b/network/src/main/java/io/bitsquare/crypto/EncryptionService.java
new file mode 100644
index 0000000000..cb254fb92d
--- /dev/null
+++ b/network/src/main/java/io/bitsquare/crypto/EncryptionService.java
@@ -0,0 +1,135 @@
+/*
+ * 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.crypto;
+
+import io.bitsquare.common.crypto.CryptoException;
+import io.bitsquare.common.crypto.CryptoUtil;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.p2p.Message;
+import io.bitsquare.p2p.messaging.DecryptedMessageWithPubKey;
+import io.bitsquare.p2p.messaging.SealedAndSignedMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import javax.crypto.*;
+import javax.inject.Inject;
+import java.io.IOException;
+import java.security.*;
+
+public class EncryptionService {
+    private static final Logger log = LoggerFactory.getLogger(EncryptionService.class);
+
+    @Nullable
+    private final KeyRing keyRing;
+
+    @Inject
+    public EncryptionService(KeyRing keyRing) {
+        this.keyRing = keyRing;
+    }
+
+
+    public SealedAndSignedMessage encryptAndSignMessage(PubKeyRing pubKeyRing, Message message) throws CryptoException {
+        log.trace("encryptAndSignMessage message = " + message);
+        //long ts = System.currentTimeMillis();
+
+        try {
+            // Create symmetric key 
+            KeyGenerator keyGenerator = KeyGenerator.getInstance(CryptoUtil.SYM_ENCR_KEY_ALGO);
+            // TODO consider 256 bit as key length
+            keyGenerator.init(128);
+            SecretKey secretKey = keyGenerator.generateKey();
+
+            // Encrypt secretKey with peers pubKey using SealedObject
+            Cipher cipherAsym = Cipher.getInstance(CryptoUtil.ASYM_CIPHER);
+            cipherAsym.init(Cipher.ENCRYPT_MODE, pubKeyRing.getMsgEncryptionPubKey());
+            SealedObject sealedSecretKey = new SealedObject(secretKey, cipherAsym);
+
+            // Sign (hash of) message and pack it into SignedObject
+            SignedObject signedMessage = new SignedObject(message, keyRing.getMsgSignatureKeyPair().getPrivate(), Signature.getInstance(CryptoUtil.MSG_SIGN_ALGO));
+
+            // // Encrypt signedMessage with secretKey using SealedObject
+            Cipher cipherSym = Cipher.getInstance(CryptoUtil.SYM_CIPHER);
+            cipherSym.init(Cipher.ENCRYPT_MODE, secretKey);
+            SealedObject sealedMessage = new SealedObject(signedMessage, cipherSym);
+
+            SealedAndSignedMessage sealedAndSignedMessage = new SealedAndSignedMessage(sealedSecretKey,
+                    sealedMessage,
+                    keyRing.getMsgSignatureKeyPair().getPublic()
+            );
+            //log.trace("Encryption needed {} ms", System.currentTimeMillis() - ts);
+            log.trace("sealedAndSignedMessage size " + Utilities.objectToByteArray(sealedAndSignedMessage).length);
+            return sealedAndSignedMessage;
+        } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException
+                | IllegalBlockSizeException | IOException | SignatureException e) {
+            throw new CryptoException(e);
+        }
+    }
+
+    public DecryptedMessageWithPubKey decryptAndVerifyMessage(SealedAndSignedMessage sealedAndSignedMessage) throws CryptoException {
+        // long ts = System.currentTimeMillis();
+        try {
+            if (keyRing == null)
+                throw new CryptoException("keyRing is null");
+
+            SealedObject sealedSecretKey = sealedAndSignedMessage.sealedSecretKey;
+            SealedObject sealedMessage = sealedAndSignedMessage.sealedMessage;
+            PublicKey signaturePubKey = sealedAndSignedMessage.signaturePubKey;
+
+            // Decrypt secretKey with my privKey
+            Cipher cipherAsym = Cipher.getInstance(CryptoUtil.ASYM_CIPHER);
+            cipherAsym.init(Cipher.DECRYPT_MODE, keyRing.getMsgEncryptionKeyPair().getPrivate());
+            Object secretKeyObject = sealedSecretKey.getObject(cipherAsym);
+            if (secretKeyObject instanceof SecretKey) {
+                SecretKey secretKey = (SecretKey) secretKeyObject;
+
+                // Decrypt signedMessage with secretKey
+                Cipher cipherSym = Cipher.getInstance(CryptoUtil.SYM_CIPHER);
+                cipherSym.init(Cipher.DECRYPT_MODE, secretKey);
+                Object signedMessageObject = sealedMessage.getObject(cipherSym);
+                if (signedMessageObject instanceof SignedObject) {
+                    SignedObject signedMessage = (SignedObject) signedMessageObject;
+
+                    // Verify message with peers pubKey
+                    if (signedMessage.verify(signaturePubKey, Signature.getInstance(CryptoUtil.MSG_SIGN_ALGO))) {
+                        // Get message
+                        Object messageObject = signedMessage.getObject();
+                        if (messageObject instanceof Message) {
+                            //log.trace("Decryption needed {} ms", System.currentTimeMillis() - ts);
+                            return new DecryptedMessageWithPubKey((Message) messageObject, signaturePubKey);
+                        } else {
+                            throw new CryptoException("messageObject is not instance of Message");
+                        }
+                    } else {
+                        throw new CryptoException("Signature is not valid");
+                    }
+                } else {
+                    throw new CryptoException("signedMessageObject is not instance of SignedObject");
+                }
+            } else {
+                throw new CryptoException("secretKeyObject is not instance of SecretKey");
+            }
+        } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | BadPaddingException |
+                ClassNotFoundException | IllegalBlockSizeException | IOException | SignatureException e) {
+            throw new CryptoException(e);
+        }
+    }
+}
+
diff --git a/core/src/main/java/io/bitsquare/crypto/CryptoModule.java b/network/src/main/java/io/bitsquare/crypto/EncryptionServiceModule.java
similarity index 81%
rename from core/src/main/java/io/bitsquare/crypto/CryptoModule.java
rename to network/src/main/java/io/bitsquare/crypto/EncryptionServiceModule.java
index 24d8a3f53c..097012595e 100644
--- a/core/src/main/java/io/bitsquare/crypto/CryptoModule.java
+++ b/network/src/main/java/io/bitsquare/crypto/EncryptionServiceModule.java
@@ -17,20 +17,18 @@
 
 package io.bitsquare.crypto;
 
-import io.bitsquare.BitsquareModule;
-
 import com.google.inject.Singleton;
-
+import io.bitsquare.app.AppModule;
 import org.springframework.core.env.Environment;
 
-public class CryptoModule extends BitsquareModule {
+public class EncryptionServiceModule extends AppModule {
 
-    public CryptoModule(Environment env) {
+    public EncryptionServiceModule(Environment env) {
         super(env);
     }
 
     @Override
     protected void configure() {
-        bind(CryptoService.class).in(Singleton.class);
+        bind(EncryptionService.class).in(Singleton.class);
     }
 }
diff --git a/network/src/main/java/io/bitsquare/p2p/Message.java b/network/src/main/java/io/bitsquare/p2p/Message.java
new file mode 100644
index 0000000000..249d73d847
--- /dev/null
+++ b/network/src/main/java/io/bitsquare/p2p/Message.java
@@ -0,0 +1,7 @@
+package io.bitsquare.p2p;
+
+import java.io.Serializable;
+
+public interface Message extends Serializable {
+
+}
diff --git a/network/src/main/java/io/bitsquare/p2p/P2PModule.java b/network/src/main/java/io/bitsquare/p2p/P2PModule.java
new file mode 100644
index 0000000000..bd8f9285a2
--- /dev/null
+++ b/network/src/main/java/io/bitsquare/p2p/P2PModule.java
@@ -0,0 +1,55 @@
+/*
+ * 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.p2p;
+
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+import io.bitsquare.app.AppModule;
+import io.bitsquare.app.ProgramArguments;
+import io.bitsquare.p2p.seed.SeedNodesRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.env.Environment;
+
+import java.io.File;
+
+import static com.google.inject.name.Names.named;
+
+
+public class P2PModule extends AppModule {
+    private static final Logger log = LoggerFactory.getLogger(P2PModule.class);
+
+    public P2PModule(Environment env) {
+        super(env);
+    }
+
+    @Override
+    protected void configure() {
+        bind(SeedNodesRepository.class).in(Singleton.class);
+        bind(P2PService.class).in(Singleton.class);
+
+        Boolean useLocalhost = env.getProperty(ProgramArguments.USE_LOCALHOST, boolean.class, false);
+        bind(boolean.class).annotatedWith(Names.named(ProgramArguments.USE_LOCALHOST)).toInstance(useLocalhost);
+
+        File torDir = new File(env.getRequiredProperty(ProgramArguments.TOR_DIR));
+        bind(File.class).annotatedWith(named(ProgramArguments.TOR_DIR)).toInstance(torDir);
+
+        Integer port = env.getProperty(ProgramArguments.PORT_KEY, int.class, Utils.findFreeSystemPort());
+        bind(int.class).annotatedWith(Names.named(ProgramArguments.PORT_KEY)).toInstance(port);
+    }
+}
\ No newline at end of file
diff --git a/network/src/main/java/io/bitsquare/p2p/P2PService.java b/network/src/main/java/io/bitsquare/p2p/P2PService.java
new file mode 100644
index 0000000000..bfabeb4a9a
--- /dev/null
+++ b/network/src/main/java/io/bitsquare/p2p/P2PService.java
@@ -0,0 +1,628 @@
+package io.bitsquare.p2p;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.SettableFuture;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.bitsquare.app.ProgramArguments;
+import io.bitsquare.common.UserThread;
+import io.bitsquare.common.crypto.CryptoException;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.crypto.EncryptionService;
+import io.bitsquare.p2p.messaging.*;
+import io.bitsquare.p2p.network.*;
+import io.bitsquare.p2p.routing.Neighbor;
+import io.bitsquare.p2p.routing.Routing;
+import io.bitsquare.p2p.routing.RoutingListener;
+import io.bitsquare.p2p.seed.SeedNodesRepository;
+import io.bitsquare.p2p.storage.HashSetChangedListener;
+import io.bitsquare.p2p.storage.ProtectedExpirableDataStorage;
+import io.bitsquare.p2p.storage.data.ExpirableMailboxPayload;
+import io.bitsquare.p2p.storage.data.ExpirablePayload;
+import io.bitsquare.p2p.storage.data.ProtectedData;
+import io.bitsquare.p2p.storage.data.ProtectedMailboxData;
+import io.bitsquare.p2p.storage.messages.DataSetMessage;
+import io.bitsquare.p2p.storage.messages.GetDataSetMessage;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.SignatureException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Represents our node in the P2P network
+ */
+public class P2PService {
+    private static final Logger log = LoggerFactory.getLogger(P2PService.class);
+
+    private final EncryptionService encryptionService;
+    private KeyRing keyRing;
+    private final NetworkStatistics networkStatistics;
+
+    private final NetworkNode networkNode;
+    private final Routing routing;
+    private final ProtectedExpirableDataStorage dataStorage;
+    private final List<DecryptedMailListener> decryptedMailListeners = new CopyOnWriteArrayList<>();
+    private final List<DecryptedMailboxListener> decryptedMailboxListeners = new CopyOnWriteArrayList<>();
+    private final List<P2PServiceListener> p2pServiceListeners = new CopyOnWriteArrayList<>();
+    private final Map<DecryptedMessageWithPubKey, ProtectedMailboxData> mailboxMap = new ConcurrentHashMap<>();
+    private volatile boolean shutDownInProgress;
+    private List<Address> seedNodeAddresses;
+    private List<Address> connectedSeedNodes = new CopyOnWriteArrayList<>();
+    private Set<Address> authenticatedPeerAddresses = new HashSet<>();
+    private boolean authenticatedToFirstPeer;
+    private boolean allDataReceived;
+    public boolean authenticated;
+    private boolean shutDownComplete;
+    private List<Runnable> shutDownResultHandlers = new CopyOnWriteArrayList<>();
+    private final List<Long> getDataSetMessageNonceList = new ArrayList<>();
+    private boolean allSeedNodesRequested;
+    private Timer sendGetAllDataMessageTimer;
+    private volatile boolean hiddenServiceReady;
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Constructor
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    @Inject
+    public P2PService(SeedNodesRepository seedNodesRepository,
+                      @Named(ProgramArguments.PORT_KEY) int port,
+                      @Named(ProgramArguments.TOR_DIR) File torDir,
+                      @Named(ProgramArguments.USE_LOCALHOST) boolean useLocalhost,
+                      EncryptionService encryptionService,
+                      KeyRing keyRing) {
+        this.encryptionService = encryptionService;
+        this.keyRing = keyRing;
+
+        networkStatistics = new NetworkStatistics();
+
+        // network layer
+        if (useLocalhost) {
+            networkNode = new LocalhostNetworkNode(port);
+            seedNodeAddresses = seedNodesRepository.getLocalhostSeedNodeAddresses();
+        } else {
+            networkNode = new TorNetworkNode(port, torDir);
+            seedNodeAddresses = seedNodesRepository.getTorSeedNodeAddresses();
+        }
+
+        // routing layer
+        routing = new Routing(networkNode, seedNodeAddresses);
+
+
+        // storage layer
+        dataStorage = new ProtectedExpirableDataStorage(routing, encryptionService);
+
+
+        // Listeners
+        networkNode.addMessageListener((message, connection) -> {
+            if (message instanceof GetDataSetMessage) {
+                log.trace("Received GetAllDataMessage: " + message);
+
+                // we only reply if we did not get the message form ourselves (in case we are a seed node)
+                if (!getDataSetMessageNonceList.contains(((GetDataSetMessage) message).nonce)) {
+                    networkNode.sendMessage(connection, new DataSetMessage(getHashSet()));
+                } else {
+                    connection.shutDown(() -> {
+                        if (allSeedNodesRequested) dataReceived();
+                    });
+                }
+            } else if (message instanceof DataSetMessage) {
+                log.trace("Received AllDataMessage: " + message);
+                // we keep that connection open as the bootstrapping peer will use that for the authentication
+
+                // as we are not authenticated yet the data adding will not be broadcasted 
+                HashSet<ProtectedData> set = ((DataSetMessage) message).set;
+                set.stream().forEach(e -> dataStorage.add(e, connection.getPeerAddress()));
+
+                set.stream().filter(e -> e instanceof ProtectedMailboxData).forEach(e -> tryDecryptMailboxData((ProtectedMailboxData) e));
+
+                dataReceived();
+            } else if (message instanceof SealedAndSignedMessage) {
+                try {
+                    DecryptedMessageWithPubKey decryptedMessageWithPubKey = encryptionService.decryptAndVerifyMessage((SealedAndSignedMessage) message);
+                    UserThread.execute(() -> decryptedMailListeners.stream().forEach(e -> e.onMailMessage(decryptedMessageWithPubKey, connection.getPeerAddress())));
+                } catch (CryptoException e) {
+                    log.info("Decryption of SealedAndSignedMessage failed. That is expected if the message is not intended for us.");
+                }
+            }
+        });
+
+        routing.addRoutingListener(new RoutingListener() {
+            @Override
+            public void onFirstNeighborAdded(Neighbor neighbor) {
+                log.trace("onFirstNeighbor " + neighbor.toString());
+            }
+
+            @Override
+            public void onNeighborAdded(Neighbor neighbor) {
+
+            }
+
+            @Override
+            public void onNeighborRemoved(Address address) {
+
+            }
+
+            @Override
+            public void onConnectionAuthenticated(Connection connection) {
+
+            }
+        });
+
+        dataStorage.addHashSetChangedListener(new HashSetChangedListener() {
+            @Override
+            public void onAdded(ProtectedData entry) {
+                if (entry instanceof ProtectedMailboxData)
+                    tryDecryptMailboxData((ProtectedMailboxData) entry);
+            }
+
+            @Override
+            public void onRemoved(ProtectedData entry) {
+            }
+        });
+    }
+
+    public void protocol() {
+        // networkNode.start
+        //      onTorNodeReady: sendGetAllDataMessage
+        //      onHiddenServiceReady: tryStartAuthentication
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // API
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    // startup sequence
+    //      networkNode.start
+    //          SetupListener.onTorNodeReady: sendGetAllDataMessage
+    //          SetupListener.onHiddenServiceReady: tryStartAuthentication
+    //              if hiddenServiceReady && allDataReceived) routing.startAuthentication
+    //              ConnectionListener.onPeerAddressAuthenticated
+
+    public void start() {
+        start(null);
+    }
+
+    public void start(@Nullable P2PServiceListener listener) {
+        if (listener != null)
+            addP2PServiceListener(listener);
+
+        networkNode.start(new SetupListener() {
+            @Override
+            public void onTorNodeReady() {
+                UserThread.execute(() -> p2pServiceListeners.stream().forEach(e -> e.onTorNodeReady()));
+
+                // we don't know yet our own address so we can not filter that from the 
+                // seedNodeAddresses in case we are a seed node
+                sendGetAllDataMessage(seedNodeAddresses);
+            }
+
+            @Override
+            public void onHiddenServiceReady() {
+                hiddenServiceReady = true;
+                tryStartAuthentication();
+
+                UserThread.execute(() -> p2pServiceListeners.stream().forEach(e -> e.onHiddenServiceReady()));
+            }
+
+            @Override
+            public void onSetupFailed(Throwable throwable) {
+                UserThread.execute(() -> p2pServiceListeners.stream().forEach(e -> e.onSetupFailed(throwable)));
+            }
+        });
+
+        networkNode.addConnectionListener(new ConnectionListener() {
+            @Override
+            public void onConnection(Connection connection) {
+            }
+
+            @Override
+            public void onPeerAddressAuthenticated(Address peerAddress, Connection connection) {
+                authenticatedPeerAddresses.add(peerAddress);
+                authenticatedToFirstPeer = true;
+
+                P2PService.this.authenticated = true;
+                dataStorage.setAuthenticated(true);
+                UserThread.execute(() -> p2pServiceListeners.stream().forEach(e -> e.onAuthenticated()));
+            }
+
+            @Override
+            public void onDisconnect(Reason reason, Connection connection) {
+                Address peerAddress = connection.getPeerAddress();
+                if (peerAddress != null)
+                    authenticatedPeerAddresses.remove(peerAddress);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                log.error("onError self/ConnectionException " + networkNode.getAddress() + "/" + throwable);
+            }
+        });
+    }
+
+    public void shutDown(Runnable shutDownCompleteHandler) {
+        if (!shutDownInProgress) {
+            shutDownInProgress = true;
+
+            shutDownResultHandlers.add(shutDownCompleteHandler);
+
+            if (sendGetAllDataMessageTimer != null)
+                sendGetAllDataMessageTimer.cancel();
+
+            if (dataStorage != null)
+                dataStorage.shutDown();
+
+            if (routing != null)
+                routing.shutDown();
+
+            if (networkNode != null)
+                networkNode.shutDown(() -> {
+                    UserThread.execute(() -> shutDownResultHandlers.stream().forEach(e -> new Thread(e).start()));
+                    shutDownComplete = true;
+                });
+        } else {
+            if (shutDownComplete)
+                new Thread(shutDownCompleteHandler).start();
+            else
+                shutDownResultHandlers.add(shutDownCompleteHandler);
+            log.warn("shutDown already in progress");
+        }
+    }
+
+    public boolean isAuthenticated() {
+        return authenticated;
+    }
+
+    public void removeEntryFromMailbox(DecryptedMessageWithPubKey decryptedMessageWithPubKey) {
+        log.trace("removeEntryFromMailbox");
+        ProtectedMailboxData mailboxData = mailboxMap.get(decryptedMessageWithPubKey);
+        if (mailboxData != null && mailboxData.expirablePayload instanceof ExpirableMailboxPayload) {
+            checkArgument(mailboxData.receiversPubKey.equals(keyRing.getStorageSignatureKeyPair().getPublic()),
+                    "mailboxData.receiversPubKey is not matching with our key. That must not happen.");
+            removeMailboxData((ExpirableMailboxPayload) mailboxData.expirablePayload, mailboxData.receiversPubKey);
+            mailboxMap.remove(decryptedMessageWithPubKey);
+            log.trace("Removed successfully protectedExpirableData.");
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Messaging
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void sendEncryptedMailMessage(Address peerAddress, PubKeyRing pubKeyRing, MailMessage message, SendMailMessageListener sendMailMessageListener) {
+        checkNotNull(peerAddress, "PeerAddress must not be null (sendEncryptedMailMessage)");
+
+        if (!authenticatedToFirstPeer)
+            throw new AuthenticationException("You must be authenticated before sending direct messages.");
+
+        if (!authenticatedPeerAddresses.contains(peerAddress))
+            routing.authenticateToPeer(peerAddress,
+                    () -> doSendEncryptedMailMessage(peerAddress, pubKeyRing, message, sendMailMessageListener),
+                    () -> UserThread.execute(() -> sendMailMessageListener.onFault()));
+        else
+            doSendEncryptedMailMessage(peerAddress, pubKeyRing, message, sendMailMessageListener);
+    }
+
+    private void doSendEncryptedMailMessage(Address peerAddress, PubKeyRing pubKeyRing, MailMessage message, SendMailMessageListener sendMailMessageListener) {
+        try {
+            SealedAndSignedMessage sealedAndSignedMessage = encryptionService.encryptAndSignMessage(pubKeyRing, message);
+            SettableFuture<Connection> future = sendMessage(peerAddress, sealedAndSignedMessage);
+            Futures.addCallback(future, new FutureCallback<Connection>() {
+                @Override
+                public void onSuccess(@Nullable Connection connection) {
+                    UserThread.execute(() -> sendMailMessageListener.onArrived());
+                }
+
+                @Override
+                public void onFailure(Throwable throwable) {
+                    throwable.printStackTrace();
+                    UserThread.execute(() -> sendMailMessageListener.onFault());
+                }
+            });
+        } catch (CryptoException e) {
+            e.printStackTrace();
+            UserThread.execute(() -> sendMailMessageListener.onFault());
+        }
+    }
+
+    public void sendEncryptedMailboxMessage(Address peerAddress, PubKeyRing peersPubKeyRing, MailboxMessage message, SendMailboxMessageListener sendMailboxMessageListener) {
+        checkNotNull(peerAddress, "PeerAddress must not be null (sendEncryptedMailboxMessage)");
+        checkArgument(!keyRing.getPubKeyRing().equals(peersPubKeyRing), "We got own keyring instead of that from peer");
+
+        if (!authenticatedToFirstPeer)
+            throw new AuthenticationException("You must be authenticated before sending direct messages.");
+
+        if (authenticatedPeerAddresses.contains(peerAddress)) {
+            trySendEncryptedMailboxMessage(peerAddress, peersPubKeyRing, message, sendMailboxMessageListener);
+        } else {
+            routing.authenticateToPeer(peerAddress,
+                    () -> trySendEncryptedMailboxMessage(peerAddress, peersPubKeyRing, message, sendMailboxMessageListener),
+                    () -> {
+                        log.info("We cannot authenticate to peer. Peer might be offline. We will store message in mailbox.");
+                        trySendEncryptedMailboxMessage(peerAddress, peersPubKeyRing, message, sendMailboxMessageListener);
+                    });
+        }
+    }
+
+    private void trySendEncryptedMailboxMessage(Address peerAddress, PubKeyRing peersPubKeyRing, MailboxMessage message, SendMailboxMessageListener sendMailboxMessageListener) {
+        try {
+            SealedAndSignedMessage sealedAndSignedMessage = encryptionService.encryptAndSignMessage(peersPubKeyRing, message);
+            SettableFuture<Connection> future = sendMessage(peerAddress, sealedAndSignedMessage);
+            Futures.addCallback(future, new FutureCallback<Connection>() {
+                @Override
+                public void onSuccess(@Nullable Connection connection) {
+                    log.trace("SendEncryptedMailboxMessage onSuccess");
+                    UserThread.execute(() -> sendMailboxMessageListener.onArrived());
+                }
+
+                @Override
+                public void onFailure(Throwable throwable) {
+                    log.trace("SendEncryptedMailboxMessage onFailure");
+                    log.debug(throwable.toString());
+                    log.info("We cannot send message to peer. Peer might be offline. We will store message in mailbox.");
+                    log.trace("create MailboxEntry with peerAddress " + peerAddress);
+                    PublicKey receiverStoragePublicKey = peersPubKeyRing.getStorageSignaturePubKey();
+                    addMailboxData(new ExpirableMailboxPayload(sealedAndSignedMessage,
+                                    keyRing.getStorageSignatureKeyPair().getPublic(),
+                                    receiverStoragePublicKey),
+                            receiverStoragePublicKey);
+                    UserThread.execute(() -> sendMailboxMessageListener.onStoredInMailbox());
+                }
+            });
+        } catch (CryptoException e) {
+            e.printStackTrace();
+            log.error("sendEncryptedMessage failed");
+            UserThread.execute(() -> sendMailboxMessageListener.onFault());
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // ProtectedData 
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public boolean addData(ExpirablePayload expirablePayload) {
+        if (!authenticatedToFirstPeer)
+            throw new AuthenticationException("You must be authenticated before adding data to the P2P network.");
+
+        try {
+            return dataStorage.add(dataStorage.getDataWithSignedSeqNr(expirablePayload, keyRing.getStorageSignatureKeyPair()), networkNode.getAddress());
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
+            return false;
+        }
+    }
+
+    public boolean addMailboxData(ExpirableMailboxPayload expirableMailboxPayload, PublicKey receiversPublicKey) {
+        if (!authenticatedToFirstPeer)
+            throw new AuthenticationException("You must be authenticated before adding data to the P2P network.");
+
+        try {
+            return dataStorage.add(dataStorage.getMailboxDataWithSignedSeqNr(expirableMailboxPayload, keyRing.getStorageSignatureKeyPair(), receiversPublicKey), networkNode.getAddress());
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
+            return false;
+        }
+    }
+
+    public boolean removeData(ExpirablePayload expirablePayload) {
+        if (!authenticatedToFirstPeer)
+            throw new AuthenticationException("You must be authenticated before removing data from the P2P network.");
+        try {
+            return dataStorage.remove(dataStorage.getDataWithSignedSeqNr(expirablePayload, keyRing.getStorageSignatureKeyPair()), networkNode.getAddress());
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
+            return false;
+        }
+    }
+
+    public boolean removeMailboxData(ExpirableMailboxPayload expirableMailboxPayload, PublicKey receiversPublicKey) {
+        if (!authenticatedToFirstPeer)
+            throw new AuthenticationException("You must be authenticated before removing data from the P2P network.");
+        try {
+            return dataStorage.removeMailboxData(dataStorage.getMailboxDataWithSignedSeqNr(expirableMailboxPayload, keyRing.getStorageSignatureKeyPair(), receiversPublicKey), networkNode.getAddress());
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
+            return false;
+        }
+    }
+
+    public Map<BigInteger, ProtectedData> getDataMap() {
+        return dataStorage.getMap();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Listeners
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void addMessageListener(MessageListener messageListener) {
+        networkNode.addMessageListener(messageListener);
+    }
+
+    public void removeMessageListener(MessageListener messageListener) {
+        networkNode.removeMessageListener(messageListener);
+    }
+
+    public void addDecryptedMailListener(DecryptedMailListener listener) {
+        decryptedMailListeners.add(listener);
+    }
+
+    public void removeDecryptedMailListener(DecryptedMailListener listener) {
+        decryptedMailListeners.remove(listener);
+    }
+
+    public void addDecryptedMailboxListener(DecryptedMailboxListener listener) {
+        decryptedMailboxListeners.add(listener);
+    }
+
+    public void removeDecryptedMailboxListener(DecryptedMailboxListener listener) {
+        decryptedMailboxListeners.remove(listener);
+    }
+
+    public void addP2PServiceListener(P2PServiceListener listener) {
+        p2pServiceListeners.add(listener);
+    }
+
+    public void removeP2PServiceListener(P2PServiceListener listener) {
+        p2pServiceListeners.remove(listener);
+    }
+
+    public void addHashSetChangedListener(HashSetChangedListener hashSetChangedListener) {
+        dataStorage.addHashSetChangedListener(hashSetChangedListener);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Getters
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public NetworkNode getNetworkNode() {
+        return networkNode;
+    }
+
+    public Routing getRouting() {
+        return routing;
+    }
+
+    public Address getAddress() {
+        return networkNode.getAddress();
+    }
+
+    public NetworkStatistics getNetworkStatistics() {
+        return networkStatistics;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Private
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private void sendGetAllDataMessage(List<Address> seedNodeAddresses) {
+        Address networkNodeAddress = networkNode.getAddress();
+        if (networkNodeAddress != null)
+            seedNodeAddresses.remove(networkNodeAddress);
+        List<Address> remainingSeedNodeAddresses = new CopyOnWriteArrayList<>(seedNodeAddresses);
+
+        if (!seedNodeAddresses.isEmpty()) {
+            Collections.shuffle(remainingSeedNodeAddresses);
+            Address candidate = remainingSeedNodeAddresses.remove(0);
+            log.info("We try to send a GetAllDataMessage request to a random seed node. " + candidate);
+
+            // we use a nonce to see if we are sending to ourselves in case we are a seed node
+            // we don't know our own onion address at that moment so we cannot filter seed nodes
+            SettableFuture<Connection> future = sendMessage(candidate, new GetDataSetMessage(addToListAndGetNonce()));
+            Futures.addCallback(future, new FutureCallback<Connection>() {
+                @Override
+                public void onSuccess(@Nullable Connection connection) {
+                    log.info("Send GetAllDataMessage to " + candidate + " succeeded.");
+                    connectedSeedNodes.add(candidate);
+
+                    // we try to connect to 2 seed nodes
+                    if (connectedSeedNodes.size() < 2 && !remainingSeedNodeAddresses.isEmpty()) {
+                        // give a random pause of 1-3 sec. before using the next
+                        sendGetAllDataMessageTimer = new Timer();
+                        sendGetAllDataMessageTimer.schedule(new TimerTask() {
+                            @Override
+                            public void run() {
+                                sendGetAllDataMessage(remainingSeedNodeAddresses);
+                            }
+                        }, new Random().nextInt(2000) + 1000);
+                    } else {
+                        allSeedNodesRequested = true;
+                    }
+                }
+
+                @Override
+                public void onFailure(Throwable throwable) {
+                    log.info("Send GetAllDataMessage to " + candidate + " failed. Exception:" + throwable.getMessage());
+                    log.trace("We try to connect another random seed node. " + remainingSeedNodeAddresses);
+                    sendGetAllDataMessage(remainingSeedNodeAddresses);
+                }
+            });
+        } else {
+            log.info("There is no seed node available for requesting data. That is expected for the first seed node.");
+            dataReceived();
+            allSeedNodesRequested = true;
+        }
+    }
+
+    private long addToListAndGetNonce() {
+        long nonce = new Random().nextLong();
+        while (nonce == 0) {
+            nonce = new Random().nextLong();
+        }
+        getDataSetMessageNonceList.add(nonce);
+        return nonce;
+    }
+
+    private void dataReceived() {
+        if (!allDataReceived) {
+            allDataReceived = true;
+            UserThread.execute(() -> p2pServiceListeners.stream().forEach(e -> e.onAllDataReceived()));
+
+            tryStartAuthentication();
+        }
+    }
+
+    private void tryStartAuthentication() {
+        // we need to have both the initial data delivered and the hidden service published before we 
+        // bootstrap and authenticate to other nodes
+        if (allDataReceived && hiddenServiceReady) {
+            // we remove ourselves in case we are a seed node
+            checkArgument(networkNode.getAddress() != null, "Address must be set when we are authenticated");
+            connectedSeedNodes.remove(networkNode.getAddress());
+
+            routing.startAuthentication(connectedSeedNodes);
+        }
+    }
+
+    private SettableFuture<Connection> sendMessage(Address peerAddress, Message message) {
+        return networkNode.sendMessage(peerAddress, message);
+    }
+
+    private HashSet<ProtectedData> getHashSet() {
+        return new HashSet<>(dataStorage.getMap().values());
+    }
+
+    private void tryDecryptMailboxData(ProtectedMailboxData mailboxData) {
+        ExpirablePayload data = mailboxData.expirablePayload;
+        if (data instanceof ExpirableMailboxPayload) {
+            ExpirableMailboxPayload mailboxEntry = (ExpirableMailboxPayload) data;
+            SealedAndSignedMessage sealedAndSignedMessage = mailboxEntry.sealedAndSignedMessage;
+            try {
+                DecryptedMessageWithPubKey decryptedMessageWithPubKey = encryptionService.decryptAndVerifyMessage(sealedAndSignedMessage);
+                if (decryptedMessageWithPubKey.message instanceof MailboxMessage) {
+                    MailboxMessage mailboxMessage = (MailboxMessage) decryptedMessageWithPubKey.message;
+                    Address senderAddress = mailboxMessage.getSenderAddress();
+                    checkNotNull(senderAddress, "senderAddress must not be null for mailbox messages");
+
+                    log.trace("mailboxData.publicKey " + mailboxData.ownerStoragePubKey.hashCode());
+                    log.trace("keyRing.getStorageSignatureKeyPair().getPublic() " + keyRing.getStorageSignatureKeyPair().getPublic().hashCode());
+                    log.trace("keyRing.getMsgSignatureKeyPair().getPublic() " + keyRing.getMsgSignatureKeyPair().getPublic().hashCode());
+                    log.trace("keyRing.getMsgEncryptionKeyPair().getPublic() " + keyRing.getMsgEncryptionKeyPair().getPublic().hashCode());
+
+
+                    mailboxMap.put(decryptedMessageWithPubKey, mailboxData);
+                    log.trace("Decryption of SealedAndSignedMessage succeeded. senderAddress=" + senderAddress + " / my address=" + getAddress());
+                    UserThread.execute(() -> decryptedMailboxListeners.stream().forEach(e -> e.onMailboxMessageAdded(decryptedMessageWithPubKey, senderAddress)));
+                }
+            } catch (CryptoException e) {
+                log.trace("Decryption of SealedAndSignedMessage failed. That is expected if the message is not intended for us.");
+            }
+        }
+    }
+}
diff --git a/core/src/test/java/io/bitsquare/crypto/CryptoServiceTests.java b/network/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java
similarity index 69%
rename from core/src/test/java/io/bitsquare/crypto/CryptoServiceTests.java
rename to network/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java
index 70c34b8a5e..0eba125c26 100644
--- a/core/src/test/java/io/bitsquare/crypto/CryptoServiceTests.java
+++ b/network/src/test/java/io/bitsquare/crypto/EncryptionServiceTests.java
@@ -17,29 +17,34 @@
 
 package io.bitsquare.crypto;
 
-import io.bitsquare.p2p.MailboxMessage;
-import io.bitsquare.util.Utilities;
-
-import java.io.File;
-import java.io.IOException;
-
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 
+import io.bitsquare.common.crypto.CryptoException;
+import io.bitsquare.common.crypto.KeyRing;
+import io.bitsquare.common.crypto.KeyStorage;
+import io.bitsquare.common.crypto.PubKeyRing;
+import io.bitsquare.common.util.Utilities;
+import io.bitsquare.p2p.Address;
+import io.bitsquare.p2p.messaging.DecryptedMessageWithPubKey;
+import io.bitsquare.p2p.messaging.MailboxMessage;
+import io.bitsquare.p2p.messaging.SealedAndSignedMessage;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.*;
+import java.io.File;
+import java.io.IOException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 
-public class CryptoServiceTests {
-    private static final Logger log = LoggerFactory.getLogger(CryptoServiceTests.class);
+import static org.junit.Assert.assertEquals;
+
+public class EncryptionServiceTests {
+    private static final Logger log = LoggerFactory.getLogger(EncryptionServiceTests.class);
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -63,11 +68,11 @@ public class CryptoServiceTests {
 
     @Test
     public void testDecryptAndVerifyMessage() throws CryptoException {
-        CryptoService<MailboxMessage> encryptionService = new CryptoService<>(keyRing);
+        EncryptionService encryptionService = new EncryptionService(keyRing);
         TestMessage data = new TestMessage("test");
         SealedAndSignedMessage encrypted = encryptionService.encryptAndSignMessage(pubKeyRing, data);
-        MessageWithPubKey decrypted = encryptionService.decryptAndVerifyMessage(encrypted);
-        assertEquals("", data.data, ((TestMessage) decrypted.getMessage()).data);
+        DecryptedMessageWithPubKey decrypted = encryptionService.decryptAndVerifyMessage(encrypted);
+        assertEquals(data.data, ((TestMessage) decrypted.message).data);
     }
 
 }
@@ -78,4 +83,9 @@ class TestMessage implements MailboxMessage {
     public TestMessage(String data) {
         this.data = data;
     }
+
+    @Override
+    public Address getSenderAddress() {
+        return null;
+    }
 }
diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh
index 56f2a81b43..50668761be 100644
--- a/package/mac/create_app.sh
+++ b/package/mac/create_app.sh
@@ -47,6 +47,7 @@ $JAVA_HOME/bin/javapackager \
     -outdir gui/deploy \
     -srcfiles gui/updatefx/builds/processed/$patchVersion.jar \
     -appclass io.bitsquare.app.BitsquareAppMain \
-    -outfile Bitsquare
+    -outfile Bitsquare \
+    -BjvmProperties=-Djava.net.preferIPv4Stack=true
     
 cd package/mac
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a5036bf3e8..eed25c2558 100755
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,9 @@
     </properties>
 
     <modules>
+        <module>common</module>
         <module>core</module>
+        <module>network</module>
         <module>bootstrap</module>
         <module>gui</module>
     </modules>
@@ -83,10 +85,6 @@
             <snapshots/>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </repository>
-        <repository>
-            <id>repository.tomp2p.net</id>
-            <url>http://tomp2p.net/dev/mvn</url>
-        </repository>
         <repository>
             <id>partnerdemo.artifactoryonline.com</id>
             <url>http://partnerdemo.artifactoryonline.com/partnerdemo/libs-snapshots-local</url>
@@ -94,21 +92,103 @@
     </repositories>
 
     <dependencies>
+
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <groupId>org.bitcoinj</groupId>
+            <artifactId>bitcoinj-core</artifactId>
+            <version>0.13.2</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>4.1.1.RELEASE</version>
+            <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>3.0</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.52</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>16.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.fxmisc.easybind</groupId>
+            <artifactId>easybind</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.reactfx</groupId>
+            <artifactId>reactfx</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>13.0</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.jodah</groupId>
+            <artifactId>concurrentunit</artifactId>
+            <version>0.4.1</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file