diff --git a/cms/static/coffee/src/models/module.coffee b/cms/static/coffee/src/models/module.coffee
index aba2c4f2d6..c3430d3938 100644
--- a/cms/static/coffee/src/models/module.coffee
+++ b/cms/static/coffee/src/models/module.coffee
@@ -1,3 +1,9 @@
 class CMS.Models.Module extends Backbone.Model
+  initialize: ->
+    try
+      @module = new window[@get('type')](@get('id'))
+    catch TypeError
+      console.error "Unable to load #{@get('type')}." if console
+
   editUrl: ->
-    "/edit_item?id=#{@get('id')}"
+    "/edit_item?#{$.param(id: @get('id'))}"
diff --git a/cms/static/coffee/src/views/module.coffee b/cms/static/coffee/src/views/module.coffee
index 5d7368778c..f99422d79e 100644
--- a/cms/static/coffee/src/views/module.coffee
+++ b/cms/static/coffee/src/views/module.coffee
@@ -3,7 +3,7 @@ class CMS.Views.Module extends Backbone.View
     "click .module-edit": "edit"
 
   initialize: ->
-    @model = new CMS.Models.Module(id: @el.id)
+    @model = new CMS.Models.Module(id: @$el.data('id'), type: @$el.data('type'))
 
   edit: =>
     CMS.trigger('showContent', new CMS.Views.ModuleEdit(model: @model))
diff --git a/cms/static/coffee/src/views/week_edit.coffee b/cms/static/coffee/src/views/week_edit.coffee
index 0deab707a5..10dd20f393 100644
--- a/cms/static/coffee/src/views/week_edit.coffee
+++ b/cms/static/coffee/src/views/week_edit.coffee
@@ -3,4 +3,4 @@ class CMS.Views.WeekEdit extends Backbone.View
   className: 'edit-pane'
 
   initialize: ->
-    CMS.trigger 'week.edit'
+    CMS.trigger('week.edit')
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index 372f298a8b..dca9177860 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -36,7 +36,7 @@
 
   <ol id="weeks">
     % for week in weeks:
-    <li id="${week.location.url()}">
+    <li class="week" data-id="${week.location.url()}">
       <header>
         <h1><a href="#" class="module-edit">${week.name}</a></h1>
         <ul>
@@ -50,9 +50,9 @@
         </ul>
       </header>
 
-      <ul id="modules">
+      <ul class="modules">
         % for module in week.get_children():
-        <li class="module" data-type="${module.category}" data-id="${module.location.url()}">
+        <li class="module" data-id="${module.location.url()}" data-type="${module.category}">
             <a href="#" class="module-edit">${module.name}</a>
             <a href="#" class="draggable">handle</a>
         </li>