diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java
index 7d81ce60ea..7f802cf075 100644
--- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java
@@ -351,6 +351,12 @@ public class MainViewCB extends ViewCB<MainPM> {
         settingsButton = addNavButton(rightNavPane, "Preferences", Navigation.Item.SETTINGS);
         accountButton = addNavButton(rightNavPane, "Account", Navigation.Item.ACCOUNT);
 
+
+        // for irc demo
+        homeButton.setDisable(true);
+        msgButton.setDisable(true);
+        settingsButton.setDisable(true);
+
         onMainNavigationAdded();
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
index 9ba33f2da1..af822c5990 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
@@ -129,7 +129,8 @@
             <TextField fx:id="paymentMethodTextField" GridPane.rowIndex="6" GridPane.columnIndex="1" editable="false"
                        focusTraversable="false" mouseTransparent="true" managed="false" visible="false"/>
 
-            <Label fx:id="holderNameLabel" text="Receiver name:" GridPane.rowIndex="7" managed="false" visible="false"/>
+            <Label fx:id="holderNameLabel" text="Receivers IRC nickname:" GridPane.rowIndex="7" managed="false"
+                   visible="false"/>
             <TextFieldWithCopyIcon fx:id="holderNameTextField" GridPane.rowIndex="7" GridPane.columnIndex="1"
                                    managed="false" visible="false"/>
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
index a11151f924..1982e82a86 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
@@ -208,7 +208,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
         presentationModel.removePendingTrade();
         presentationModel.withdraw(withdrawAddressTextField.getText());
         Platform.runLater(() ->
-                navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, 
+                navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO,
                         Navigation.Item.CLOSED_TRADES));
     }
 
@@ -358,7 +358,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
                     feesTextField.setText(presentationModel.getTotalFees());
                     securityDepositTextField.setText(presentationModel.getSecurityDeposit());
                     summaryInfoDisplay.setText("Your security deposit has been refunded to you. " +
-                            "You can review the details to that trade any time in the closed trades section.");
+                            "You can review the details to that trade any time in the closed trades screen.");
 
                     withdrawAmountTextField.setText(presentationModel.getAmountToWithdraw());
                     break;
@@ -433,7 +433,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
                     feesTextField.setText(presentationModel.getTotalFees());
                     securityDepositTextField.setText(presentationModel.getSecurityDeposit());
                     summaryInfoDisplay.setText("Your security deposit has been refunded to you. " +
-                            "You can review the details to that trade any time in the closed trades section.");
+                            "You can review the details to that trade any time in the closed trades screen.");
 
                     withdrawAmountTextField.setText(presentationModel.getAmountToWithdraw());
                     break;
@@ -452,29 +452,39 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
         paymentMethodLabel.setVisible(visible);
         fiatAmountLabel.setVisible(visible);
         holderNameLabel.setVisible(visible);
-        primaryIdLabel.setVisible(visible);
-        secondaryIdLabel.setVisible(visible);
+
+        // irc demo
+        // primaryIdLabel.setVisible(visible);
+        // secondaryIdLabel.setVisible(visible);
+        // primaryIdTextField.setVisible(visible);
+        // secondaryIdTextField.setVisible(visible);
+
         paymentMethodTextField.setVisible(visible);
         paymentsInfoDisplay.setVisible(visible);
         paymentsButton.setVisible(visible);
         fiatAmountTextField.setVisible(visible);
         holderNameTextField.setVisible(visible);
-        primaryIdTextField.setVisible(visible);
-        secondaryIdTextField.setVisible(visible);
+
 
         paymentsGroupBg.setManaged(visible);
         paymentMethodLabel.setManaged(visible);
         fiatAmountLabel.setManaged(visible);
         holderNameLabel.setManaged(visible);
-        primaryIdLabel.setManaged(visible);
-        secondaryIdLabel.setManaged(visible);
+
+        // irc demo
+        // primaryIdLabel.setManaged(visible);
+        // secondaryIdLabel.setManaged(visible);
+        primaryIdLabel.setManaged(false);
+        secondaryIdLabel.setManaged(false);
+        primaryIdTextField.setManaged(false);
+        secondaryIdTextField.setManaged(false);
+
         paymentMethodTextField.setManaged(visible);
         paymentsInfoDisplay.setManaged(visible);
         paymentsButton.setManaged(visible);
         fiatAmountTextField.setManaged(visible);
         holderNameTextField.setManaged(visible);
-        primaryIdTextField.setManaged(visible);
-        secondaryIdTextField.setManaged(visible);
+
 
         if (visible)
             scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
index 0f6284954b..97b72b19f5 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
@@ -218,7 +218,10 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
         balanceLabel.setVisible(true);
         balanceTextField.setVisible(true);
         fundsBoxInfoDisplay.setVisible(true);
-        showAdvancedSettingsButton.setVisible(true);
+
+        // for irc demo
+        //showAdvancedSettingsButton.setVisible(true);
+        showAdvancedSettingsButton.setManaged(false);
 
         if (expand == null) {
             expand = ImageUtil.getImageViewById(ImageUtil.EXPAND);
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java
index 5f6e7b5509..9e6c274440 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java
@@ -233,7 +233,10 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
         balanceLabel.setVisible(true);
         balanceTextField.setVisible(true);
         fundsBoxInfoDisplay.setVisible(true);
-        showAdvancedSettingsButton.setVisible(true);
+
+        // for irc demo
+        //showAdvancedSettingsButton.setVisible(true);
+        showAdvancedSettingsButton.setManaged(false);
 
         if (expand == null) {
             expand = ImageUtil.getImageViewById(ImageUtil.EXPAND);
diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java
index a93a40ce34..2ef555f900 100644
--- a/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -315,7 +315,7 @@ public class TradeManager {
                 offererAsBuyerProtocolMap.put(trade.getId(), buyerAcceptsOfferProtocol);
             }
             else {
-                // We don't store the protocol in case we have already a pending offer. The protocol is only
+                // We don't store the protocol in case we have already an open offer. The protocol is only
                 // temporary used to reply with a reject message.
                 log.trace("offererAsBuyerProtocol not stored as offer is already pending.");
             }
diff --git a/src/main/resources/i18n/displayStrings.properties b/src/main/resources/i18n/displayStrings.properties
index f25743f40f..66f4478932 100644
--- a/src/main/resources/i18n/displayStrings.properties
+++ b/src/main/resources/i18n/displayStrings.properties
@@ -70,7 +70,7 @@ createOffer.advancedBox.county=Payments account country:
 createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
 
 createOffer.success.headline=Your offer has been successfully published to the distributed offerbook.
-createOffer.success.info=In the Offers screen you can manage your open offers.
+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}
 
@@ -123,8 +123,8 @@ 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 trades section under \
-  pending trades.
+  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}