diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 62985b5..8fecd4f 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;javafx;org;com;envoy;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.ondemandthreshold=4
 org.eclipse.jdt.ui.staticondemandthreshold=2
diff --git a/.settings/org.hibernate.eclipse.console.prefs b/.settings/org.hibernate.eclipse.console.prefs
new file mode 100644
index 0000000..21fefff
--- /dev/null
+++ b/.settings/org.hibernate.eclipse.console.prefs
@@ -0,0 +1,3 @@
+default.configuration=
+eclipse.preferences.version=1
+hibernate3.enabled=false
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index bc84bcc..679e9ee 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -5,6 +5,13 @@ import java.util.logging.Logger;
 
 import javax.naming.TimeLimitExceededException;
 
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import javafx.scene.control.Alert.AlertType;
+
 import envoy.client.data.Cache;
 import envoy.client.data.ClientConfig;
 import envoy.client.data.LocalDB;
@@ -16,12 +23,6 @@ import envoy.event.EventBus;
 import envoy.event.HandshakeRejectionEvent;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
-import javafx.application.Platform;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.control.*;
-import javafx.scene.control.Alert.AlertType;
 
 /**
  * Project: <strong>envoy-client</strong><br>
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index af33ae2..118fea6 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -7,14 +7,6 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import envoy.client.data.*;
-import envoy.client.net.Client;
-import envoy.client.net.WriteProxy;
-import envoy.data.Message;
-import envoy.data.User;
-import envoy.data.User.UserStatus;
-import envoy.exception.EnvoyException;
-import envoy.util.EnvoyLog;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -24,6 +16,15 @@ import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 
+import envoy.client.data.*;
+import envoy.client.net.Client;
+import envoy.client.net.WriteProxy;
+import envoy.data.Message;
+import envoy.data.User;
+import envoy.data.User.UserStatus;
+import envoy.exception.EnvoyException;
+import envoy.util.EnvoyLog;
+
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Startup.java</strong><br>