diff --git a/VERSION b/VERSION
index 69e7c83e..5958fd45 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-01-12 12:27:44) stable
+Version 1.99.4 (2012-01-12 12:35:23) stable
diff --git a/applications/admin/views/generic.html b/applications/admin/views/generic.html
index 287dafd3..f6ee4962 100644
--- a/applications/admin/views/generic.html
+++ b/applications/admin/views/generic.html
@@ -5,14 +5,12 @@ You should not modify this file.
 It is used as default when a view is not provided for your controllers
 
 """}}
-
+<h2>{{=' '.join(x.capitalize() for x in request.function.split('_'))}}</h2>
+{{if len(response._vars)==1:}}
+{{=BEAUTIFY(response._vars.values()[0])}}
+{{elif len(response._vars)>1:}}
 {{=BEAUTIFY(response._vars)}}
-
-<button onclick="document.location='{{=URL("admin","default","design",args=request.application)}}'">admin</button>
-<button onclick="jQuery('#request').slideToggle()">request</button>
-<div class="hidden" id="request"><h2>request</h2>{{=BEAUTIFY(request)}}</div>
-<button onclick="jQuery('#session').slideToggle()">session</button>
-<div class="hidden" id="session"><h2>session</h2>{{=BEAUTIFY(session)}}</div>
-<button onclick="jQuery('#response').slideToggle()">response</button>
-<div class="hidden" id="response"><h2>response</h2>{{=BEAUTIFY(response)}}</div>
-<script>jQuery('.hidden').hide();</script>
+{{pass}}
+{{if request.is_local:}}
+{{=response.toolbar()}}
+{{pass}}
diff --git a/applications/examples/views/generic.html b/applications/examples/views/generic.html
index 887af215..f6ee4962 100644
--- a/applications/examples/views/generic.html
+++ b/applications/examples/views/generic.html
@@ -1,3 +1,16 @@
 {{extend 'layout.html'}}
+{{"""
+
+You should not modify this file. 
+It is used as default when a view is not provided for your controllers
+
+"""}}
+<h2>{{=' '.join(x.capitalize() for x in request.function.split('_'))}}</h2>
+{{if len(response._vars)==1:}}
+{{=BEAUTIFY(response._vars.values()[0])}}
+{{elif len(response._vars)>1:}}
 {{=BEAUTIFY(response._vars)}}
-{{block sidebar}}{{end}}
+{{pass}}
+{{if request.is_local:}}
+{{=response.toolbar()}}
+{{pass}}
diff --git a/applications/welcome/views/generic.html b/applications/welcome/views/generic.html
index edfe3106..f6ee4962 100644
--- a/applications/welcome/views/generic.html
+++ b/applications/welcome/views/generic.html
@@ -7,7 +7,7 @@ It is used as default when a view is not provided for your controllers
 """}}
 <h2>{{=' '.join(x.capitalize() for x in request.function.split('_'))}}</h2>
 {{if len(response._vars)==1:}}
-{{=response._vars.values()[0]}}
+{{=BEAUTIFY(response._vars.values()[0])}}
 {{elif len(response._vars)>1:}}
 {{=BEAUTIFY(response._vars)}}
 {{pass}}