diff --git a/src/Orchard.Web/Core/Common/Module.txt b/src/Orchard.Web/Core/Common/Module.txt
index 88c8138b1..9485eb1f9 100644
--- a/src/Orchard.Web/Core/Common/Module.txt
+++ b/src/Orchard.Web/Core/Common/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
 features:
     Common:
         Description: Core content parts.
diff --git a/src/Orchard.Web/Core/Dashboard/Module.txt b/src/Orchard.Web/Core/Dashboard/Module.txt
index 1fb19522a..7a04131e6 100644
--- a/src/Orchard.Web/Core/Dashboard/Module.txt
+++ b/src/Orchard.Web/Core/Dashboard/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Dashboard:
         Description: Standard admin dashboard.
diff --git a/src/Orchard.Web/Core/Feeds/Module.txt b/src/Orchard.Web/Core/Feeds/Module.txt
index eb1f5b157..4f665d079 100644
--- a/src/Orchard.Web/Core/Feeds/Module.txt
+++ b/src/Orchard.Web/Core/Feeds/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Feeds:
         Description: RSS feeds for content items.
diff --git a/src/Orchard.Web/Core/HomePage/Module.txt b/src/Orchard.Web/Core/HomePage/Module.txt
index 63404f28d..7a6752958 100644
--- a/src/Orchard.Web/Core/HomePage/Module.txt
+++ b/src/Orchard.Web/Core/HomePage/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     HomePage:
         Description: Standard site home page that allows a specified content type or container to *be* the home page.
diff --git a/src/Orchard.Web/Core/Navigation/Module.txt b/src/Orchard.Web/Core/Navigation/Module.txt
index 31ec9b758..d89e2186b 100644
--- a/src/Orchard.Web/Core/Navigation/Module.txt
+++ b/src/Orchard.Web/Core/Navigation/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Navigation:
         Description: Menu management.
diff --git a/src/Orchard.Web/Core/Scheduling/Module.txt b/src/Orchard.Web/Core/Scheduling/Module.txt
index e5026374d..97d361536 100644
--- a/src/Orchard.Web/Core/Scheduling/Module.txt
+++ b/src/Orchard.Web/Core/Scheduling/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
 features:
     Scheduling:
         Description: Scheduled background tasks.
diff --git a/src/Orchard.Web/Core/Settings/Module.txt b/src/Orchard.Web/Core/Settings/Module.txt
index 5e4f413c7..c8d59b5aa 100644
--- a/src/Orchard.Web/Core/Settings/Module.txt
+++ b/src/Orchard.Web/Core/Settings/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Settings:
         Description: Site settings.
diff --git a/src/Orchard.Web/Core/XmlRpc/Module.txt b/src/Orchard.Web/Core/XmlRpc/Module.txt
index 6ab5a799d..c316b47ed 100644
--- a/src/Orchard.Web/Core/XmlRpc/Module.txt
+++ b/src/Orchard.Web/Core/XmlRpc/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     XmlRpc:
         Description: XML-RPC opt-in implementation.
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Module.txt b/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
index 827ac7017..d0c984b8d 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
+++ b/src/Orchard.Web/Modules/Futures.Widgets/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
 features:
     Futures.Widgets:
         Description: Widgets container with simple inline content editing widget.
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
index f1e73406c..21c8b0f73 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: The Orchard Blogs module is a package containing a couple of features. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
 features:
     Orchard.Blogs:
         Description: A simple web log.
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
index d863f49bb..924925da6 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Comments:
         Description: Standard content item comments.
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt b/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt
index 9d886eed2..af8ab752c 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.DevTools:
         Description: An assortment of debuging tools.
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Module.txt b/src/Orchard.Web/Modules/Orchard.Media/Module.txt
index 7a2730d9a..647a067dc 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Media/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Media:
         Description: File system based media upload, storage and management.
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
index a45979b33..385dec318 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
@@ -25,6 +25,10 @@ namespace Orchard.Modules.Controllers {
             return View(new ModulesIndexViewModel {Modules = modules});
         }
 
+        public ActionResult Add() {
+            return View(new ModulesIndexViewModel());  
+        }
+
         public ActionResult Features() {
             if (!Services.Authorizer.Authorize(Permissions.ManageFeatures, T("Not allowed to manage features")))
                 return new HttpUnauthorizedResult();
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
index d644877cf..014573eec 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Modules:
         Description: Standard module and feature management.
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index 14d3e1a81..93d91910f 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -80,6 +80,13 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
+    <Content Include="scripts\jquery.switchable.js" />
+    <Content Include="styles\images\summary-view.gif" />
+    <Content Include="styles\images\summary-view-on.gif" />
+    <Content Include="styles\images\detail-view.gif" />
+    <Content Include="styles\images\detail-view-on.gif" />
+    <Content Include="styles\jquery.switchable.css" />
+    <Content Include="Views\Admin\Add.ascx" />
     <Content Include="Views\Admin\Index.ascx" />
     <Content Include="Web.config" />
   </ItemGroup>
@@ -96,6 +103,7 @@
     <Content Include="Views\Admin\Features.ascx" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.ascx
new file mode 100644
index 000000000..239de7a6d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.ascx
@@ -0,0 +1,2 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
+<h1><%=Html.TitleForPage(T("Install a Module").ToString()) %></h1>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
index 47dda8aae..075b91ed4 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
@@ -3,10 +3,12 @@
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Modules.ViewModels"%>
 <%@ Import Namespace="Orchard.Utility.Extensions" %><%
- Html.RegisterStyle("admin.css"); %>
+ Html.RegisterStyle("admin.css");
+ Html.RegisterStyle("jquery.switchable.css");
+ Html.RegisterFootScript("jquery.switchable.js"); %>
 <h1><%=Html.TitleForPage(T("Manage Features").ToString()) %></h1>
 <% if (Model.Features.Count() > 0) { %>
-<ul class="features"><%
+<ul class="features summary-view switchable"><%
     var featureGroups = Model.Features.OrderBy(f => f.Descriptor.Category).GroupBy(f => f.Descriptor.Category);
     foreach (var featureGroup in featureGroups) {
         var categoryName = featureGroup.First().Descriptor.Category ?? T("Uncategorized");
@@ -34,7 +36,8 @@
             <li class="<%=featureClassName %>" id="<%=Html.AttributeEncode(featureId) %>" title="<%=T("{0} is {1}", Html.AttributeEncode(feature.Descriptor.Name), featureState) %>">
                 <div class="summary">
                     <div class="properties">
-                        <h3><%=Html.Encode(feature.Descriptor.Name) %></h3><%
+                        <h3><%:feature.Descriptor.Name %></h3>
+                        <p class="description"><%:feature.Descriptor.Description %></p><%
                         if (feature.Descriptor.Dependencies != null) { %>
                         <div class="dependencies">
                             <h4><%=_Encoded("Depends on:")%></h4>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
index 2cb62ae78..4a47b8b77 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
@@ -3,31 +3,25 @@
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Modules.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Installed Modules").ToString()) %></h1>
-<%--<div class="manage"><%=Html.ActionLink(T("Install a module").ToString(), "Features", new { }, new { @class = "button primaryAction" })%></div>--%>
-<%--<h2><%=T("Installed Modules") %></h2>--%>
+<div class="manage"><%=Html.ActionLink(T("Install a module").ToString(), "Add", null, new { @class = "button primaryAction" })%></div>
 <% if (Model.Modules.Count() > 0) { %>
-<fieldset class="">
 <ul class="contentItems"><%
     foreach (var module in Model.Modules.OrderBy(m => m.DisplayName)) { %>
     <li>
         <div class="summary">
             <div class="properties">
-                <h3><%=Html.Encode(module.DisplayName) %></h3>
+                <h2><%:module.DisplayName %><span> - <%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %></span></h2><%
+            if (!string.IsNullOrEmpty(module.Description)) { %>
+                <p><%:module.Description %></p><%
+            } %>
                 <ul class="pageStatus" style="color:#666; margin:.6em 0 0 0;">
-                    <li><%=T("Version: {0}", !string.IsNullOrEmpty(module.Version) ? Html.Encode(module.Version) : T("1.0")) %></li>
-                    <li>&nbsp;&#124;&nbsp;<%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(Html.Encode(f.Name), string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %></li>
+                    <li><%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %></li>
                     <li>&nbsp;&#124;&nbsp;<%=T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? Html.Encode(module.Author) : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %></li><%-- very efficient, I know --%>
-                   <li>&nbsp;&#124;&nbsp;<%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>"))%></li>
+                    <li>&nbsp;&#124;&nbsp;<%=T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? Html.Encode(module.HomePage) : T("<a href=\"http://orchardproject.net\">http://orchardproject.net</a>"))%></li>
                 </ul>
             </div>
-        </div><%
-        if (!string.IsNullOrEmpty(module.Description)) { %>
-        <p><%=Html.Encode(module.Description) %></p><%
-        } %>
+        </div>
     </li><%
     } %>
-</ul>
-
-
-</fieldset><%
+</ul><%
  } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/scripts/jquery.switchable.js b/src/Orchard.Web/Modules/Orchard.Modules/scripts/jquery.switchable.js
new file mode 100644
index 000000000..cd7bb0209
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Modules/scripts/jquery.switchable.js
@@ -0,0 +1,24 @@
+(function ($) {
+    $.fn.extend({
+        powerUpTheSwitch: function () {
+            var _this = $(this);
+            var theSwitch = $("<div class=\"switch-for-switchable\"><ul class=\"switch-button-group\"><li class=\"switch-button summary-view\">&nbsp;</li><li class=\"switch-button detail-view\"></li></ul></div>");
+
+            theSwitch.find(".summary-view").click(function () { $(this).switchToSummaryView(_this); });
+            theSwitch.find(".detail-view").click(function () { $(this).switchToDetailView(_this); });
+
+            theSwitch.addClass(_this.hasClass("summary-view") ? "summary-switched" : "detail-switched");
+
+            theSwitch.insertBefore(_this);
+        },
+        switchToDetailView: function (switched) {
+            $(this).closest(".switch-for-switchable").addClass("detail-switched").removeClass("summary-switched");
+            switched.addClass("detail-view").removeClass("summary-view");
+        },
+        switchToSummaryView: function (switched) {
+            $(this).closest(".switch-for-switchable").addClass("summary-switched").removeClass("detail-switched");
+            switched.addClass("summary-view").removeClass("detail-view");
+        }
+    });
+    $(".switchable").powerUpTheSwitch();
+})(jQuery);
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css
index e389af907..7804ea223 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/admin.css
@@ -1,15 +1,15 @@
-.orchard-modules #main h2 {
-    border:0;
-    margin-bottom:.2em;
+#main .features h2 {
+    margin-top:0;
 }
-
-.features h3 {
-    font-size:1.6em;
+.features.detail-view .category > ul {
+    border:1px solid #EAEAEA;
+    margin-bottom:2em;
 }
-.features .category {
+.features.summary-view .category {
     overflow:hidden;
+    padding-bottom:1em;
 }
-.features .feature {
+.features.summary-view .feature {
     border:1px solid #EAEAEA;
     display:block;
     float:left;
@@ -18,34 +18,64 @@
     position:relative;
     width:32.1%;
 }
-.features .feature:nth-child(3n+1),
-.features .feature:nth-child(3n+2),
-.features .feature:nth-child(3n) {
+.features.summary-view .feature:nth-child(3n+1),
+.features.summary-view .feature:nth-child(3n+2),
+.features.summary-view .feature:nth-child(3n) {
     width:32.55%;
 }
-.features .feature:nth-child(3n+1) {
+.features.summary-view .feature:nth-child(3n+1) {
     margin-left:0;
 }
-.features .feature:nth-child(3n+2) {
+.features.summary-view .feature:nth-child(3n+2) {
     margin-right:0;
 }
-.features .feature:nth-child(3n) {
+.features.summary-view .feature:nth-child(3n) {
     float:right;
     margin-left:0;
     margin-right:0;
 }
 
+.features.detail-view .feature {
+    padding:.25em 0;
+}
 .features .enabled.feature {
     background:#FFF;
-    border-color:#CFE493;cfe493
+}
+.features.summary-view .enabled.feature {
+    border-color:#CFE493;
 }
 .features .disabled.feature {
     background:#EAEAEA;
+}
+.features.summary-view .disabled.feature {
     border-color:#CCC;
 }
+.features.detail-view .feature {
+    border-bottom:1px solid #CCC;
+}
+.features.detail-view .last.feature {
+    border:0;
+}
+
 .features .feature .summary {
     overflow:hidden;
     padding:.4em .5em;
+    position:relative;
+}
+#main .features.detail-view h3 {
+    display:inline;
+    font-size:1.4em;
+    font-weight:bold;
+}
+#main .features.summary-view .description {
+    display:none;
+}
+#main .features.detail-view .description {
+    display:inline;
+    margin:0 0 1em .5ex;
+}
+.features.detail-view .description::before {
+    content:" - ";
 }
 .features .dependencies li,
 .features .actions {
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/images/detail-view-on.gif b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/detail-view-on.gif
new file mode 100644
index 000000000..818e325ef
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/detail-view-on.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/images/detail-view.gif b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/detail-view.gif
new file mode 100644
index 000000000..498aabfd6
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/detail-view.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/images/summary-view-on.gif b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/summary-view-on.gif
new file mode 100644
index 000000000..6cd699ed1
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/summary-view-on.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/images/summary-view.gif b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/summary-view.gif
new file mode 100644
index 000000000..154aea32a
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.Modules/styles/images/summary-view.gif differ
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/styles/jquery.switchable.css b/src/Orchard.Web/Modules/Orchard.Modules/styles/jquery.switchable.css
new file mode 100644
index 000000000..7b69b043e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Modules/styles/jquery.switchable.css
@@ -0,0 +1,43 @@
+.switch-for-switchable {
+	margin:0 0 -34px;
+    overflow:auto;
+}
+.switch-for-switchable .switch-button-group {
+	float:right;
+	padding:4px 0;
+}
+.switch-for-switchable .switch-button {
+	background: #F5F5F5;
+	border:1px solid #999999;
+	color:#2D2F25;
+	cursor:pointer;
+	display:block;
+	float:left;
+	text-align:center;
+	height:24px;
+	width:24px;
+}
+.switch-for-switchable .summary-view {
+	background:url("images/summary-view.gif") no-repeat left top;
+	border-right:1px solid #bcbcbc;
+	border-radius:3px 0 0 3px;
+	-moz-border-radius:3px 0 0 3px;
+	-webkit-border-radius:3px 0 0 3px;
+}
+.switch-for-switchable.summary-switched .summary-view {
+	background:url("images/summary-view-on.gif") no-repeat left top;
+	border-color:#bb8b2d;
+	cursor:default;
+}
+.switch-for-switchable .detail-view {
+	background:url("images/detail-view.gif") no-repeat left top;
+	border-right:1px solid #898989;
+	border-radius:0 3px 3px 0;
+	-moz-border-radius:0 3px 3px 0;
+	-webkit-border-radius:0 3px 3px 0;	
+}
+.switch-for-switchable.detail-switched .detail-view {
+	background:url("images/detail-view-on.gif") no-repeat left top;
+	border-color:#bb8b2d;
+	cursor:default;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
index fd00b570b..988c445fd 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
 features:
     Orchard.MultiTenancy:
         Description: Configure multiple site tenants.
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
index f7100c9c9..18c453013 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Pages:
         Description: Simple pages.
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
index 30653aa79..732a7a315 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Roles:
         Description: Standard user roles.
diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt b/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt
index 81a3967b7..014100bff 100644
--- a/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Sandbox:
         Description: A module to mess around with. Currently wiki-like.
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
index 069cdb7e3..53550c048 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Setup:
         Description: Standard site setup.
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
index b7bf7e204..3967783ad 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
 features:
     Orchard.Tags:
         Description: Tag a content item.
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Module.txt b/src/Orchard.Web/Modules/Orchard.Themes/Module.txt
index 551edb361..e58d8a853 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Themes:
         Description: Basic theming capability.
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Module.txt b/src/Orchard.Web/Modules/Orchard.Users/Module.txt
index ad2f24f64..c95c8701c 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Users/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ut arcu turpis, et placerat nunc. Nunc sollicitudin iaculis est, in ultricies mi facilisis et. Aenean et tortor non metus adipiscing laoreet in a justo. Pellentesque faucibus nisl ac lectus mollis quis pellentesque tortor egestas. Curabitur vel velit semper nunc gravida scelerisque. Vivamus at tellus dolor, in ultrices quam posuere.
 features:
     Orchard.Users:
         Description: Standard users.
diff --git a/src/Orchard.Web/Modules/TinyMce/Module.txt b/src/Orchard.Web/Modules/TinyMce/Module.txt
index 9e79c1dfc..5277b4c50 100644
--- a/src/Orchard.Web/Modules/TinyMce/Module.txt
+++ b/src/Orchard.Web/Modules/TinyMce/Module.txt
@@ -4,6 +4,7 @@ author: The Orchard Team
 website: http://orchardproject.net
 version: 0.1
 orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
 features:
     TinyMce:
         Description: TinyMCE HTML WYSIWYG editor.
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 96a7c5011..00ff2c9c7 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -303,7 +303,14 @@ form.link button:hover {
 #main h1, #main h2 {
     border-bottom:1px solid #bdbcbc;
 }
-
+#main ul h2 {
+    border-bottom:0;
+    margin:.2em 0;
+}
+#main ul h3 {
+    font-size:1.6em;
+    margin:0 0 .2em;
+}
 
 /* Confirmations, Messages and the like
 ----------------------------------------------------------*/
@@ -616,26 +623,21 @@ button.ibutton {
 ----------------------------------------------------------*/
 .contentItems {
     background:#FFF;
+    box-shadow:inset 0 1px 2px #878686;
+    -moz-box-shadow:inset 0 1px 3px #878686;
+    -webkit-box-shadow:inset 0 1px 2px #878686;
     margin:1.4em 0;
     padding:2px;
 }
 .contentItems li {
-    background:#FFF;
     border-bottom:1px solid #eaeaea;
     margin:0;
     overflow:hidden;
-    padding:.4em 1.4em;
+    padding:0 1.4em .8em;
 }
-.contentItems li.first {
-	background:#fff url(images/backgroundGradient.gif) repeat-x top left;
-}
-.contentItems li li.last {
+.contentItems li.last {
     border-bottom:0;
 }
-#main .contentItems li h3 {
-    border-bottom:0;
-    margin-top:0;
-}
 #main .contentItems li .actions {
     color:#EAE9D9;
     height:auto;
@@ -849,10 +851,10 @@ h3 .icon {
 .pageList {
      margin:0;
      padding:0;
-     background:#FFFFFF url(images/backgroundGradient.gif) repeat-x scroll left top;
+     /*background:#FFFFFF url(images/backgroundGradient.gif) repeat-x scroll left top;*/
      }
 .orchard-pages .contentItems {
-     margin:1em 0 0 0;
+     margin:.5em 0 0;
      padding:0;
  }
 .contentItems .properties ul.pageStatus {