diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
index 5ce1a6bfce..8033ef45a1 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
@@ -215,20 +215,22 @@ fieldset
     top: 20px;
 }
 
-#navigation, #collector_content
-{
-    float:left
-}
-
-#navigation
-{
-    width:250px;
+#collector_wrapper {
+    float: left;
+    width: 100%;
 }
 
 #collector_content
 {
-    width:620px;
-    padding:40px 0 40px 50px;
+    margin-left: 250px;
+    padding: 40px 50px;
+}
+
+#navigation
+{
+    float: left;
+    width: 250px;
+    margin-left: -100%;
 }
 
 #collector_content table td
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
index 537c7fed9e..99c9d22f49 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -21,9 +21,12 @@
         <div id="main">
     
             <div class="clear_fix">
-
+                <div id="collector_wrapper">
+                    <div id="collector_content">
+                        {% block panel '' %}
+                    </div>
+                </div>
                 <div id="navigation">
-            
                     {% if templates is defined %}
                         <ul id="menu_profiler">
                             {% for name, template in templates %}
@@ -36,15 +39,8 @@
                             {% endfor %}
                         </ul>
                     {% endif %}
-
                     {% render 'WebProfilerBundle:Profiler:searchBar' %}
-
                     {% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': token } only %}
-
-                </div>
-
-                <div id="collector_content">
-                    {% block panel '' %}
                 </div>
             </div>
         </div>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.html.twig
index adefe85dd8..ad3f1b4c8b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/notfound.html.twig
@@ -12,18 +12,20 @@
 
         <div id="main">
             <div class="clear_fix">
+                <div id="collector_wrapper">
+                    <div id="collector_content">
+                        {% block panel%}
+                            <h2>Token not found</h2>
+                            <p>
+                                <em>No request matching the token "{{ token }}".</em>
+                            </p>
+                        {% endblock %}
+                    </div>
+                </div>
                 <div id="navigation">
                     {% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': token } %}
                     {% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': token } only %}
                 </div>
-                <div id="collector_content">
-                    {% block panel%}
-                        <h2>Token not found</h2>
-                        <p>
-                            <em>No request matching the token "{{ token }}".</em>
-                        </p>
-                    {% endblock %}
-                </div>
             </div>
         </div>
     </div>