diff --git a/package.json b/package.json
index b2077294..5e822b56 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "react-document-title": "^1.0.2",
     "react-google-recaptcha": "^0.4.0",
     "react-motion": "^0.3.0",
-    "react-router": "^1.0.0-rc1",
+    "react-router": "^0.13.x",
     "reflux": "^0.2.9",
     "run-sequence": "^1.1.1",
     "superagent": "^1.2.0",
diff --git a/src/app/App.js b/src/app/App.js
index ea78ce40..c4a1b1b5 100644
--- a/src/app/App.js
+++ b/src/app/App.js
@@ -13,7 +13,8 @@ var App = React.createClass({
     render() {
         return (
           <div>
-            {this.props.children}
+            <RouteHandler params={this.props.params}
+                          query={this.props.query} />
           </div>
         );
     },
diff --git a/src/app/Routes.js b/src/app/Routes.js
index 8854c728..aa3898c2 100644
--- a/src/app/Routes.js
+++ b/src/app/Routes.js
@@ -1,6 +1,5 @@
 import React                                from 'react/addons';
-import {Router, Route, IndexRoute}          from 'react-router';
-import CreateBrowserHistory                 from 'react-router/node_modules/history/lib/createBrowserHistory';
+import {Route, NotFoundRoute, DefaultRoute} from 'react-router';
 
 import App                                  from 'app/App';
 import DemoPage                             from 'app/demo/components-demo-page';
@@ -11,16 +10,14 @@ import MainSignUpPage                       from 'app/main/main-signup/main-sign
 
 
 export default (
-    <Router history={CreateBrowserHistory()}>
-      <Route component={App} path='/'>
+  <Route handler={App} path='/'>
 
-        <Route path='/app' component={MainLayout}>
-            <IndexRoute component={MainHomePage} />
-            <Route path='signup' component={MainSignUpPage}/>
-        </Route>
+    <Route name='main' path='/app' handler={MainLayout}>
+		<DefaultRoute name='home' handler={MainHomePage} />
+        <Route name='signup' path='/app/signup' handler={MainSignUpPage}/>
+	</Route>
 
-        <Route name='Demo' path='demo' component={DemoPage} />
+    <Route name='Demo' path='/demo' handler={DemoPage} />
 
-      </Route>
-    </Router>
+  </Route>
 );
\ No newline at end of file
diff --git a/src/app/index.js b/src/app/index.js
index 959a6341..647b0627 100644
--- a/src/app/index.js
+++ b/src/app/index.js
@@ -8,4 +8,6 @@ if ( process.env.NODE_ENV !== 'production' ) {
   window.React = React;
 }
 
-React.render(routes, document.getElementById('app'));
\ No newline at end of file
+Router.run(routes, Router.HistoryLocation, (Handler, state) => {
+  React.render(<Handler params={state.params} query={state.query} />, document.getElementById('app'));
+});
\ No newline at end of file
diff --git a/src/app/main/main-layout.js b/src/app/main/main-layout.js
index 146fe774..61a77603 100644
--- a/src/app/main/main-layout.js
+++ b/src/app/main/main-layout.js
@@ -1,4 +1,5 @@
 import React              from 'react/addons';
+import {RouteHandler}     from 'react-router';
 
 import MainHeader         from 'app/main/main-layout-header';
 import MainFooter         from 'app/main/main-layout-footer';
@@ -12,9 +13,9 @@ var MainLayout = React.createClass({
                 <MainHeader />
 
                 <div className="main-layout--content">
-                    {this.props.children}
+                    <RouteHandler params={this.props.params}
+                        query={this.props.query} />
                 </div>
-
                 <MainFooter />
 
             </div>
diff --git a/src/core-components/button.js b/src/core-components/button.js
index bce6ab27..67204801 100644
--- a/src/core-components/button.js
+++ b/src/core-components/button.js
@@ -1,12 +1,12 @@
 import React              from 'react/addons';
 import classNames         from 'classnames';
-import {History}          from 'react-router';
+import {Navigation}       from 'react-router';
 
 import callback           from 'lib/callback';
 
 var Button = React.createClass({
 
-    mixins: [History],
+    mixins: [Navigation],
 
     propTypes: {
         children: React.PropTypes.node,
@@ -49,7 +49,7 @@ var Button = React.createClass({
 
     handleClick() {
         if (this.props.route) {
-            this.history.pushState(null, this.props.route.to, this.props.route.query);
+            this.transitionTo(this.props.route.to, this.props.route.param, this.props.route.query);
         }
     }
 });