diff --git a/src/main/java/io/bitsquare/gui/components/Popups.java b/src/main/java/io/bitsquare/gui/components/Popups.java
index 443c128a2b..0a985c7a28 100644
--- a/src/main/java/io/bitsquare/gui/components/Popups.java
+++ b/src/main/java/io/bitsquare/gui/components/Popups.java
@@ -59,7 +59,7 @@ public class Popups {
 
     // Information
     public static void openInfo(String message) {
-        openInfo(message, null, null);
+        openInfo(message, null);
     }
 
     // Supports blurring the content background
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
index b4fe8c6109..1948c0a4ee 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
@@ -26,9 +26,9 @@
             xmlns:fx="http://javafx.com/fxml">
     <VBox spacing="20">
         <padding>
-            <Insets left="10" top="10" right="10"/>
+            <Insets left="20" top="20" right="20"/>
         </padding>
-        <Label text="TODO: Just very basic prototype yet..."/>
+        <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>
diff --git a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java
index 54271b7e8d..f4f01ac29c 100644
--- a/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsViewCB.java
@@ -19,6 +19,7 @@ package io.bitsquare.gui.main.funds.transactions;
 
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.bitcoin.core.Transaction;
@@ -115,6 +116,13 @@ public class TransactionsViewCB extends CachedViewCB {
     // Private methods
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    private void openTxDetails(TransactionsListItem item) {
+        // TODO Open popup with details view
+        log.debug("openTxDetails " + item);
+        Popups.openWarningPopup("Under construction",
+                "This will open a details popup but that is not implemented yet.");
+    }
+    
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Cell factories
@@ -139,8 +147,7 @@ public class TransactionsViewCB extends CachedViewCB {
                                 if (item != null && !empty) {
                                     hyperlink = new Hyperlink(item.getAddressString());
                                     hyperlink.setId("id-link");
-                                    hyperlink.setOnAction(event -> log.info("Show trade details " + item
-                                            .getAddressString()));
+                                    hyperlink.setOnAction(event -> openTxDetails(item));
                                     setGraphic(hyperlink);
                                 }
                                 else {
diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
index 3cfab9e766..4744673368 100644
--- a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
@@ -27,9 +27,9 @@
     <Tab text="Overview" closable="false">
         <VBox spacing="20">
             <padding>
-                <Insets left="10" top="10" right="10"/>
+                <Insets left="20" top="20" right="20"/>
             </padding>
-            <Label text="TODO: Overview"/>
+            <Label text="Overview not implemented yet. It will contain latest activities, market and price information and notifications."/>
         </VBox>
     </Tab>
 </TabPane>
diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
index 427ebcae57..1236c50eef 100644
--- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
@@ -28,9 +28,9 @@
     <Tab text="Message" closable="false">
         <VBox spacing="20">
             <padding>
-                <Insets left="10" top="10" right="10"/>
+                <Insets left="20" top="20" right="20"/>
             </padding>
-            <Label text="TODO: Communication tools with arbitrators, Mailbox for trade messages if client was offline"/>
+            <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/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java
index 7d279003b2..1b7c967fc1 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradesViewCB.java
@@ -18,6 +18,7 @@
 package io.bitsquare.gui.main.orders.closed;
 
 import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.components.Popups;
 
 import java.net.URL;
 
@@ -97,6 +98,8 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
     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.");
     }
 
 
diff --git a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java
index 631f7a57a5..0bc83ffcf0 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/offer/OffersViewCB.java
@@ -18,6 +18,7 @@
 package io.bitsquare.gui.main.orders.offer;
 
 import io.bitsquare.gui.CachedViewCB;
+import io.bitsquare.gui.components.Popups;
 
 import java.net.URL;
 
@@ -103,6 +104,8 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
     private void openOfferDetails(OfferListItem item) {
         // TODO Open popup with details view
         log.debug("openOfferDetails " + item);
+        Popups.openWarningPopup("Under construction",
+                "This will open a details popup but that is not implemented yet.");
     }
 
 
diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java
index 1a442ea967..0d36d4441a 100644
--- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesViewCB.java
@@ -20,6 +20,7 @@ package io.bitsquare.gui.main.orders.pending;
 import io.bitsquare.gui.CachedViewCB;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.components.InfoDisplay;
+import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.TextFieldWithCopyIcon;
 import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.components.TxIdTextField;
@@ -206,6 +207,12 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
         Help.openWindow(HelpId.PENDING_TRADE_SUMMARY);
     }
 
+    private void openOfferDetails(PendingTradesListItem 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 methods
@@ -408,11 +415,6 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
             log.error(fault.toString());
     }
 
-    private void openOfferDetails(PendingTradesListItem item) {
-        // TODO Open popup with details view
-        log.debug("Trade details " + item);
-    }
-
     private void setPaymentsControlsVisible(boolean visible) {
         paymentsGroupBg.setVisible(visible);
         paymentMethodLabel.setVisible(visible);
diff --git a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
index f03c608cd1..1d8475e872 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
@@ -28,9 +28,9 @@
     <Tab text="Preferences" closable="false">
         <VBox spacing="20">
             <padding>
-                <Insets left="10" top="10" right="10"/>
+                <Insets left="20" top="20" right="20"/>
             </padding>
-            <Label text="TODO: Application preferences"/>
+            <Label text="Preferences not implemented yet."/>
         </VBox>
     </Tab>
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml
index b58718389d..bba0e1e003 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml
@@ -93,17 +93,20 @@
 
     <Label fx:id="extendedCheckBoxLabel" text="Show only matching offers:" GridPane.columnIndex="0"
            GridPane.rowIndex="2" visible="false" managed="false"/>
-    <CheckBox fx:id="extendedCheckBox" visible="false" managed="false" GridPane.columnIndex="1"
+    <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="extendedButton1" text="Open countries filter" GridPane.columnIndex="1"
+    <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="extendedButton2" text="Open payment methods filter" GridPane.columnIndex="1"
+    <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"/>
diff --git a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java
index f757f6150f..6d0a06170e 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookViewCB.java
@@ -76,12 +76,12 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
     private ImageView expand;
     private ImageView collapse;
 
-    @FXML CheckBox extendedCheckBox;
+    @FXML CheckBox showOnlyMatchingCheckBox;
     @FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel,
             volumeFiatLabel, extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel;
     @FXML InputTextField volumeTextField, amountTextField, priceTextField;
     @FXML TableView<OrderBookListItem> table;
-    @FXML Button createOfferButton, showAdvancedSettingsButton, extendedButton1, extendedButton2;
+    @FXML Button createOfferButton, showAdvancedSettingsButton, openCountryFilterButton, openPaymentMethodsFilterButton;
     @FXML TableColumn<OrderBookListItem, OrderBookListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, countryColumn, bankAccountTypeColumn;
 
@@ -187,9 +187,15 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
     @FXML
     void createOffer() {
         if (presentationModel.isRegistered()) {
-            createOfferButton.setDisable(true);
-            ((TradeNavigator) parent).createOffer(presentationModel.getAmountAsCoin(),
-                    presentationModel.getPriceAsCoin());
+            if (presentationModel.getDirection() == Direction.BUY) {
+                createOfferButton.setDisable(true);
+                ((TradeNavigator) parent).createOffer(presentationModel.getAmountAsCoin(),
+                        presentationModel.getPriceAsCoin());
+            }
+            else {
+                Popups.openWarningPopup("Under construction", "At the moment only the creation of buy offers is " +
+                        "implemented.");
+            }
         }
         else {
             openSetupScreen();
@@ -211,6 +217,21 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
         }
     }
 
+    @FXML
+    void onShowOnlyMatching() {
+        Popups.openWarningPopup("Under construction", "This feature is not implemented yet.");
+    }
+
+    @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 methods
@@ -285,14 +306,14 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
         extendedCheckBoxLabel.setVisible(visible);
         extendedCheckBoxLabel.setManaged(visible);
 
-        extendedButton1.setVisible(visible);
-        extendedButton1.setManaged(visible);
+        openCountryFilterButton.setVisible(visible);
+        openCountryFilterButton.setManaged(visible);
 
-        extendedButton2.setVisible(visible);
-        extendedButton2.setManaged(visible);
+        openPaymentMethodsFilterButton.setVisible(visible);
+        openPaymentMethodsFilterButton.setManaged(visible);
 
-        extendedCheckBox.setVisible(visible);
-        extendedCheckBox.setManaged(visible);
+        showOnlyMatchingCheckBox.setVisible(visible);
+        showOnlyMatchingCheckBox.setManaged(visible);
     }
 
 
@@ -536,6 +557,5 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
                     }
                 });
     }
-
 }
 
diff --git a/src/main/resources/images/logo_splash.png b/src/main/resources/images/logo_splash.png
index 68098a4abc..e9c16da0ee 100644
Binary files a/src/main/resources/images/logo_splash.png and b/src/main/resources/images/logo_splash.png differ
diff --git a/src/main/resources/images/logo_splash@2x.png b/src/main/resources/images/logo_splash@2x.png
index 01e22f4b01..209611aa3b 100644
Binary files a/src/main/resources/images/logo_splash@2x.png and b/src/main/resources/images/logo_splash@2x.png differ