diff --git a/README.md b/README.md
index cf8c497..298c450 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@
 
 **PokéNurse** is a desktop application for Windows and Mac that allows you to manage your pokémon from Pokémon Go without the need for a mobile device. You can now favorite, transfer, and evolve from the comfort of your own home!
 
-## Downloads for v1.6.0
+## Downloads for v1.6.1
 You may view all the releases [here](https://github.com/vinnymac/PokeNurse/releases)
-* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.0/PokeNurse.dmg)
-* [Windows 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.0/PokeNurse-ia32.exe)
-* [Windows 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.0/PokeNurse-x64.exe)
-* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.0/PokeNurse-ia32.deb)
-* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.0/PokeNurse-x64.deb)
+* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.1/PokeNurse.dmg)
+* [Windows 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.1/PokeNurse-ia32.exe)
+* [Windows 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.1/PokeNurse-x64.exe)
+* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.1/PokeNurse-ia32.deb)
+* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.6.1/PokeNurse-x64.deb)
 
 ## Examples
 ![Login Window](app/loginExample.png)
diff --git a/app/app.global.css b/app/app.global.css
index b60b3a8..119b671 100644
--- a/app/app.global.css
+++ b/app/app.global.css
@@ -8,7 +8,7 @@
   width: 14px;
   height: 14px;
   left: 15px;
-  top: 19px;
+  top: 12px;
 }
 
 /* Color/shape of burger icon bars */
@@ -94,74 +94,96 @@
 
 /**** Global style ****/
 
-.header {
-  background-image: url('./imgs/bg.jpg');
-  background-position: center top;
+.h2 {
+  margin: 0;
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+}
+
+.mra {
+  margin-right: auto;
+}
+
+.p5 {
+  padding: .5em;
+}
+
+.ib {
+  display: inline-block;
+}
+
+.global-nav {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 1;
+  background-color: #fff;
+  box-shadow: 0 1px 5px rgba(0, 0, 0, .5);
+}
+
+.nav-header {
   background-size: cover;
-  padding: 5vh 5vw;
-  margin-bottom: 15px;
-  color: #fff;
 }
 
-.drawer-icon {
-  padding: 10px 12px;
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1;
-  color: #555;
-  text-align: center;
-  background-color:rgba(0, 0, 0, 0.7);
-  border: rgba(0, 0, 0, 0.2);
-  border-radius: 4px;
+.flex-row {
+  color: #fff;
+  text-shadow: 1px 1px 1px #000;
 }
 
-.username {
-  padding-top: 17px;
-  margin-left: 40px;
-  color: white;
+#username-h {
+  margin-left: 2.5em;
 }
 
-.search input {
+.search {
+  margin-right: .5em;
   background-color:rgba(0, 0, 0, 0.5);
-  border: rgba(0, 0, 0, 0.2);
-  color: white;
 }
 
-.search span {
-  background-color:rgba(0, 0, 0, 0.8);
-  border: rgba(0, 0, 0, 0.2);
+.search label {
+  margin: 0;
+  padding-left: .3em;
+  padding-right: .3em;
+  color: rgba(255, 255, 255, .5);
 }
 
-.stats {
-  padding-top: 15px;
-  padding-right: 35px;
+.header {
+  background-image: url('./imgs/bg.jpg');
+  background-position: center top;
+  background-size: cover;
+  padding: 5vh 5vw;
+  margin-bottom: 15px;
+  color: #fff;
+}
+
+.search input {
   color: white;
-  float: right;
+  border: unset;
+  background: unset;
 }
 
 .status-container {
-  margin-top: 50px;
-  padding: 0px 15px;
-  min-height: 34px !important;
-  max-height: 34px !important;
   background-color:rgba(0, 0, 0, 0.7);
-  z-index: 1029 !important;
-  position: fixed;
-  width: 100%;
 }
 
 .status {
   font-size: 10px;
   color: white;
-  padding: 10px 0px 7px 0px;
 }
 
 .progressbar {
-  padding: 7px 0px;
+  width: 50%;
+}
+
+.progressbar .progress {
+  margin-bottom: 0;
 }
 
 .table-container {
-  margin-top: 65px;
+  margin-top: 120px;
 }
 
 #refresh-btn {
diff --git a/app/package.json b/app/package.json
index 91f28da..d332781 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "PokeNurse",
   "productName": "PokeNurse",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon",
   "main": "./main.js",
   "author": {
@@ -12,8 +12,8 @@
   "license": "MIT",
   "dependencies": {
     "async-file": "^2.0.2",
-    "node-pogo-protos": "1.5.0",
-    "pogobuf": "1.7.0",
+    "node-pogo-protos": "2.2.0",
+    "pogobuf": "1.8.0",
     "electron-localshortcut": "^1.0.0"
   }
 }
diff --git a/app/screens/Menu/index.js b/app/screens/Menu/index.js
index e2f1bb1..7c30775 100644
--- a/app/screens/Menu/index.js
+++ b/app/screens/Menu/index.js
@@ -28,7 +28,7 @@ const MainMenu = React.createClass({
     return (
       <Menu>
         <div>
-          <ul className="nav navbar-nav">
+          <ul className="list-unstyled">
             <li><a onClick={this.handleClickSettings}>Settings <i className="fa fa-cog" /></a></li>
             {
               // <li><a>Applied Items <i className="glyphicon glyphicon-chevron-down" /></a></li>
diff --git a/app/screens/Table/components/SpeciesPokemonCounter.js b/app/screens/Table/components/SpeciesPokemonCounter.js
index 673df99..1e5fa5c 100644
--- a/app/screens/Table/components/SpeciesPokemonCounter.js
+++ b/app/screens/Table/components/SpeciesPokemonCounter.js
@@ -16,11 +16,11 @@ const SpeciesPokemonCounter = React.createClass({
 
     return (
       <span>
-        <span>
+        <span className="ib">
           Species: {this.handleSpeciesRecount(monsters)}
         </span>
         {' | '}
-        <span>
+        <span className="ib">
           Pokemon: {this.handlePokemonCounter(monsters)}
         </span>
       </span>
diff --git a/app/screens/Table/components/Status.js b/app/screens/Table/components/Status.js
index ef619cd..6b66f0a 100644
--- a/app/screens/Table/components/Status.js
+++ b/app/screens/Table/components/Status.js
@@ -30,14 +30,12 @@ const Status = React.createClass({
     }
 
     return (
-      <div className="status-container">
-        <div className="row col-sm-12">
-          <div className="col-sm-6 status">
-            <span>{`Status: ${label}`}</span>
-          </div>
-          <div className="col-sm-6 progressbar">
-            <Progress progress={this.props.status} />
-          </div>
+      <div className="status-container flex p5 flex-row">
+        <div className="status mra">
+          <span>{`Status: ${label}`}</span>
+        </div>
+        <div className="progressbar">
+          <Progress progress={this.props.status} />
         </div>
       </div>
     )
diff --git a/app/screens/Table/index.js b/app/screens/Table/index.js
index 46e5da3..cea2091 100644
--- a/app/screens/Table/index.js
+++ b/app/screens/Table/index.js
@@ -113,60 +113,54 @@ const Table = React.createClass({
 
     return (
       <div>
-        <div className="container">
-          <nav
-            className="navbar navbar-inverse navbar-fixed-top"
-            style={backgroundHeaderStyles}
-          >
-            <div className="navbar-header">
+        <nav className="global-nav">
+          <div className="nav-header" style={backgroundHeaderStyles}>
+            <div>
               <MainMenu eggs={monsters.eggs} />
             </div>
-            <div className="navbar-header username">
+            <div className="flex p5 flex-row">
               {' '}
-              <strong>
-                <span id="username-h">
-                  {username}
-                </span>
+              <strong className="mra" id="username-h">
+                {username}
               </strong>
-            </div>
-            <div className="navbar-right">
-              <div className="stats">
-                <SpeciesCounter monsters={monsters} />
-                {' | '}
-                <span>
-                  <CheckCounter />
-                </span>
-              </div>
-            </div>
-            <div className="navbar-form navbar-right">
-              <div className="form-group input-group search">
-                <span className="input-group-addon">
-                  <span className="fa fa-search" aria-hidden="true" />
-                </span>
+
+              <div className="flex search">
+                <label htmlFor="search">
+                  <i className="fa fa-search" aria-hidden="true" />
+                </label>
                 <input
-                  type="text"
-                  className="form-control"
-                  placeholder="Search"
+                  type="search"
+                  id="search"
+                  placeholder="Search…"
                   ref={(c) => { this.search = c }}
                   onChange={this.onFilterChange}
                 />
               </div>
+
+              <div>
+                <SpeciesCounter monsters={monsters} />
+                {' | '}
+                <span className="ib">
+                  <CheckCounter />
+                </span>
+              </div>
             </div>
-          </nav>
-        </div>
-        <Status />
+          </div>
+
+          <Status />
+
+          <header className="flex p5">
+            <h2 className="h2 mra">
+              <span>Pokémon</span>
+              <span
+                className="fa fa-refresh"
+                id="refresh-btn"
+                role="button"
+                onClick={this.handleRefresh}
+              />
+            </h2>
 
-        <div className="container table-container">
-          <h1>
-            <span>Pokémon</span>
-            <span
-              className="fa fa-refresh"
-              id="refresh-btn"
-              role="button"
-              onClick={this.handleRefresh}
-            />
-
-            <span className="pull-right">
+            <span>
               <input
                 type="button"
                 className="btn btn-warning"
@@ -183,8 +177,10 @@ const Table = React.createClass({
                 onClick={this.handleEvolve}
               />
             </span>
-          </h1>
+          </header>
+        </nav>
 
+        <div className="container table-container">
           <SpeciesTable
             filterBy={filterBy}
             sortBy={sortBy}
diff --git a/package.json b/package.json
index 0987f4e..46bf13c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "PokeNurse",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon",
   "main": "main.js",
   "scripts": {