diff --git a/src/main/java/org/openautonomousconnection/webclient/network/website/tab/Tab.java b/src/main/java/org/openautonomousconnection/webclient/network/website/tab/Tab.java
index c070f23..aceceea 100644
--- a/src/main/java/org/openautonomousconnection/webclient/network/website/tab/Tab.java
+++ b/src/main/java/org/openautonomousconnection/webclient/network/website/tab/Tab.java
@@ -1,5 +1,7 @@
 package org.openautonomousconnection.webclient.network.website.tab;
 
+import org.openautonomousconnection.webclient.network.website.WebSite;
+
 import javax.swing.*;
 import java.net.URL;
 
@@ -10,5 +12,8 @@ public interface Tab {
     URL getInfoName();
     void setInfoName(URL infoName);
 
+    WebSite getWebSite();
+    void setWebSite(WebSite webSite);
+
     void refresh() throws Exception;
 }
diff --git a/src/main/java/org/openautonomousconnection/webclient/network/website/tab/WebTab.java b/src/main/java/org/openautonomousconnection/webclient/network/website/tab/WebTab.java
index d81ba93..4a9d9c4 100644
--- a/src/main/java/org/openautonomousconnection/webclient/network/website/tab/WebTab.java
+++ b/src/main/java/org/openautonomousconnection/webclient/network/website/tab/WebTab.java
@@ -52,6 +52,7 @@ public final class WebTab implements Tab {
     }
 
     public void refresh() throws Exception {
+
         if (client.getClientServerConnection().isConnected()) client.getClientServerConnection().disconnect();
         int port = infoName.getPort() == -1 ? DEFAULT_WEB_PORT_TCP : infoName.getPort();
         client.buildServerConnection(null, true);
diff --git a/src/main/java/org/openautonomousconnection/webclient/ui/BrowserFrame.java b/src/main/java/org/openautonomousconnection/webclient/ui/BrowserFrame.java
index 6a8602a..37cdeab 100644
--- a/src/main/java/org/openautonomousconnection/webclient/ui/BrowserFrame.java
+++ b/src/main/java/org/openautonomousconnection/webclient/ui/BrowserFrame.java
@@ -4,15 +4,7 @@
 
 package org.openautonomousconnection.webclient.ui;
 
-import lombok.Getter;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.geom.RoundRectangle2D;
+import org.openautonomousconnection.oacswing.component.OACFrame;
 
 public abstract class BrowserFrame extends OACFrame {
 
diff --git a/src/main/java/org/openautonomousconnection/webclient/ui/TopBar.java b/src/main/java/org/openautonomousconnection/webclient/ui/TopBar.java
index 020f189..c00d611 100644
--- a/src/main/java/org/openautonomousconnection/webclient/ui/TopBar.java
+++ b/src/main/java/org/openautonomousconnection/webclient/ui/TopBar.java
@@ -13,6 +13,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
 
+@Deprecated(forRemoval = true)
 public class TopBar extends JPanel {
     @Getter
     private MenuButton closeButton, minimizeButton, maximizeButton;