diff --git a/src/main/java/io/bitsquare/gui/NavigationItem.java b/src/main/java/io/bitsquare/gui/NavigationItem.java
index 99b7d30bb0..cca73d29a7 100644
--- a/src/main/java/io/bitsquare/gui/NavigationItem.java
+++ b/src/main/java/io/bitsquare/gui/NavigationItem.java
@@ -28,6 +28,8 @@ public enum NavigationItem {
FUNDS("/io/bitsquare/gui/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE),
MSG("/io/bitsquare/gui/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE),
SETTINGS("/io/bitsquare/gui/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE),
+ REGISTRATION("/io/bitsquare/gui/registration/RegistrationView.fxml"),
+ SETUP("/io/bitsquare/gui/setup/SetupView.fxml"),
ORDER_BOOK("/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml"),
CREATE_OFFER("/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml"),
diff --git a/src/main/java/io/bitsquare/gui/registration/RegistrationController.java b/src/main/java/io/bitsquare/gui/registration/RegistrationController.java
new file mode 100644
index 0000000000..ca77cf374a
--- /dev/null
+++ b/src/main/java/io/bitsquare/gui/registration/RegistrationController.java
@@ -0,0 +1,79 @@
+/*
+ * 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 .
+ */
+
+package io.bitsquare.gui.registration;
+
+import io.bitsquare.gui.CodeBehind;
+import io.bitsquare.gui.trade.TradeController;
+
+import java.net.URL;
+
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RegistrationController extends CodeBehind {
+
+ private static final Logger log = LoggerFactory.getLogger(RegistrationController.class);
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Constructor
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+ @Inject
+ public RegistrationController() {
+ }
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Lifecycle
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+ @Override
+ public void initialize(URL url, ResourceBundle rb) {
+ super.initialize(url, rb);
+
+ }
+
+ @Override
+ public void terminate() {
+ super.terminate();
+
+ // Used to reset disable state of createOfferButton in OrderBookController
+ if (parentController != null) ((TradeController) parentController).onCreateOfferViewRemoved();
+ }
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Public Methods
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // UI handlers
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Private methods
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+}
+
diff --git a/src/main/java/io/bitsquare/gui/registration/RegistrationView.fxml b/src/main/java/io/bitsquare/gui/registration/RegistrationView.fxml
new file mode 100644
index 0000000000..f34db48d12
--- /dev/null
+++ b/src/main/java/io/bitsquare/gui/registration/RegistrationView.fxml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/io/bitsquare/gui/settings/SettingsController.java b/src/main/java/io/bitsquare/gui/settings/SettingsController.java
index 3f460bd29f..b3218b9cdf 100644
--- a/src/main/java/io/bitsquare/gui/settings/SettingsController.java
+++ b/src/main/java/io/bitsquare/gui/settings/SettingsController.java
@@ -74,11 +74,15 @@ import javafx.util.StringConverter;
import org.controlsfx.control.action.Action;
import org.controlsfx.dialog.Dialog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
// TODO separate in 2 view/controllers
// TODO: change ui to dispaly a menu on the left and the content on the right
// there will be more screens
public class SettingsController extends CachedViewController {
+ private static final Logger log = LoggerFactory.getLogger(SettingsController.class);
private final User user;
private final Settings settings;
private final Persistence persistence;
diff --git a/src/main/java/io/bitsquare/gui/setup/SetupController.java b/src/main/java/io/bitsquare/gui/setup/SetupController.java
new file mode 100644
index 0000000000..2b9749260b
--- /dev/null
+++ b/src/main/java/io/bitsquare/gui/setup/SetupController.java
@@ -0,0 +1,79 @@
+/*
+ * 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 .
+ */
+
+package io.bitsquare.gui.setup;
+
+import io.bitsquare.gui.CodeBehind;
+import io.bitsquare.gui.trade.TradeController;
+
+import java.net.URL;
+
+import java.util.ResourceBundle;
+
+import javax.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SetupController extends CodeBehind {
+
+ private static final Logger log = LoggerFactory.getLogger(SetupController.class);
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Constructor
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+ @Inject
+ public SetupController() {
+ }
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Lifecycle
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+ @Override
+ public void initialize(URL url, ResourceBundle rb) {
+ super.initialize(url, rb);
+
+ }
+
+ @Override
+ public void terminate() {
+ super.terminate();
+
+ // Used to reset disable state of createOfferButton in OrderBookController
+ if (parentController != null) ((TradeController) parentController).onCreateOfferViewRemoved();
+ }
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Public Methods
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // UI handlers
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ // Private methods
+ ///////////////////////////////////////////////////////////////////////////////////////////
+
+
+}
+
diff --git a/src/main/java/io/bitsquare/gui/setup/SetupView.fxml b/src/main/java/io/bitsquare/gui/setup/SetupView.fxml
new file mode 100644
index 0000000000..a013e6124f
--- /dev/null
+++ b/src/main/java/io/bitsquare/gui/setup/SetupView.fxml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+