diff --git a/src/main/java/io/bitsquare/gui/bitsquare.css b/src/main/java/io/bitsquare/gui/bitsquare.css
index e7badd4c37..47f86337b4 100644
--- a/src/main/java/io/bitsquare/gui/bitsquare.css
+++ b/src/main/java/io/bitsquare/gui/bitsquare.css
@@ -7,6 +7,7 @@ new blue: 0f87c3
 new grey: 666666
 
 00abff
+orange webpage quotes : ff7f00
 
 
 main bg grey: dddddd
diff --git a/src/main/java/io/bitsquare/gui/main/MainView.java b/src/main/java/io/bitsquare/gui/main/MainView.java
index 2a590f05e8..64df963462 100644
--- a/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -258,7 +258,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
                 bootstrapStateLabel.setId("splash-error-state-msg");
                 bootstrapIndicator.setVisible(false);
 
-                Popups.openErrorPopup("Error", "Cannot connect to P2P network. \n\nError message:\n" +
+                Popups.openErrorPopup("Error", "Connection to P2P network failed. \n\nReason: " +
                         model.bootstrapErrorMsg.get());
             }
         });
diff --git a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java
index a00b1dc2a2..d28be2c319 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerBuilder.java
@@ -229,10 +229,10 @@ class BootstrappedPeerBuilder {
                     else {
                         handleError(BootstrapState.DISCOVERY_AUTO_PORT_FORWARDING_FAILED, "Automatic port forwarding " +
                                 "failed. " +
-                                "Fail reason: " + future.failedReason() +
-                                "\nCheck if UPnP is not enabled on your router. " +
-                                "\nYou can try also to setup manual port forwarding. " +
-                                "\nRelay mode is currently not supported but will follow later. ");
+                                "\n\nCheck if UPnP is enabled on your router. " +
+                                "\nIf it is enabled and it still does not work you can try also to setup manual port " +
+                                "forwarding. " +
+                                "\n\nYou find on our Github Wiki help how to setup manual port forwarding.");
 
                         // For the moment we don't support relay mode as it has too much problems
                   /*  setState(BootstrapState.AUTO_PORT_FORWARDING_NOT_SUCCEEDED, "Port forwarding has failed. " +