diff --git a/common/static/js/vendor/CodeMirror/mitx_markdown.js b/common/static/js/vendor/CodeMirror/mitx_markdown.js
index b619326eb7..fe4fa46eaa 100644
--- a/common/static/js/vendor/CodeMirror/mitx_markdown.js
+++ b/common/static/js/vendor/CodeMirror/mitx_markdown.js
@@ -152,7 +152,7 @@ CodeMirror.defineMode("mitx_markdown", function(cmCfg, modeCfg) {
 
   function blockNormal(stream, state) {
     var match;
-    if (stream.match(circuitRE)) {
+    if (stream.sol() && stream.match(circuitRE)) {
       stream.skipToEnd();
       return circuit_formatter;
     } else if (state.indentationDiff >= 4) {
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 0ec11de557..39f8f8a8ea 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -324,7 +324,10 @@ WIKI_ACCOUNT_HANDLING = False
 WIKI_EDITOR = 'course_wiki.editors.CodeMirror'
 WIKI_SHOW_MAX_CHILDREN = 0 # We don't use the little menu that shows children of an article in the breadcrumb
 WIKI_ANONYMOUS = False # Don't allow anonymous access until the styling is figured out
-WIKI_CAN_CHANGE_PERMISSIONS = lambda article, user: user.has_perm('wiki.assign')
+WIKI_CAN_CHANGE_PERMISSIONS = lambda article, user: user.is_staff or user.is_superuser
+WIKI_CAN_ASSIGN = lambda article, user: user.is_staff or user.is_superuser
+
+WIKI_USE_BOOTSTRAP_SELECT_WIDGET = False
 
 ################################# Jasmine ###################################
 JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index 81646e5b32..bcc2c8855d 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -763,6 +763,10 @@ section.wiki {
       padding: 8px;
       overflow: hidden;
     }
+    
+    a.list-children {
+      margin-left: 3px;
+    }
 
     tr:nth-child(even) {
       background: #F6F6F6;
diff --git a/lms/templates/wiki/includes/article_menu.html b/lms/templates/wiki/includes/article_menu.html
index 0d505ccebd..dd46a3d7fd 100644
--- a/lms/templates/wiki/includes/article_menu.html
+++ b/lms/templates/wiki/includes/article_menu.html
@@ -1,5 +1,8 @@
 ## mako
-<%! from django.core.urlresolvers import reverse %>
+<%! 
+  from django.core.urlresolvers import reverse
+  from wiki.core.permissions import can_change_permissions
+%>
 
 <li class="${"active" if selected_tab == "view" else ""}">
   <a href="${reverse('wiki:get', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
@@ -37,9 +40,10 @@
 
 
 <%doc>
-The settings link has been disabled because the notifications app hasn't been integrated yet and those are the only useful settings.
+This should be enabled for all non-anonymous users once the notifications app has been integrated and styled.
+</%doc>
 
-%if not user.is_anonymous():
+%if can_change_permissions(article,user):
 <li class="${"active" if selected_tab == "settings" else ""}">
   <a href="${reverse('wiki:settings', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
     <span class="icon-settings icon"></span>
@@ -47,6 +51,6 @@ The settings link has been disabled because the notifications app hasn't been in
   </a>
 </li>
 %endif
-</%doc>
+
 
 
diff --git a/repo-requirements.txt b/repo-requirements.txt
index 82c0b06b34..b93dc2837f 100644
--- a/repo-requirements.txt
+++ b/repo-requirements.txt
@@ -1,6 +1,6 @@
 -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
 -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
--e git://github.com/benjaoming/django-wiki.git@3576a2d#egg=django-wiki
+-e git://github.com/benjaoming/django-wiki.git@533c7fc#egg=django-wiki
 -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e common/lib/capa
 -e common/lib/xmodule