Index: rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
===================================================================
--- rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java	(revision 1132637)
+++ rave-portal/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java	(revision )
@@ -19,8 +19,6 @@
 
 package org.apache.rave.provider.w3c.web.renderer;
 
-import static org.apache.rave.provider.w3c.Constants.WIDGET_TYPE;
-
 import org.apache.rave.exception.NotSupportedException;
 import org.apache.rave.portal.model.RegionWidget;
 import org.apache.rave.portal.model.Widget;
@@ -30,6 +28,8 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import static org.apache.rave.provider.w3c.Constants.WIDGET_TYPE;
+
 /**
  * Creates the appropriate markup to represent a W3C widget
  */
@@ -37,11 +37,9 @@
 public class W3cWidgetRenderer implements RegionWidgetRenderer {
 
 
-    private static final String IFRAME_MARKUP = "<script>" +
-                                                    "widgets.push({type: '%1$s'," +
+    private static final String IFRAME_MARKUP = "widgets.push({type: '%1$s'," +
-                                                                 " regionWidgetId: %2$s," +
+                                                " regionWidgetId: %2$s," +
-                                                                 " widgetUrl: '%3$s'});" +
-                                                "</script>";
+                                                " widgetUrl: '%3$s'});";
 
     private static final String INLINE_MARKUP = "";
 
Index: rave-portal/src/main/webapp/WEB-INF/views/home.jsp
===================================================================
--- rave-portal/src/main/webapp/WEB-INF/views/home.jsp	(revision 1132804)
+++ rave-portal/src/main/webapp/WEB-INF/views/home.jsp	(revision )
@@ -38,20 +38,8 @@
     <a href="<spring:url value="/app/store?referringPageId=${defaultPage.id}" />">Widget Store</a>
 </div>
 
-<script src="${opensocial_engine_url}/js/container.js?c=1&container=default&debug=1"></script>
-<script src="<spring:url value="/script/rave.js"/>"></script>
-<script src="<spring:url value="/script/rave_api.js"/>"></script>
-<script src="<spring:url value="/script/rave_opensocial.js"/>"></script>
-<script src="<spring:url value="/script/rave_wookie.js"/>"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
 
 <h1>Hello ${defaultPage.owner.username}, welcome to Rave!</h1>
-<script>
-    //Define the global widgets variable
-	 //This array will be populated by RegionWidgetRender providers.
-    var widgets = [];
-</script>
 <c:forEach var="region" items="${defaultPage.regions}">
 <div class="region" id="region-${region.id}-id" >
     <c:forEach var="regionWidget" items="${region.regionWidgets}">
@@ -64,53 +52,50 @@
         <div class="widget-title-bar" >
             <span id="widget-${regionWidget.id}-title">${regionWidget.widget.title}</span>
             
-				<!-- These are toolbar buttons -->
-				<span id="widget-${regionWidget.id}-toolbar" style="float:right;">
-				  <button id="widget-${regionWidget.id}-max" 
-							 class="widget-toolbar-btn"
-							 onclick="rave.toolbarMaximize(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
-				  </button>
-				  <button id="widget-${regionWidget.id}-remove" 
-							 class="widget-toolbar-btn"
-							 onclick="rave.toolbarDelete(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
-				  </button>
+                <!-- These are toolbar buttons -->
+                <span id="widget-${regionWidget.id}-toolbar" style="float:right;">
+                  <button id="widget-${regionWidget.id}-max" 
+                             class="widget-toolbar-btn"
+                             onclick="rave.toolbarMaximize(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
+                  </button>
+                  <button id="widget-${regionWidget.id}-remove" 
+                             class="widget-toolbar-btn"
+                             onclick="rave.toolbarDelete(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
+                  </button>
-				  <script>
-					 //This decorates the toolbar buttons.  As currently written,
-					 //it needs to be in the forEach loop.
-					 $("#widget-${regionWidget.id}-max").button({
-					 text: false,
-					 icons: {
-					 primary: "ui-icon-arrow-4-diag"
-					 }
-					 });
-
-					 $("#widget-${regionWidget.id}-remove").button({
-					 text: false,
-					 icons: {
-					 primary: "ui-icon-close"
-					 }
-					 });
-					 rave.mapGadgetToRegion("${regionWidget.id}", "${region.id}");
-				  </script>
-
-				</span>
-		  </div>
+                </span>
+          </div>
         <div class="widget" id="widget-${regionWidget.id}-body">
-			 <!-- 
-					Among other things, the render-widget tag will populate the widgets[] array.  
-					See the markup text in OpenSocialWidgetRenderer.java, for example.
-			 -->
-            <portal:render-widget regionWidget="${regionWidget}" />
+            <%-- Widget will be rendered here --%>
         </div>
     </div>
     </c:forEach>
 </div>
 </c:forEach>
 <div class="clear-float">&nbsp;</div>
-
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
+<script src="${opensocial_engine_url}/js/container.js?c=1&container=default&debug=1"></script>
+<script src="<spring:url value="/script/rave.js"/>"></script>
+<script src="<spring:url value="/script/rave_api.js"/>"></script>
+<script src="<spring:url value="/script/rave_opensocial.js"/>"></script>
+<script src="<spring:url value="/script/rave_wookie.js"/>"></script>
 <script>
+    //Define the global widgets variable
+    //This array will be populated by RegionWidgetRender providers.
+    var widgets = [];
+    <%--
+        Among other things, the render-widget tag will populate the widgets[] array.
+        See the markup text in OpenSocialWidgetRenderer.java, for example.
+     --%>
+    <c:forEach var="region" items="${defaultPage.regions}">
+    <c:forEach var="regionWidget" items="${region.regionWidgets}">
+    <portal:render-widget regionWidget="${regionWidget}" />
+    </c:forEach>
+    </c:forEach>
+
-    $(function(){
+    $(function() {
         rave.setContext("<spring:url value="/app/" />");
+        rave.initGadgetUI(widgets);
         rave.initProviders();
         rave.initWidgets(rave.createWidgetMap(widgets));
         rave.initDragAndDrop();
Index: rave-portal/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
===================================================================
--- rave-portal/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java	(revision 1130698)
+++ rave-portal/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java	(revision )
@@ -43,13 +43,12 @@
 
     //Note the widgets.push() call.  This defines the widget objects, which are
     //added to the widgets[] array in home.jsp.   
-    private static final String IFRAME_MARKUP = "<script type=\"text/javascript\">" +
+    private static final String IFRAME_MARKUP =
             "widgets.push({type: '%1$s'," +
             " regionWidgetId: %2$s," +
             " widgetUrl: '%3$s', " +
             " metadata: %4$s," +
-            " userPrefs: {}});" +
-            "</script>";
+            " userPrefs: {}});";
 
     @Override
     public String getSupportedContext() {
Index: rave-portal/src/main/webapp/script/rave.js
===================================================================
--- rave-portal/src/main/webapp/script/rave.js	(revision 1132804)
+++ rave-portal/src/main/webapp/script/rave.js	(revision )
@@ -188,8 +188,26 @@
     function getContext() {
         return context;
     }
-	 
-	 /**
+
+    /**
+     * Takes care of the UI part of the widget rendering. Depends heavily on the HTML structure
+     * @param widgets array of widgets
+     */
+    function initGadgetUI(widgets) {
+        $("div[id^='region-']").each(function(regionIndex) {
+            var regionElement = $(this);
+            var regionId = regionElement.attr("id");
+            regionId = regionId.substring("region-".length, regionId.lastIndexOf('-'));
+            regionElement.children("div[id^='widget-wrapper-']").each(function(wrapperIndex) {
+                var widgetElement = $(this);
+                var widgetId = widgetElement.attr("id").substr("widget-wrapper-".length);
+                mapGadgetToRegion(widgetId, regionId);
+                styleGadgetButtons(widgetId);
+            });
+        });
+    }
+
+    /**
 	  * Map a widget to the region where it is located.
 	  * 
 	  * @param widgetId: id of the widget (not DOM id)
@@ -212,6 +230,27 @@
      }
 
     /**
+     * Applies styling to the several buttons in the widget / gadget toolbar
+     * @param widgetId identifier of the widget / gadget
+     */
+    function styleGadgetButtons(widgetId) {
+        $("#widget-" + widgetId + "-max").button({
+                    text: false,
+                    icons: {
+                        primary: "ui-icon-arrow-4-diag"
+                    }
+                });
+
+        $("#widget-" + widgetId + "-remove").button({
+                    text: false,
+                    icons: {
+                        primary: "ui-icon-close"
+                    }
+                });
+    }
+
+
+    /**
      * Public API
      */
     return {
@@ -271,7 +310,9 @@
          */
         getContext: getContext,
 
+        initGadgetUI : initGadgetUI,
 
+
     	/**
     	 * Change or delete gadget to region map entry.
     	 */