diff --git a/Nebula.Launcher/Assets/Style.axaml b/Nebula.Launcher/Assets/Style.axaml
index ca63d11..987382e 100644
--- a/Nebula.Launcher/Assets/Style.axaml
+++ b/Nebula.Launcher/Assets/Style.axaml
@@ -4,29 +4,32 @@
     </Style>
     <Style Selector="Border">
         <Setter Property="BorderBrush" Value="#343334" />
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="BoxShadow" Value="0 0 10 0 #222222" />
+        <Setter Property="BoxShadow" Value="0 0 2 2 #222222" />
     </Style>
     <Style Selector="Label">
         <Setter Property="Foreground" Value="#f7f7ff" />
     </Style>
     <Style Selector="ItemsControl">
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="Background" Value="Transparent" />
     </Style>
     <Style Selector="Button">
         <Setter Property="BorderBrush" Value="#343334" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Padding" Value="5" />
         <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <Style Selector="Button:pressed">
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="RenderTransform" Value="{x:Null}" />
+        <Setter Property="BorderThickness" Value="0,0,0,2" />
+        <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <Style Selector="Button:pointerover">
+        <Setter Property="RenderTransform" Value="{x:Null}" />
         <Setter Property="BorderThickness" Value="0,0,0,2" />
     </Style>
 
@@ -34,7 +37,7 @@
         <Setter Property="CornerRadius" Value="0,8,8,0" />
         <Setter Property="Margin" Value="0,0,0,5" />
         <Setter Property="Padding" Value="8" />
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <Style Selector="Button.ViewSelectButton:pressed">
@@ -52,18 +55,18 @@
         <Setter Property="CornerRadius" Value="0,8,8,0" />
         <Setter Property="Margin" Value="0,0,0,5" />
         <Setter Property="Padding" Value="8" />
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="Background" Value="Transparent" />
     </Style>
 
     <Style Selector="ListBox.AccountSelector &gt; ListBoxItem">
         <Setter Property="CornerRadius" Value="0" />
         <Setter Property="Margin" Value="0,0,0,0" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
     </Style>
 
     <Style Selector="TextBox">
-        <Setter Property="Background" Value="{StaticResource NoneBackground}" />
+        <Setter Property="Background" Value="Transparent" />
     </Style>
 </Styles>
\ No newline at end of file
diff --git a/Nebula.Launcher/Views/MainView.axaml b/Nebula.Launcher/Views/MainView.axaml
index 4edf33b..1f1145c 100644
--- a/Nebula.Launcher/Views/MainView.axaml
+++ b/Nebula.Launcher/Views/MainView.axaml
@@ -105,7 +105,7 @@
 
         <Panel IsVisible="{Binding Popup}">
             <Border Background="#111" Opacity="50" />
-            <Border CornerRadius="10" Margin="40">
+            <Border CornerRadius="10" Margin="40" Background="{StaticResource DefaultBackground}">
                 <Grid RowDefinitions="35,*,20">
                     <Border
                         BorderThickness="0,0,0,2"
diff --git a/Nebula.Launcher/Views/Pages/ServerListView.axaml b/Nebula.Launcher/Views/Pages/ServerListView.axaml
index eaebe91..fb1ad25 100644
--- a/Nebula.Launcher/Views/Pages/ServerListView.axaml
+++ b/Nebula.Launcher/Views/Pages/ServerListView.axaml
@@ -16,7 +16,7 @@
 
     <Grid
         ColumnDefinitions="*"
-        Margin="8,0,8,5"
+        Margin="0"
         RowDefinitions="*,40">
         <ScrollViewer Margin="0,0,0,10" Padding="0,0,10,0" Grid.RowSpan="2">
             <ItemsControl
@@ -25,31 +25,30 @@
                 Padding="0">
             </ItemsControl>
         </ScrollViewer>
-
-        <Border
-            BorderThickness="2,2,2,0"
-            CornerRadius="10"
-            Grid.Row="1">
-            <Grid ColumnDefinitions="*,40,40" RowDefinitions="*" Margin="5,0,0,0">
-                <TextBox
-                    Margin="0"
-                    Text="{Binding SearchText}"
-                    TextChanged="TextBox_OnTextChanged"
-                    VerticalAlignment="Center"
-                    Watermark="Server name..." />
-                <Button
-                    Command="{Binding FilterRequired}"
-                    Grid.Column="1"
-                    Padding="10">
-                    <Svg Path="/Assets/svg/filter.svg"></Svg>
-                </Button>
-                <Button
-                    Command="{Binding UpdateRequired}"
-                    Grid.Column="2"
-                    Padding="10">
-                    <Svg Path="/Assets/svg/refresh.svg"></Svg>
-                </Button>
-            </Grid>
+        
+        <Border Grid.Row="1" Background="{StaticResource DefaultBackground}" BoxShadow="none">
+            
         </Border>
+
+        <Grid Grid.Row="1" ColumnDefinitions="*,40,40" RowDefinitions="*" Margin="5,0,0,0">
+            <TextBox
+                Margin="0"
+                Text="{Binding SearchText}"
+                TextChanged="TextBox_OnTextChanged"
+                VerticalAlignment="Center"
+                Watermark="Server name..." />
+            <Button
+                Command="{Binding FilterRequired}"
+                Grid.Column="1"
+                Padding="10">
+                <Svg Path="/Assets/svg/filter.svg"></Svg>
+            </Button>
+            <Button
+                Command="{Binding UpdateRequired}"
+                Grid.Column="2"
+                Padding="10">
+                <Svg Path="/Assets/svg/refresh.svg"></Svg>
+            </Button>
+        </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Nebula.Launcher/Views/ServerEntryView.axaml b/Nebula.Launcher/Views/ServerEntryView.axaml
index a6eed39..aef5a8e 100644
--- a/Nebula.Launcher/Views/ServerEntryView.axaml
+++ b/Nebula.Launcher/Views/ServerEntryView.axaml
@@ -18,44 +18,38 @@
 
     <Border
         Background="#00000000"
-        BorderThickness="0,0,0,0"
-        BoxShadow="0 0 10 0 #222222"
+        BorderThickness="2,1,0,1"
         CornerRadius="10"
-        Margin="0,5,0,5">
-        <Grid ColumnDefinitions="30,*,80,50" RowDefinitions="35,*,*">
+        Margin="5">
+        <Grid ColumnDefinitions="*,80,50" RowDefinitions="35,*,*">
             <Border
                 Background="#00000000"
                 BorderThickness="0,0,0,2"
                 CornerRadius="10"
-                Grid.Column="1"
+                Grid.Column="0"
                 Grid.ColumnSpan="2"
                 Grid.Row="0"
                 IsVisible="{Binding ExpandInfo}" />
 
             <Button
                 Background="#00000000"
-                BorderThickness="2,0,0,0"
                 Command="{Binding ExpandInfoRequired}"
-                CornerRadius="10,0,0,10"
                 Grid.Column="0"
                 Grid.Row="0"
-                Grid.RowSpan="3"
-                VerticalAlignment="Stretch">
-                <Label Margin="5,0,5,0" VerticalAlignment="Bottom">i</Label>
+                VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                <ScrollViewer
+                    HorizontalScrollBarVisibility="Hidden"
+                    Margin="10,0,0,0"
+                    VerticalScrollBarVisibility="Disabled"
+                    x:Name="AutoScrollViewer">
+                    <Label VerticalAlignment="Center">
+                        <TextBlock Text="{Binding ServerHubInfo.StatusData.Name}" />
+                    </Label>
+                </ScrollViewer>
             </Button>
-            <ScrollViewer
-                Grid.Column="1"
-                Grid.Row="0"
-                HorizontalScrollBarVisibility="Hidden"
-                Margin="10,0,0,0"
-                VerticalScrollBarVisibility="Disabled"
-                x:Name="AutoScrollViewer">
-                <Label VerticalAlignment="Center">
-                    <TextBlock Text="{Binding ServerHubInfo.StatusData.Name}" />
-                </Label>
-            </ScrollViewer>
+            
             <StackPanel
-                Grid.Column="2"
+                Grid.Column="1"
                 Grid.Row="0"
                 HorizontalAlignment="Center"
                 Orientation="Horizontal"
@@ -71,7 +65,7 @@
 
 
             <Panel
-                Grid.Column="3"
+                Grid.Column="2"
                 Grid.Row="0"
                 Margin="5,0,0,0">
                 <Button
@@ -92,29 +86,25 @@
                     </Button>
                 </Grid>
             </Panel>
-
-            <Border
-                Background="#00000000"
-                BorderThickness="0,0,0,0"
-                Grid.Column="1"
-                Grid.ColumnSpan="3"
-                Grid.Row="1"
-                IsVisible="{Binding ExpandInfo}"
-                Margin="5">
-                <Label FontSize="12">
-                    <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
-                </Label>
-            </Border>
+            
+            <Label FontSize="12"  Grid.Column="0" HorizontalAlignment="Left"
+                   Grid.ColumnSpan="2"
+                   Grid.Row="1"
+                   IsVisible="{Binding ExpandInfo}"
+                   Margin="15">
+                <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
+            </Label>
+            
             <Border
                 Background="#00000000"
                 BorderThickness="0,2,0,0"
                 CornerRadius="10"
-                Grid.Column="1"
-                Grid.ColumnSpan="3"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
                 Grid.Row="2"
                 IsVisible="{Binding ExpandInfo}"
                 Margin="5,15,15,5">
-                <StackPanel Margin="5" Spacing="4">
+                <StackPanel Margin="5" Spacing="5">
                     <StackPanel Orientation="Horizontal">
                         <Label FontSize="10" VerticalAlignment="Center">Tags:</Label>
                         <ItemsControl ItemsSource="{Binding Tags}">
@@ -134,22 +124,22 @@
                             </ItemsControl.ItemTemplate>
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <StackPanel
+                                    <StackPanel Margin="5"
                                         HorizontalAlignment="Left"
                                         Orientation="Horizontal"
-                                        VerticalAlignment="Center" />
+                                        VerticalAlignment="Center" Spacing="8"/>
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                         </ItemsControl>
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal">
+                    <StackPanel Orientation="Horizontal" >
                         <Label FontSize="10" VerticalAlignment="Center">Map:</Label>
-                        <Border
+                        <Border 
                             Background="#121212"
                             CornerRadius="8"
                             HorizontalAlignment="Center"
-                            Margin="1,1,1,1"
+                            Margin="5"
                             VerticalAlignment="Center">
                             <Label FontSize="10" Margin="5,0,5,0">
                                 <TextBlock Text="{Binding ServerHubInfo.StatusData.Map}" />
@@ -163,7 +153,7 @@
                             Background="#121212"
                             CornerRadius="8"
                             HorizontalAlignment="Center"
-                            Margin="1,1,1,1"
+                            Margin="5"
                             VerticalAlignment="Center">
                             <Label FontSize="10" Margin="5,0,5,0">
                                 <TextBlock Text="{Binding ServerHubInfo.StatusData.Preset}" />
@@ -173,7 +163,7 @@
                 </StackPanel>
             </Border>
             <StackPanel
-                Grid.Column="3"
+                Grid.Column="2"
                 Grid.Row="1"
                 IsVisible="{Binding ExpandInfo}"
                 Margin="5,5,0,0"