diff --git a/imports/ui/components/app-navigation.js b/imports/ui/components/app-navigation.js
index 701cf6b..4b59706 100644
--- a/imports/ui/components/app-navigation.js
+++ b/imports/ui/components/app-navigation.js
@@ -5,8 +5,8 @@ import { PublicNavigation } from './public-navigation';
 import { AuthenticatedNavigation } from './authenticated-navigation';
 
 export class AppNavigation extends React.Component {
-  renderNavigation( hasUser, activeRoute ) {
-    return hasUser ? <AuthenticatedNavigation activeRoute={ activeRoute } /> : <PublicNavigation activeRoute={ activeRoute } />;
+  renderNavigation( hasUser ) {
+    return hasUser ? <AuthenticatedNavigation /> : <PublicNavigation />;
   }
 
   render() {
@@ -18,7 +18,7 @@ export class AppNavigation extends React.Component {
         <Navbar.Toggle />
       </Navbar.Header>
       <Navbar.Collapse>
-        { this.renderNavigation( this.props.hasUser, this.props.activeRoute ) }
+        { this.renderNavigation( this.props.hasUser ) }
       </Navbar.Collapse>
     </Navbar>;
   }
diff --git a/imports/ui/components/authenticated-navigation.js b/imports/ui/components/authenticated-navigation.js
index dfa778c..96db445 100644
--- a/imports/ui/components/authenticated-navigation.js
+++ b/imports/ui/components/authenticated-navigation.js
@@ -1,5 +1,6 @@
 import React from 'react';
-import { browserHistory, IndexLink, Link } from 'react-router';
+import { browserHistory } from 'react-router';
+import { IndexLinkContainer, LinkContainer } from 'react-router-bootstrap';
 import { Nav, NavItem, NavDropdown, MenuItem } from 'react-bootstrap';
 
 const handleLogout = () => {
@@ -17,8 +18,12 @@ const userName = () => {
 export const AuthenticatedNavigation = () => (
   <div>
     <Nav>
-      <li><IndexLink to="/" activeClassName="active">Index</IndexLink></li>
-      <li><Link to="/dashboard" activeClassName="active">Dashboard</Link></li>
+      <IndexLinkContainer to="/">
+        <NavItem eventKey={ 1 } href="/">Index</NavItem>
+      </IndexLinkContainer>
+      <LinkContainer to="dashboard">
+        <NavItem eventKey={ 2 } href="/dashboard">Dashboard</NavItem>
+      </LinkContainer>
     </Nav>
     <Nav pullRight>
       <NavDropdown eventKey={ 3 } title={ userName() } id="basic-nav-dropdown">
diff --git a/imports/ui/components/public-navigation.js b/imports/ui/components/public-navigation.js
index 0304c69..d2147bf 100644
--- a/imports/ui/components/public-navigation.js
+++ b/imports/ui/components/public-navigation.js
@@ -1,10 +1,14 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { LinkContainer } from 'react-router-bootstrap';
 import { Nav, NavItem } from 'react-bootstrap';
 
 export const PublicNavigation = () => (
   <Nav pullRight>
-    <li role="presentation"><Link to="/signup">Sign Up</Link></li>
-    <li role="presentation"><Link to="/login">Log In</Link></li>
+    <LinkContainer to="signup">
+      <NavItem eventKey={ 1 } href="/signup">Sign Up</NavItem>
+    </LinkContainer>
+    <LinkContainer to="login">
+      <NavItem eventKey={ 2 } href="/login">Log In</NavItem>
+    </LinkContainer>
   </Nav>
 )
diff --git a/imports/ui/containers/app-navigation.js b/imports/ui/containers/app-navigation.js
index 203fbf7..834840a 100644
--- a/imports/ui/containers/app-navigation.js
+++ b/imports/ui/containers/app-navigation.js
@@ -1,6 +1,8 @@
-import { createContainer } from 'meteor/react-meteor-data';
+import { composeWithTracker } from 'react-komposer';
 import { AppNavigation } from '../components/app-navigation';
 
-export default createContainer( ( { params } ) => {
-  return { hasUser: Meteor.user() };
-}, AppNavigation );
+const composer = ( props, onData ) => {
+  onData( null, { hasUser: Meteor.user() } );
+};
+
+export default composeWithTracker( composer, {}, {}, { pure: false } )( AppNavigation );
diff --git a/package.json b/package.json
index 7b57d18..0fbcadb 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "react-addons-pure-render-mixin": "^0.14.8",
     "react-bootstrap": "^0.28.4",
     "react-dom": "^0.14.7",
-    "react-mounter": "^1.1.0",
+    "react-komposer": "^1.7.1",
     "react-router": "^2.0.1",
     "react-router-bootstrap": "^0.20.1"
   }