3 files changed, 11 insertions, 11 deletions

diff --git a/views/header.jade b/views/header.jade
index d8a39898e..6b84333f9 100644
--- a/views/header.jade
+++ b/views/header.jade
@@ -1 +1,9 @@
-       
\ No newline at end of file
+.navbar.navbar-default
+  .container-fluid
+    .navbar-header
+      a.navbar-brand(href='/') PeerTube
+    .navbar-header
+      form.navbar-form(role='search')
+        .form-group.search-group
+          input.form-control#search-video(type='text' name='search_video' placeholder='Search a video...')
+          a.search-btn.btn.btn-link.glyphicon.glyphicon-search(type='submit')
\ No newline at end of file
diff --git a/views/index.jade b/views/index.jade
index 21cedb324..a49758fc0 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -1,16 +1,7 @@
 extends layout
 
 block content
-
   div(class='container')
-
-    header(class='row')
-      div(class='col-md-2')
-        h4 PeerTube
-
-      div(class='col-md-8')
-        input(type='text' id='search_video' name='search_video' class='form-control' placeholder='Search a video...')
-
     div(class='row')
       include panel
 
diff --git a/views/layout.jade b/views/layout.jade
index 236a36c3c..43c28cd4f 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -2,7 +2,7 @@ doctype html
 html
   head
     link(rel='icon' type='image/png' href='/images/favicon.png')
-
+    meta(name='viewport' content='width=device-width, initial-scale=1')
     title= title
 
     // build:css /stylesheets/global.min.css
@@ -11,4 +11,5 @@ html
     // endbuild
 
   body
+    include header
     block content