diff --git a/src/ui/ApplicationComponent.css b/src/ui/ApplicationComponent.less
similarity index 58%
rename from src/ui/ApplicationComponent.css
rename to src/ui/ApplicationComponent.less
index b251f02b..7f637bbe 100644
--- a/src/ui/ApplicationComponent.css
+++ b/src/ui/ApplicationComponent.less
@@ -10,10 +10,29 @@
 
 .ApplicationComponent-navbar {
     display: flex;
+    border-bottom: solid 1px @border-color-split;
 }
 
 .ApplicationComponent-heading {
-    margin: 5px 10px 0 10px;
+    align-self: center;
+    font-size: 26px;
+    margin: 0 10px;
+}
+
+.ApplicationComponent-heading-menu {
+    flex: 1;
+    margin-bottom: -1px;
+}
+
+.ApplicationComponent-server-select {
+    display: flex;
+    align-items: center;
+    margin: 0 6px;
+
+    & > span {
+        display: inline-block;
+        margin-right: 10px;
+    }
 }
 
 .ApplicationComponent-beta {
diff --git a/src/ui/ApplicationComponent.tsx b/src/ui/ApplicationComponent.tsx
index b65a53a9..3eb5626b 100644
--- a/src/ui/ApplicationComponent.tsx
+++ b/src/ui/ApplicationComponent.tsx
@@ -1,12 +1,13 @@
-import { Menu } from 'antd';
+import { Menu, Select } from 'antd';
 import { ClickParam } from 'antd/lib/menu';
 import { observer } from 'mobx-react';
 import React from 'react';
-import './ApplicationComponent.css';
+import './ApplicationComponent.less';
 import { withErrorBoundary } from './ErrorBoundary';
 import { HuntOptimizerComponent } from './hunt-optimizer/HuntOptimizerComponent';
 import { QuestEditorComponent } from './quest-editor/QuestEditorComponent';
 import { DpsCalcComponent } from './dps-calc/DpsCalcComponent';
+import { Server } from '../domain';
 
 const QuestEditor = withErrorBoundary(QuestEditorComponent);
 const HuntOptimizer = withErrorBoundary(HuntOptimizerComponent);
@@ -38,6 +39,7 @@ export class ApplicationComponent extends React.Component {
                         Phantasmal World
                     </h1>
                     <Menu
+                        className="ApplicationComponent-heading-menu"
                         onClick={this.menuClicked}
                         selectedKeys={[this.state.tool]}
                         mode="horizontal"
@@ -52,6 +54,12 @@ export class ApplicationComponent extends React.Component {
                             DPS Calculator
                         </Menu.Item> */}
                     </Menu>
+                    <div className="ApplicationComponent-server-select">
+                        <span>Server:</span>
+                        <Select defaultValue={Server.Ephinea} style={{ width: 120 }}>
+                            <Select.Option value={Server.Ephinea}>{Server.Ephinea}</Select.Option>
+                        </Select>
+                    </div>
                 </div>
                 <div className="ApplicationComponent-main">
                     {toolComponent}