diff --git a/src/browser/components/MainPage.jsx b/src/browser/components/MainPage.jsx
index 84efa920..e6b7658b 100644
--- a/src/browser/components/MainPage.jsx
+++ b/src/browser/components/MainPage.jsx
@@ -142,6 +142,9 @@ const MainPage = React.createClass({
     }
   },
   handleSelect(key) {
+    if (key === 'addServerButton') {
+      return;
+    }
     const newKey = (this.props.teams.length + key) % this.props.teams.length;
     this.setState({
       key: newKey
diff --git a/src/browser/components/NewTeamModal.jsx b/src/browser/components/NewTeamModal.jsx
index 36a852ab..c0d92526 100644
--- a/src/browser/components/NewTeamModal.jsx
+++ b/src/browser/components/NewTeamModal.jsx
@@ -105,8 +105,8 @@ class NewTeamModal extends React.Component {
 
   render() {
     const noBottomSpaceing = {
-      'padding-bottom': 0,
-      'margin-bottom': 0
+      paddingBottom: 0,
+      marginBottom: 0
     };
 
     if (this.wasShown !== this.props.show && this.props.show) {
@@ -202,8 +202,8 @@ NewTeamModal.propTypes = {
   onClose: React.PropTypes.func,
   onSave: React.PropTypes.func,
   team: React.PropTypes.object,
-  editMode: React.PropTypes.boolean,
-  show: React.PropTypes.boolean
+  editMode: React.PropTypes.bool,
+  show: React.PropTypes.bool
 };
 
 module.exports = NewTeamModal;
diff --git a/src/browser/components/TabBar.jsx b/src/browser/components/TabBar.jsx
index c9464d61..90ae235e 100644
--- a/src/browser/components/TabBar.jsx
+++ b/src/browser/components/TabBar.jsx
@@ -90,21 +90,27 @@ class TabBar extends React.Component {
       width: '40px',
       color: '#999',
       fontWeight: 'bold',
-      margin: '6px 0 0',
+      margin: '0',
       borderRadius: '2px 2px 0 0',
       outline: 'none'
     };
 
     return (
-      <Button
-        id='tabBarAddNewTeam'
-        onClick={this.props.onAddServer}
-        style={tabButton}
-        bsStyle='tabButton'
-        title='Add new server'
+      <NavItem
+        className='buttonTab'
+        key='addServerButton'
+        eventKey='addServerButton'
       >
-        {'+'}
-      </Button>
+        <Button
+          id='tabBarAddNewTeam'
+          onClick={this.props.onAddServer}
+          style={tabButton}
+          className='btn-tabButton'
+          title='Add new server'
+        >
+          {'+'}
+        </Button>
+      </NavItem>
     );
   }
 }
diff --git a/src/browser/css/index.css b/src/browser/css/index.css
index 03e84537..d24a511e 100644
--- a/src/browser/css/index.css
+++ b/src/browser/css/index.css
@@ -42,6 +42,13 @@
   padding: 0 15px;
 }
 
+.nav-tabs>li.buttonTab>a {
+  border: none;
+  background: transparent;
+  margin-left: 1px; /*Has no border and would be placed above the last item's border due to it's margin-right: -1px */
+  padding: 0;
+  margin-bottom: 1px;
+}
 
 .has-error .control-label,
 .has-error .help-block {