diff --git a/src/App.js b/src/App.js
index 92ba364..be7238c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -8,11 +8,10 @@ class  App extends Component {
   render(){
     return (
       <div className="App">
-        <PricingPlan />
         <BrowserRouter>
           <Switch>
-            <Route exact path="/" Component={HomePage} />
-            <Route path="/User" Component={LogInContainer} />
+            <Route exact path="/home" component={HomePage} />
+            <Route path="/user" component={LogInContainer} />
           </Switch>
         </BrowserRouter>
 
diff --git a/src/components/LogInContainer.js b/src/components/LogInContainer.js
index 04f361d..af21125 100644
--- a/src/components/LogInContainer.js
+++ b/src/components/LogInContainer.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { HashRouter as BrowserRouter, Route, Link, NavLink } from 'react-router-dom';
+import { HashRouter as BrowserRouter, Route, Link, NavLink, Switch } from 'react-router-dom';
 import SignUpForm from './SignUp';
 import SignInForm from './SignIn';
 
@@ -8,14 +8,22 @@ import '../login_reg.css';
 class LogInContainer extends Component {
   render() {
     return (
-      <BrowserRouter>
+      <BrowserRouter basename="/user/">
         <div className="Apper">
           <div className="Apper__Aside"></div>
           <div className="Apper__Form">
-              <Route path="/sign-up" component={SignUpForm}>
-              </Route>
-              <Route path="/sign-in" component={SignInForm}>
-              </Route>
+              <div className="PageSwitcher">
+                <NavLink to="/sign-in" activeClassName="PageSwitcher__Item--Active" className="PageSwitcher__Item">Sign In</NavLink>
+                <NavLink exact to="/sign-up" activeClassName="PageSwitcher__Item--Active" className="PageSwitcher__Item">Sign Up</NavLink>
+              </div>
+              <div className="FormTitle">
+                  <NavLink to="/sign-in" activeClassName="FormTitle__Link--Active" className="FormTitle__Link">Sign In</NavLink> or <NavLink exact to="/sign-up" activeClassName="FormTitle__Link--Active" className="FormTitle__Link">Sign Up</NavLink>
+              </div>
+
+            <Switch>
+              <Route path="/sign-up" component={SignUpForm} />
+              <Route path="/sign-in" component={SignInForm} />
+            </Switch>
           </div>
 
         </div>