diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b7f54e8465..d99d2a86fc 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -13,10 +13,16 @@
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
-          <package name="bisq.desktop" withSubpackages="true" static="false" />
-          <emptyLine />
           <package name="bisq.monitor" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="bisq.price" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="bisq.statistics" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="bisq.seednode" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="bisq.desktop" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="bisq.core" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="bisq.network" withSubpackages="true" static="false" />
@@ -29,7 +35,7 @@
           <emptyLine />
           <package name="net.gpedro.integrations.slack" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="org.springframework" withSubpackages="true" static="false" />
+          <package name="org.knowm.xchange" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="org.libdohj" withSubpackages="true" static="false" />
           <emptyLine />
@@ -39,17 +45,23 @@
           <emptyLine />
           <package name="net.glxn.qrgen" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="org.springframework" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="org.apache.http" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="javax.servlet" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="org.berndpruenster.netlayer" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="com.runjva" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="com.fasterxml" withSubpackages="true" static="false" />
+          <package name="com.googlecode.jcsv" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com.fasterxml.jackson" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="com.google.gson" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="com.googlecode.jcsv" withSubpackages="true" static="false" />
+          <package name="org.json.simple" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="joptsimple" withSubpackages="true" static="false" />
           <emptyLine />
@@ -107,26 +119,26 @@
           <emptyLine />
           <package name="org.bouncycastle" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="java.security" withSubpackages="true" static="false" />
-          <emptyLine />
           <package name="javax.crypto" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="java.nio" withSubpackages="true" static="false" />
+          <package name="java.security" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="java.io" withSubpackages="true" static="false" />
+          <package name="java.time" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java.text" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="javax.net" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="java.net" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="java.text" withSubpackages="true" static="false" />
+          <package name="java.nio" withSubpackages="true" static="false" />
           <emptyLine />
-          <package name="java.util" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="java.time" withSubpackages="true" static="false" />
+          <package name="java.io" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="java.math" withSubpackages="true" static="false" />
           <emptyLine />
+          <package name="java.util" withSubpackages="true" static="false" />
+          <emptyLine />
           <package name="java.lang" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="org.slf4j" withSubpackages="true" static="false" />
diff --git a/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java b/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java
index 8a1acb328a..77b07e6978 100644
--- a/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java
+++ b/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java
@@ -29,10 +29,10 @@ import javax.inject.Inject;
 
 import javafx.fxml.FXMLLoader;
 
-import java.io.IOException;
-
 import java.net.URL;
 
+import java.io.IOException;
+
 import java.util.ResourceBundle;
 
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/src/main/java/bisq/desktop/main/MainViewModel.java b/src/main/java/bisq/desktop/main/MainViewModel.java
index ab3019335f..8d9ddc9e7c 100644
--- a/src/main/java/bisq/desktop/main/MainViewModel.java
+++ b/src/main/java/bisq/desktop/main/MainViewModel.java
@@ -122,11 +122,11 @@ import javafx.collections.SetChangeListener;
 
 import java.security.Security;
 
-import java.io.IOException;
-
 import java.net.InetSocketAddress;
 import java.net.Socket;
 
+import java.io.IOException;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/bisq/desktop/main/account/content/backup/BackupView.java b/src/main/java/bisq/desktop/main/account/content/backup/BackupView.java
index 589cb35623..946d34ec12 100644
--- a/src/main/java/bisq/desktop/main/account/content/backup/BackupView.java
+++ b/src/main/java/bisq/desktop/main/account/content/backup/BackupView.java
@@ -45,13 +45,13 @@ import javafx.scene.layout.GridPane;
 
 import javafx.beans.value.ChangeListener;
 
+import java.text.SimpleDateFormat;
+
 import java.nio.file.Paths;
 
 import java.io.File;
 import java.io.IOException;
 
-import java.text.SimpleDateFormat;
-
 import java.util.Date;
 
 import javax.annotation.Nullable;
diff --git a/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java b/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java
index 9f1bed026a..663a545575 100644
--- a/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java
+++ b/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java
@@ -50,16 +50,16 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 
-import java.io.File;
-import java.io.IOException;
-
-import java.util.List;
-
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
+import java.io.File;
+import java.io.IOException;
+
+import java.util.List;
+
 import static bisq.desktop.util.FormBuilder.*;
 import static javafx.beans.binding.Bindings.createBooleanBinding;
 
diff --git a/src/main/java/bisq/desktop/main/disputes/trader/TraderDisputeView.java b/src/main/java/bisq/desktop/main/disputes/trader/TraderDisputeView.java
index 75d8c09a23..e1fe30096e 100644
--- a/src/main/java/bisq/desktop/main/disputes/trader/TraderDisputeView.java
+++ b/src/main/java/bisq/desktop/main/disputes/trader/TraderDisputeView.java
@@ -109,17 +109,17 @@ import javafx.collections.transformation.SortedList;
 
 import javafx.util.Callback;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java b/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
index 4331eb9db8..e060a25245 100644
--- a/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
+++ b/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
@@ -44,15 +44,15 @@ import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
 class SpreadViewModel extends ActivatableViewModel {
 
     private final OfferBook offerBook;
diff --git a/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java b/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
index f4de20b642..bf9cdc35ca 100644
--- a/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
+++ b/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
@@ -59,6 +59,11 @@ import javafx.collections.SetChangeListener;
 
 import javafx.util.Pair;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -69,11 +74,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-
 class TradesChartsViewModel extends ActivatableViewModel {
 
     private static final int TAB_INDEX = 2;
diff --git a/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.java b/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.java
index e083568fb3..5d52cf77f5 100644
--- a/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.java
+++ b/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferView.java
@@ -113,10 +113,10 @@ import javafx.collections.FXCollections;
 
 import javafx.util.StringConverter;
 
-import java.io.ByteArrayInputStream;
-
 import java.net.URI;
 
+import java.io.ByteArrayInputStream;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
index 0c80ca6ae4..16d508a309 100644
--- a/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
+++ b/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
@@ -100,10 +100,10 @@ import org.fxmisc.easybind.Subscription;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 
-import java.io.ByteArrayInputStream;
-
 import java.net.URI;
 
+import java.io.ByteArrayInputStream;
+
 import java.util.concurrent.TimeUnit;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java b/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java
index bf5ce8442d..9ac3d32420 100644
--- a/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java
+++ b/src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java
@@ -62,13 +62,13 @@ import javafx.collections.FXCollections;
 
 import javafx.util.StringConverter;
 
+import java.net.URI;
+
 import java.nio.file.Paths;
 
 import java.io.File;
 import java.io.IOException;
 
-import java.net.URI;
-
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java b/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java
index 525f4f732f..4c8038402e 100644
--- a/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java
+++ b/src/main/java/bisq/desktop/main/overlays/windows/WalletPasswordWindow.java
@@ -68,16 +68,16 @@ import javafx.beans.value.ChangeListener;
 
 import org.spongycastle.crypto.params.KeyParameter;
 
-import java.io.File;
-import java.io.IOException;
-
-import java.util.concurrent.TimeUnit;
-
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 
+import java.io.File;
+import java.io.IOException;
+
+import java.util.concurrent.TimeUnit;
+
 import lombok.extern.slf4j.Slf4j;
 
 import static bisq.desktop.util.FormBuilder.addButton;
diff --git a/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DownloadTask.java b/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DownloadTask.java
index 669a6079ce..454978a471 100644
--- a/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DownloadTask.java
+++ b/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/DownloadTask.java
@@ -24,14 +24,14 @@ import com.google.common.collect.Lists;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
+import java.net.URL;
+import java.net.URLConnection;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import java.net.URL;
-import java.net.URLConnection;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/bisq/desktop/util/BSFormatter.java b/src/main/java/bisq/desktop/util/BSFormatter.java
index 4c0e85bde7..84361d6bd5 100644
--- a/src/main/java/bisq/desktop/util/BSFormatter.java
+++ b/src/main/java/bisq/desktop/util/BSFormatter.java
@@ -46,13 +46,13 @@ import org.apache.commons.lang3.time.DurationFormatUtils;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 
+import java.math.BigDecimal;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import java.math.BigDecimal;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/bisq/desktop/util/GUIUtil.java b/src/main/java/bisq/desktop/util/GUIUtil.java
index c49a6b8044..46367c201c 100644
--- a/src/main/java/bisq/desktop/util/GUIUtil.java
+++ b/src/main/java/bisq/desktop/util/GUIUtil.java
@@ -77,6 +77,10 @@ import javafx.beans.property.DoubleProperty;
 
 import javafx.util.StringConverter;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLEncoder;
+
 import java.nio.file.Paths;
 
 import java.io.File;
@@ -84,10 +88,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLEncoder;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/bisq/desktop/util/validation/IBANValidator.java b/src/main/java/bisq/desktop/util/validation/IBANValidator.java
index 1fccc5529c..e202ffee3a 100644
--- a/src/main/java/bisq/desktop/util/validation/IBANValidator.java
+++ b/src/main/java/bisq/desktop/util/validation/IBANValidator.java
@@ -20,10 +20,10 @@ package bisq.desktop.util.validation;
 import bisq.core.locale.Res;
 import bisq.core.util.validation.InputValidator;
 
-import java.util.Locale;
-
 import java.math.BigInteger;
 
+import java.util.Locale;
+
 // TODO Does not yet recognize special letters like ä, ö, ü, å, ... as invalid characters
 public final class IBANValidator extends InputValidator {
 
diff --git a/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java b/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java
index e6459d82b6..5b6e4aa9b1 100644
--- a/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java
+++ b/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java
@@ -42,13 +42,13 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import java.security.Security;
 
-import java.io.File;
-import java.io.IOException;
-
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
+import java.io.File;
+import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
diff --git a/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java b/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
index 8161b724c1..b0da5032c8 100644
--- a/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
+++ b/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
@@ -49,13 +49,13 @@ import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.time.Instant;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
-import java.time.Instant;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstallerTest.java b/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstallerTest.java
index 88a3aac924..1e93ae6d77 100644
--- a/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstallerTest.java
+++ b/src/test/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstallerTest.java
@@ -21,10 +21,10 @@ import bisq.desktop.main.overlays.windows.downloadupdate.BisqInstaller.FileDescr
 
 import com.google.common.collect.Lists;
 
-import java.io.File;
-
 import java.net.URL;
 
+import java.io.File;
+
 import java.util.List;
 
 import lombok.extern.slf4j.Slf4j;