diff --git a/src/routes.js b/src/routes.js
index <HASH>..<HASH> 100755
--- a/src/routes.js
+++ b/src/routes.js
@@ -31,17 +31,27 @@ export default (store) => {
     }
   };
 
+  /**
+   * Please keep routes in alphabetical order
+   */
   return (
     <Route path="/" component={App}>
+      { /* Home (main) route */ }
       <IndexRoute component={Home}/>
-      <Route path="widgets" component={Widgets}/>
-      <Route path="about" component={About}/>
-      <Route path="login" component={Login}/>
+
+      { /* Routes requiring login */ }
       <Route onEnter={requireLogin}>
         <Route path="chat" component={Chat}/>
         <Route path="loginSuccess" component={LoginSuccess}/>
       </Route>
+
+      { /* Routes */ }
+      <Route path="about" component={About}/>
+      <Route path="login" component={Login}/>
       <Route path="survey" component={Survey}/>
+      <Route path="widgets" component={Widgets}/>
+
+      { /* Catch all route */ }
       <Route path="*" component={NotFound} status={404} />
     </Route>
   );
Use alphabetical route order for easier merging