diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index d380e319f9..d6235025d0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -36,6 +36,7 @@ class ProfilerController extends ContainerAware
         $profiler->disable();
 
         $panel = $this->container->get('request')->query->get('panel', 'request');
+        $page = $this->container->get('request')->query->get('page', 'home');
 
         if (!$profile = $profiler->loadProfile($token)) {
             return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:info.html.twig', array('about' => 'no_token', 'token' => $token));
@@ -50,6 +51,7 @@ class ProfilerController extends ContainerAware
             'profile'   => $profile,
             'collector' => $profile->getCollector($panel),
             'panel'     => $panel,
+            'page'      => $page,
             'templates' => $this->getTemplates($profiler),
         ));
     }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
index 3b711c49b4..5902f34aa4 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css
@@ -450,3 +450,9 @@ td.main, td.menu {
 #collector_content .routing tr.almost td {
     background-color: #fa0;
 }
+
+.loading {
+    background: transparent url(../images/profiler/spinner.gif) scroll no-repeat 50% 50%;
+    height: 30px;
+    display: none;
+}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif
new file mode 100644
index 0000000000..99eb012a9c
Binary files /dev/null and b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif differ
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/ajax_layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/ajax_layout.html.twig
new file mode 100644
index 0000000000..407650745e
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/ajax_layout.html.twig
@@ -0,0 +1 @@
+{% block panel '' %}
\ No newline at end of file
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
new file mode 100644
index 0000000000..24f05bae54
--- /dev/null
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -0,0 +1,72 @@
+<script type="text/javascript">/*<![CDATA[*/
+    Sfjs = (function() {
+        "use strict";
+
+        var noop = function() {},
+            request = function(url, onSuccess, onError, payload, options) {
+                var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+                options = options || {};
+                xhr.open(options.method || 'GET', url, true);
+                xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+                xhr.onreadystatechange = function(state) {
+                    if (4 === xhr.readyState && 200 === xhr.status) {
+                        (onSuccess || noop)(xhr);
+                    } else if (4 === xhr.readyState && xhr.status != 200) {
+                        (onError || noop)(xhr);
+                    }
+                };
+                xhr.send(payload || '');
+            },
+            hasClass = function(el, klass) {
+                return el.className.match(new RegExp('\\b' + klass + '\\b'));
+            },
+            removeClass = function(el, klass) {
+                el.className = el.className.replace(new RegExp('\\b' + klass + '\\b'), ' ');
+            },
+            addClass = function(el, klass) {
+                if (!hasClass(el, klass)) { el.className += " " + klass; }
+            };
+
+        return {
+            hasClass: hasClass,
+            removeClass: removeClass,
+            addClass: addClass,
+            request: request,
+            load: function(selector, url, onSuccess, onError, options) {
+                var el = document.querySelector(selector);
+                if (el && el.getAttribute('data-sfurl') !== url) {
+                    request(
+                        url,
+                        function(xhr) {
+                            el.innerHTML = xhr.responseText;
+                            el.setAttribute('data-sfurl', url);
+                            removeClass(el, 'loading');
+                            (onSuccess || noop)(xhr, el);
+                        },
+                        function(xhr) { (onError || noop)(xhr, el); },
+                        options
+                    );
+                }
+                return this;
+            },
+            toggle: function(selector, elOn, elOff) {
+                var i,
+                    style,
+                    tmp = elOn.style.display,
+                    els = document.querySelectorAll(selector);
+
+                elOn.style.display = elOff.style.display;
+                elOff.style.display = tmp;
+
+                if (els.length) {
+                    style = 'none' === tmp ? 'none' : 'block';
+                    for (i = els.length - 1; i >= 0; --i) {
+                        els[i].style.display = style;
+                    }
+                }
+                return this;
+            }
+
+        }
+    })();
+/*]]>*/</script>
\ No newline at end of file
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 bf63632c12..6c8df7e4e7 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -27,6 +27,7 @@
                     {% endif %}
 
                     <div id="collector_content">
+                        {% include 'WebProfilerBundle:Profiler:base_js.html.twig' %}
                         {% block panel '' %}
                     </div>
                 </div>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
index 69aaafb476..cbd6b58479 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -1,23 +1,16 @@
 <div id="sfwdt{{ token }}" class="sf-toolbar" style="display: none"></div>
+{% include 'WebProfilerBundle:Profiler:base_js.html.twig' %}
 <script type="text/javascript">/*<![CDATA[*/
     (function () {
-        var wdt, xhr;
-        wdt = document.getElementById('sfwdt{{ token }}');
-        if (window.XMLHttpRequest) {
-            xhr = new XMLHttpRequest();
-        } else {
-            xhr = new ActiveXObject('Microsoft.XMLHTTP');
-        }
-        xhr.open('GET', '{{ path("_wdt", { "token": token }) }}', true);
-        xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-        xhr.onreadystatechange = function(state) {
-            if (4 === xhr.readyState && 200 === xhr.status && -1 !== xhr.responseText.indexOf('sf-toolbarreset')) {
-                wdt.innerHTML = xhr.responseText;
-                wdt.style.display = 'block';
-            } else if (4 === xhr.readyState && xhr.status != 200) {
-                confirm('An error occurred while loading the web debug toolbar (' + xhr.status + ': ' + xhr.statusText + ').\n\nDo you want to open the profiler?') && (window.location = '{{ path("_profiler", { "token": token }) }}');
+        Sfjs.load(
+            '#sfwdt{{ token }}',
+            '{{ path("_wdt", { "token": token }) }}',
+            function(xhr, el) {
+                el.style.display = -1 !== xhr.responseText.indexOf('sf-toolbarreset') ? 'block' : 'none';
+            },
+            function(xhr) {
+                confirm('An error occurred while loading the web debug toolbar (' + xhr.status + ': ' + xhr.statusText + ').\n\nDo you want to open the profiler?') && (window.location = '{{ path("_profiler", { "token": token }) }}')
             }
-        };
-        xhr.send('');
+        );
     })();
 /*]]>*/</script>