diff --git a/public/components/App.jsx b/public/components/App.jsx
index 63fdf30..a603775 100644
--- a/public/components/App.jsx
+++ b/public/components/App.jsx
@@ -31,11 +31,25 @@ import Footer from './footer/Footer';
 import Routes, { RouteWrapper } from './page/Routes';
 import Favicon from './Favicon';
 
+//Routes Definitions
+const AppRoutes = (props) => {
+  return (
+    <React.Fragment>
+      <Routes onEntering={ props.onEntering }>
+        <RouteWrapper exact path="/" page={ () => import('@pages/home/HomePage') } />
+        <RouteWrapper exact path="/contact" page={ () => import('@pages/contact/ContactPage') } />
+
+        <RouteWrapper exact path="/legal/privacy" page={ () => import('@pages/legal/privacy/PrivacyPolicyPage') } />
+      </Routes>
+    </React.Fragment>
+  );
+};
+
+
+//Main App Wrapper
 class App extends React.Component {
   constructor(props) {
     super(props);
-
-    this.onEnteringBound = this.onEntering.bind(this);
   }
 
   onEntering() {
@@ -47,19 +61,11 @@ class App extends React.Component {
   }
 
   render() {
-    let { className, menuOpen, modal } = this.props;
+    let { className } = this.props;
 
     //Generate base clazzes
     let clazz = "c-app";
 
-    //Menu Open?
-    if(menuOpen) clazz += " is-menu-open ";
-
-    //Fetch the modal from the store
-    let modalObject;
-    if(modal.open) clazz += " is-modal-open";
-    if(modal.modal) modalObject = modal.modal;
-
     //Append any other clazzes there may be.
     if(className) clazz += " " + className;
 
@@ -69,30 +75,14 @@ class App extends React.Component {
 
     return (
       <RouterType>
-        <div className={clazz} ref="app">
+        <div className={ clazz } ref="app">
           <Favicon />
           <Header />
-
-          { modalObject }
-
-          {/* Routes */}
-          <Routes onEntering={ this.onEnteringBound }>
-            <RouteWrapper exact path="/" page={ () => import('@pages/home/HomePage') } />
-            <RouteWrapper exact path="/contact" page={ () => import('@pages/contact/ContactPage') } />
-
-            <RouteWrapper exact path="/legal/privacy" page={ () => import('@pages/legal/privacy/PrivacyPolicyPage') } />
-          </Routes>
+          <AppRoutes onEntering={ () => this.onEntering() } />
         </div>
       </RouterType>
     );
   }
 }
 
-const mapStateToProps = function(state) {
-  return {
-    menuOpen: state.menu.open,
-    modal: state.modal
-  }
-}
-
-export default connect(mapStateToProps)(App);
+export default App;
diff --git a/public/components/page/Routes.jsx b/public/components/page/Routes.jsx
index 1673328..1b7ebc0 100644
--- a/public/components/page/Routes.jsx
+++ b/public/components/page/Routes.jsx
@@ -65,7 +65,7 @@ class Routes extends React.Component {
 
     return (
       <Route>
-        <TransitionGroup className="o-page-transition__container">
+        {/*<TransitionGroup className="o-page-transition__container">
           <CSSTransition
             key={ location.pathname }
             timeout={1000}
@@ -73,12 +73,12 @@ class Routes extends React.Component {
             mountOnEnter={ true }
             unmountOnExit={ true }
             onEntering={ this.props.onEntering }
-          >
+          >*/}
             <Switch location={ location }>
               { children }
             </Switch>
-          </CSSTransition>
-        </TransitionGroup>
+          {/*</CSSTransition>
+        </TransitionGroup>*/}
       </Route>
     );
   }
diff --git a/public/styles/components/_app.scss b/public/styles/components/_app.scss
index 851f097..7346580 100644
--- a/public/styles/components/_app.scss
+++ b/public/styles/components/_app.scss
@@ -8,14 +8,4 @@
  *  Version:
  *    1.0.0 - 2018/05/03
  */
-.c-app {
-  position: relative;
-  height: 100vh;
-  width: 100%;
-  overflow-y: scroll;
-  overflow-x: hidden;
-
-  &.is-modal-open {
-    overflow: hidden;
-  }
-}
+.c-app {}
diff --git a/public/styles/components/_main.scss b/public/styles/components/_main.scss
index 42d2567..da5ba17 100644
--- a/public/styles/components/_main.scss
+++ b/public/styles/components/_main.scss
@@ -5,10 +5,4 @@
  *  Version:
  *    1.0.0 - 2018/05/07
  */
-.c-main {
-  min-height: 100vh;
-  width: 100%;
-
-  @extend %t-flexbox;
-  @include t-flex-direction(column);
-}
+.c-main {}
diff --git a/public/styles/elements/_body.scss b/public/styles/elements/_body.scss
index 5d707a9..640555a 100644
--- a/public/styles/elements/_body.scss
+++ b/public/styles/elements/_body.scss
@@ -11,10 +11,7 @@
 body {
   margin: 0;
   padding: 0;
-  width: 100vw;
-  height: 100vh;
 
   font-family: $s-font--stack-default;
   font-size: $s-font--size--base;
-  overflow: hidden;//Really makes the transitions feel smoother
 }