diff --git a/paste/static/css/main.css b/paste/static/css/main.css
index c937c70..395fd24 100644
--- a/paste/static/css/main.css
+++ b/paste/static/css/main.css
@@ -1,10 +1,6 @@
-body {
-padding-top: 60px;
-}
-
 pre {
 font-family: "Bitstream Vera Sans Mono", "monospace";
-color: #000;
+zcolor: #000;
 font-size: 14px;
 }
 
@@ -31,7 +27,7 @@ list-style-type: none;
 }
 
 textarea#id_content {
-width: 1155px;
+width: 100%;
 height: 320px;
 }
 
@@ -47,7 +43,7 @@ width: 505px;
 }
 
 .container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
-width: 1170px;
+    width: 100%;
 }
 
 .input-prepend .add-on {
@@ -68,25 +64,31 @@ padding: 5px;
 [class*="span"] {
 float: left;
 min-height: 1px;
-margin-left: 25px;
+padding-left: 25px;
+margin-left: 0px;
+box-sizing: border-box;
 }
 
 .span3 {
-width: 270px;
+width: 25%;
 }
 
 .span6 {
-width: 570px;
+width: 50%;
 }
 
 .span12 {
-width: 1165px;
+width: 100%;
 }
 
 .navbar a {
 color: #777;
 }
 
+.navbar {
+    margin-bottom: 0px
+}
+
 #unlock, #expired {
 margin-top: 30px;
 }
diff --git a/paste/templates/base.html b/paste/templates/base.html
index c7641d2..842ecfc 100644
--- a/paste/templates/base.html
+++ b/paste/templates/base.html
@@ -13,7 +13,7 @@
   {% endcompress %}
 </head>
 <body>
-<div class="navbar navbar-fixed-top">
+<nav class="navbar navbar-default">
   <div class="navbar-inner">
     <div class="container-fluid">
       <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -27,13 +27,15 @@
         {% trans 'powered by' %} <a href="https://github.com/setsuna-/pasteque"><b>{{ APP_NAME }}</b></a>
         </p>
         <ul class="nav">
+          {% block nav %}
           <li class="{% if menu == 'index'%}active{% endif %}"><a href="{% url 'index' %}">{% trans 'Paste something' %}</a></li>
           <li class="{% if menu == 'history'%}active{% endif %}"><a href="{% url 'history' %}">{% trans 'Lasts pastes' %}</a></li>
+          {% endblock %}
         </ul>
       </div><!--/.nav-collapse -->
     </div>
   </div>
-</div>
+</nav>
 <div class="container">
 {% block content %}{% endblock %}
 </div>
diff --git a/paste/templates/paste/index.html b/paste/templates/paste/index.html
index 1431fe2..a45643d 100644
--- a/paste/templates/paste/index.html
+++ b/paste/templates/paste/index.html
@@ -6,9 +6,19 @@
     {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
     <form method="post" action="{% url 'index' %}">
     {{ form.non_field_errors }}
+    <div class="row">
+       <div class="span12">
+{% if PASTE.show_char_left %}
+            <span id="charsleft"><b id="charsleft_counter">...</b>&nbsp;{% trans 'characters left' %}</span>
+{% endif %}
+            <label for="id_content">{% trans 'Content' %}</label>
+            {{ form.content }}
+            {{ form.content.errors }}
+       </div>
+    </div>
     <div class="row">
       {% if PASTE.has_title %}
-        <div class="span6">
+        <div class="span3">
             <label for="id_title">{% trans 'Title' %}</label>
             <div class="input-prepend">
                 <span class="add-on"><i class="icon-tag"></i></span>
@@ -30,18 +40,6 @@
             {{ form.private }}
             {{ form.private.errors }}
        </div>
-    </div>
-    <div class="row">
-       <div class="span12">
-{% if PASTE.show_char_left %}
-            <span id="charsleft"><b id="charsleft_counter">...</b>&nbsp;{% trans 'characters left' %}</span>
-{% endif %}
-            <label for="id_content">{% trans 'Content' %}</label>
-            {{ form.content }}
-            {{ form.content.errors }}
-       </div>
-    </div>
-    <div class="row">
        <div class="span3">
             <label for="id_lifetime">{% trans 'Expire time' %}</label>
             <div class="input-prepend">
@@ -60,7 +58,7 @@
             {{ form.lifecount.errors }}
        </div>
      {% endif %}
-       <div class="span6">
+       <div class="span3">
            <label for="id_password">{% trans 'Password protected' %}</label>
            <div class="input-prepend">
                 <span class="add-on"><i class="icon-lock"></i></span>
diff --git a/paste/templates/paste/paste-meta.html b/paste/templates/paste/paste-meta.html
index 668cbd5..299d8f4 100644
--- a/paste/templates/paste/paste-meta.html
+++ b/paste/templates/paste/paste-meta.html
@@ -33,12 +33,6 @@
     {% endif %}
   </div>
   <div class="span3">
-    <ul class="nav nav-pills pull-right">
-    {% for renderer in renderers %}
-        <li class="{% if renderer == current_renderer %}active{% endif %}">
-            <a href="{% url 'paste' slug=slug renderer=renderer %}">{{ renderer|capfirst }}</a>
-        </li>
-    {% endfor %}
-    </ul>
+    <a href="{% url 'paste' slug=slug renderer='raw' %}">View raw</a>
   </div>
 </div>
diff --git a/paste/templates/paste/show-pygments.html b/paste/templates/paste/show-pygments.html
index 0575a7a..686496d 100644
--- a/paste/templates/paste/show-pygments.html
+++ b/paste/templates/paste/show-pygments.html
@@ -1,7 +1,10 @@
 {% extends "base.html" %}
 
 {% block title %} {{ title }}{% endblock %}
-{% block content %}
-{% include "paste/paste-meta.html" %}
-{{ highlighted|safe }}
+{% block nav %}
+<li><a href="{% url 'paste' slug=slug renderer='raw' %}">View raw</a></li>
+{% endblock %}
+{% block content %}
+{{ highlighted|safe }}
+{% include "paste/paste-meta.html" %}
 {% endblock %}
