diff --git a/app.js b/app.js
index a0e5286..32bad14 100644
--- a/app.js
+++ b/app.js
@@ -41,4 +41,6 @@ uploading(app);
 
 //==============================================================================
 
-app.listen(process.env.PORT || 3000);
+app.listen(process.env.PORT || 3000 ,function(){
+	console.log("App Run on port 3000");
+});
diff --git a/controllers/routes.js b/controllers/routes.js
index feea72b..ecfbc85 100644
--- a/controllers/routes.js
+++ b/controllers/routes.js
@@ -2,9 +2,9 @@ var User = require('../models/users');
 
 module.exports = function(app, passport){
 
-app.get('/',function(req,res){
+app.get('/',isLoggedIn,function(req,res){
 
-  res.render('home');
+  res.render('home',{user:req.user});
 
 });
 
@@ -16,7 +16,10 @@ app.get('/upload', function (req,res) {
   res.render('upload');
 
 })
+app.get('/signup', function (req,res) {
+  res.render('signup');
 
+})
 
 app.post('/signup',passport.authenticate('local-signup',{
   successRedirect: '/',
@@ -28,13 +31,29 @@ app.get('/login', function(req, res){
   res.render('login', { message: req.flash('loginMessage') });
 });
 app.post('/login', passport.authenticate('local-login', {
-  successRedirect: '/profile',
+  successRedirect: '/',
   failureRedirect: '/login',
   failureFlash: true
 }));
 
+app.get('/logout', function(req, res){
+  req.logout();
+  res.redirect('/login');
+});
+
 
 
 
 
 }//End of main function
+
+function isLoggedIn(req,res,next) {
+  if (req.isAuthenticated()) {
+    return next();
+
+  } else {
+    res.redirect('/login');
+
+  }
+
+}
diff --git a/models/users.js b/models/users.js
index 79aa0fd..2cd95e0 100644
--- a/models/users.js
+++ b/models/users.js
@@ -3,6 +3,7 @@ var bcrypt = require('bcrypt');
 
 var userSchema = mongoose.Schema({
 	local: {
+		email:String ,
 		username: String,
 		password: String
 	}
diff --git a/views/home.handlebars b/views/home.handlebars
index 0b07dd3..26c0327 100644
--- a/views/home.handlebars
+++ b/views/home.handlebars
@@ -7,6 +7,10 @@
 <div class="container ">
   <img src="/img/cat1" alt="Cute cat">
 
+</div>
+<div class="container ">
+   
+
 </div>
 
 <div class="container ">
@@ -21,7 +25,3 @@
       </div>
     {{/if}}
 </div>
-
-
-
-{{>signup}}
diff --git a/views/partials/navbar.handlebars b/views/partials/navbar.handlebars
index 416dc06..eef9645 100644
--- a/views/partials/navbar.handlebars
+++ b/views/partials/navbar.handlebars
@@ -21,8 +21,16 @@
                     <a class="page-scroll navword" href="#portfolio">Portfolio</a>
                 </li>
                 <li>
-                  <button type="button" class="btn btn-default navbar-btn"  data-toggle="modal"
-                     data-target="#basicModal">sign up</button>
+                  <a href="/signup">sign up</a>
+                </li>
+                <li>
+                  <a href="/login">login</a>
+                </li>
+                <li>
+                  <a href="/logout">logout</a>
+                </li>
+                <li>
+                  <a class="active">{{user.local.username}}</a>
                 </li>
             </ul>
 
diff --git a/views/partials/signup.handlebars b/views/signup.handlebars
similarity index 74%
rename from views/partials/signup.handlebars
rename to views/signup.handlebars
index 367d927..c1bf30e 100644
--- a/views/partials/signup.handlebars
+++ b/views/signup.handlebars
@@ -1,10 +1,3 @@
-<!-- Modal -->
-<div class="modal fade" id="basicModal" tabindex="-1" role="dialog" aria-labelledby="basicModal" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-
-
                         <div class="entry">
                             {{#if message }}
                               <div class="alert alert-danger">
@@ -12,8 +5,9 @@
                               </div>
                             {{/if}}
                         </div>
-            </div>
-            <div class="modal-body">
+        
+            <div class="container">
+
                 <form action="/signup" method="post">
 
                     <div class="form-group">
@@ -50,9 +44,3 @@
                 </form>
 
             </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>