diff --git a/common/pom.xml b/common/pom.xml
index d8f1cf1640..fd2c7a2261 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bitsquare/app/Version.java
index 438b67e65b..adc21be69f 100644
--- a/common/src/main/java/io/bitsquare/app/Version.java
+++ b/common/src/main/java/io/bitsquare/app/Version.java
@@ -24,7 +24,7 @@ public class Version {
     private static final Logger log = LoggerFactory.getLogger(Version.class);
 
     // The application versions
-    public static final String VERSION = "0.3.3";
+    public static final String VERSION = "0.3.4";
 
     // The version nr. for the objects sent over the network. A change will break the serialization of old objects.
     // If objects are used for both network and database the network version is applied.
diff --git a/core/pom.xml b/core/pom.xml
index d40fa74198..3a91d8bcac 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>core</artifactId>
diff --git a/gui/pom.xml b/gui/pom.xml
index 9a0107deb7..ddaf01f94b 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java
index 07bc2b14c2..42bb6ba10c 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java
@@ -100,6 +100,7 @@ public class PaymentAccountView extends ActivatableViewAndModel<GridPane, Paymen
                 onSelectAccount(paymentAccountsComboBox.getSelectionModel().getSelectedItem());
         };
         paymentAccountsComboBox.setOnAction(paymentAccountsComboBoxHandler);
+        paymentAccountsComboBox.setVisibleRowCount(20);
 
         model.getPaymentAccounts().addListener(
                 (ListChangeListener<PaymentAccount>) c -> paymentAccountsComboBox.setDisable(model.getPaymentAccounts().size() == 0));
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 d0cad3072f..d91432b1f9 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
@@ -30,10 +30,10 @@
         <columns>
             <TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="80" sortable="false"/>
             <TableColumn text="Date/Time" fx:id="dateColumn" minWidth="150"/>
-            <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" fx:id="volumeColumn" minWidth="130" sortable="false"/>
-            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
+            <TableColumn text="Trade amount in BTC" fx:id="amountColumn" minWidth="130"/>
+            <TableColumn text="Price" fx:id="priceColumn" minWidth="100"/>
+            <TableColumn text="Trade amount" fx:id="volumeColumn" minWidth="130"/>
+            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
             <TableColumn text="State" fx:id="stateColumn" minWidth="80" sortable="false"/>
         </columns>
     </TableView>
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 21d3db53c2..5b2103add3 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
@@ -30,10 +30,10 @@
         <columns>
             <TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="100" sortable="false"/>
             <TableColumn text="Date" 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 type" fx:id="directionColumn" minWidth="80" sortable="false"/>
+            <TableColumn text="Trade amount in BTC" fx:id="amountColumn" minWidth="130"/>
+            <TableColumn text="Price" fx:id="priceColumn" minWidth="100"/>
+            <TableColumn text="Trade amount in EUR" fx:id="volumeColumn" minWidth="130"/>
+            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
             <TableColumn text="State" fx:id="stateColumn" minWidth="80" sortable="false"/>
         </columns>
     </TableView>
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 1bfd95b837..a2e116652c 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
@@ -30,10 +30,10 @@
         <columns>
             <TableColumn text="Offer ID" fx:id="offerIdColumn" minWidth="100" sortable="false"/>
             <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 (Min.)" fx:id="volumeColumn" minWidth="130" sortable="false"/>
-            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="70" sortable="false"/>
+            <TableColumn text="Amount in BTC (Min.)" fx:id="amountColumn" minWidth="130"/>
+            <TableColumn text="Price" fx:id="priceColumn" minWidth="80"/>
+            <TableColumn text="Amount (Min.)" fx:id="volumeColumn" minWidth="130"/>
+            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="70"/>
             <TableColumn text="" fx:id="removeItemColumn" minWidth="100" sortable="false"/>
         </columns>
     </TableView>
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 d55b2af29d..3e245084b6 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
@@ -39,22 +39,22 @@
                     <PropertyValueFactory property="date"/>
                 </cellValueFactory>
             </TableColumn>
-            <TableColumn text="Trade amount in BTC" fx:id="tradeAmountColumn" minWidth="130" sortable="false">
+            <TableColumn text="Trade amount in BTC" fx:id="tradeAmountColumn" minWidth="130">
                 <cellValueFactory>
                     <PropertyValueFactory property="tradeAmount"/>
                 </cellValueFactory>
             </TableColumn>
-            <TableColumn text="Price" fx:id="priceColumn" minWidth="100" sortable="false">
+            <TableColumn text="Price" fx:id="priceColumn" minWidth="100">
                 <cellValueFactory>
                     <PropertyValueFactory property="price"/>
                 </cellValueFactory>
             </TableColumn>
-            <TableColumn text="Trade amount" fx:id="tradeVolumeColumn" minWidth="130" sortable="false">
+            <TableColumn text="Trade amount" fx:id="tradeVolumeColumn" minWidth="130">
                 <cellValueFactory>
                     <PropertyValueFactory property="tradeVolume"/>
                 </cellValueFactory>
             </TableColumn>
-            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80" sortable="false"/>
+            <TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
         </columns>
     </TableView>
 </VBox>
diff --git a/jsocks/pom.xml b/jsocks/pom.xml
index 661e764a5a..054c363f60 100644
--- a/jsocks/pom.xml
+++ b/jsocks/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml
index 47813a6e62..ede1b12cae 100644
--- a/jtorctl/pom.xml
+++ b/jtorctl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml
index 18db50e222..8f32aab4e8 100644
--- a/jtorproxy/pom.xml
+++ b/jtorproxy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/network/pom.xml b/network/pom.xml
index 1db742a73e..3585afac00 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/network/src/main/java/io/bitsquare/p2p/NodeAddress.java b/network/src/main/java/io/bitsquare/p2p/NodeAddress.java
index 0151fa0788..40b2857e97 100644
--- a/network/src/main/java/io/bitsquare/p2p/NodeAddress.java
+++ b/network/src/main/java/io/bitsquare/p2p/NodeAddress.java
@@ -54,6 +54,6 @@ public class NodeAddress implements Serializable {
 
     @Override
     public String toString() {
-        return getFullAddress() + "\n";
+        return getFullAddress();
     }
 }
diff --git a/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeHandshake.java b/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeHandshake.java
index 515d6c9a04..324d89afe0 100644
--- a/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeHandshake.java
+++ b/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeHandshake.java
@@ -64,7 +64,6 @@ public class PeerExchangeHandshake implements MessageListener {
     }
 
     public void shutDown() {
-        Log.traceCall();
         networkNode.removeMessageListener(this);
         stopTimeoutTimer();
     }
@@ -76,11 +75,12 @@ public class PeerExchangeHandshake implements MessageListener {
 
     public void requestReportedPeers(NodeAddress nodeAddress, List<NodeAddress> remainingNodeAddresses) {
         Log.traceCall("nodeAddress=" + nodeAddress);
+        Log.traceCall("this=" + this);
         checkNotNull(networkNode.getNodeAddress(), "My node address must not be null at requestReportedPeers");
         checkArgument(timeoutTimer == null, "requestData must not be called twice.");
 
         timeoutTimer = UserThread.runAfter(() -> {
-                    log.info("timeoutTimer called");
+                    log.info("timeoutTimer called on " + this);
                     peerManager.shutDownConnection(nodeAddress);
                     shutDown();
                     listener.onFault("A timeout occurred");
@@ -112,10 +112,11 @@ public class PeerExchangeHandshake implements MessageListener {
     }
 
     public void onGetPeersRequest(GetPeersRequest message, final Connection connection) {
+        Log.traceCall("message=" + message);
+        Log.traceCall("this=" + this);
         checkArgument(timeoutTimer == null, "requestData must not be called twice.");
-
         timeoutTimer = UserThread.runAfter(() -> {
-                    log.info("timeoutTimer called");
+                    log.info("timeoutTimer called on " + this);
                     peerManager.shutDownConnection(connection);
                     shutDown();
                     listener.onFault("A timeout occurred");
@@ -165,6 +166,7 @@ public class PeerExchangeHandshake implements MessageListener {
     public void onMessage(Message message, Connection connection) {
         if (message instanceof GetPeersResponse) {
             Log.traceCall(message.toString() + " / connection=" + connection);
+            Log.traceCall("this=" + this);
             GetPeersResponse getPeersResponse = (GetPeersResponse) message;
             if (getPeersResponse.requestNonce == nonce) {
                 stopTimeoutTimer();
diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh
index 86f820aa96..eedb6e8d0f 100644
--- a/package/linux/create_app.sh
+++ b/package/linux/create_app.sh
@@ -6,7 +6,7 @@ mkdir -p gui/deploy
 set -e
 
 # Edit versions
-fullVersion=0.3.3
+fullVersion=0.3.4
 jarFile="/home/mk/Desktop/sf_vm_shared_ubuntu/Bitsquare-$fullVersion.jar"
 
 # Note: fakeroot needs to be installed on linux
diff --git a/package/mac/create_app.sh b/package/mac/create_app.sh
index 9677f930d0..f348bc5c3b 100644
--- a/package/mac/create_app.sh
+++ b/package/mac/create_app.sh
@@ -5,7 +5,7 @@ mkdir -p gui/deploy
 
 set -e
 
-fullVersion="0.3.3"
+fullVersion="0.3.4"
 
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
 
diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss
index 8c1d275688..e43d3f65a3 100755
--- a/package/windows/Bitsquare.iss
+++ b/package/windows/Bitsquare.iss
@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bitsquare}}
 AppName=Bitsquare
-AppVersion=0.3.3
+AppVersion=0.3.4
 AppVerName=Bitsquare
 AppPublisher=Bitsquare
 AppComments=Bitsquare
diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat
index 9d64bcea7c..a5f82e3e51 100644
--- a/package/windows/create_app.bat
+++ b/package/windows/create_app.bat
@@ -1,13 +1,13 @@
 cd ..\..\
 mkdir gui\deploy
 
-:: edit iss file -> AppVersion=0.3.3
+:: edit iss file -> AppVersion=0.3.4
 
 :: Copy gui/deploy.Bitsquare.jar file from mac build to windows
-:: edit -> -BappVersion=0.3.3 and -srcfiles
+:: edit -> -BappVersion=0.3.4 and -srcfiles
 
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
-call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.3 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.3.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true  
+call "C:\Program Files\Java\jdk1.8.0_66\bin\javapackager.exe" -deploy -BappVersion=0.3.4 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir "\\VBOXSVR\vm_shared_windows" -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "\\VBOXSVR\vm_shared_windows\Bitsquare-0.3.4.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_66\jre" -BjvmProperties=-Djava.net.preferIPv4Stack=true  
  
 cd package\windows
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9ff3b1b74d..f34ca7000b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.bitsquare</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.3.3</version>
+    <version>0.3.4-SNAPSHOT</version>
     <description>Bitsquare - The decentralized bitcoin exchange</description>
     <url>https://bitsquare.io</url>
 
diff --git a/seednode/pom.xml b/seednode/pom.xml
index 27d044809d..ea3beb2914 100644
--- a/seednode/pom.xml
+++ b/seednode/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.3</version>
+        <version>0.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>