diff --git a/cms/djangoapps/contentstore/features/advanced-settings.py b/cms/djangoapps/contentstore/features/advanced-settings.py
index ea5b24b21f..3acebecac8 100644
--- a/cms/djangoapps/contentstore/features/advanced-settings.py
+++ b/cms/djangoapps/contentstore/features/advanced-settings.py
@@ -19,9 +19,7 @@ DISPLAY_NAME_VALUE = '"Robot Super Course"'
 ############### ACTIONS ####################
 @step('I select the Advanced Settings$')
 def i_select_advanced_settings(step):
-    expand_icon_css = 'li.nav-course-settings i.icon-expand'
-    if world.browser.is_element_present_by_css(expand_icon_css):
-        world.css_click(expand_icon_css)
+    world.click_course_settings()
     link_css = 'li.nav-course-settings-advanced a'
     world.css_click(link_css)
 
diff --git a/cms/djangoapps/contentstore/features/checklists.py b/cms/djangoapps/contentstore/features/checklists.py
index 1c9fbf0994..9552d35036 100644
--- a/cms/djangoapps/contentstore/features/checklists.py
+++ b/cms/djangoapps/contentstore/features/checklists.py
@@ -10,9 +10,7 @@ from selenium.common.exceptions import StaleElementReferenceException
 ############### ACTIONS ####################
 @step('I select Checklists from the Tools menu$')
 def i_select_checklists(step):
-    expand_icon_css = 'li.nav-course-tools i.icon-expand'
-    if world.browser.is_element_present_by_css(expand_icon_css):
-        world.css_click(expand_icon_css)
+    world.click_tools()
     link_css = 'li.nav-course-tools-checklists a'
     world.css_click(link_css)
 
diff --git a/cms/djangoapps/contentstore/features/course-settings.py b/cms/djangoapps/contentstore/features/course-settings.py
index d69266b7de..bd86fff9b7 100644
--- a/cms/djangoapps/contentstore/features/course-settings.py
+++ b/cms/djangoapps/contentstore/features/course-settings.py
@@ -25,9 +25,7 @@ DEFAULT_TIME = "00:00"
 ############### ACTIONS ####################
 @step('I select Schedule and Details$')
 def test_i_select_schedule_and_details(step):
-    expand_icon_css = 'li.nav-course-settings i.icon-expand'
-    if world.browser.is_element_present_by_css(expand_icon_css):
-        world.css_click(expand_icon_css)
+    world.click_course_settings()
     link_css = 'li.nav-course-settings-schedule a'
     world.css_click(link_css)
 
diff --git a/cms/djangoapps/contentstore/features/courses.py b/cms/djangoapps/contentstore/features/courses.py
index 5da7720945..aa2e9d68f8 100644
--- a/cms/djangoapps/contentstore/features/courses.py
+++ b/cms/djangoapps/contentstore/features/courses.py
@@ -62,4 +62,4 @@ def i_am_on_tab(step, tab_name):
 @step('I see a link for adding a new section$')
 def i_see_new_section_link(step):
     link_css = 'a.new-courseware-section-button'
-    assert world.css_has_text(link_css, '+ New Section')
+    assert world.css_has_text(link_css, 'New Section')
diff --git a/cms/djangoapps/contentstore/features/section.py b/cms/djangoapps/contentstore/features/section.py
index 59c5a37b33..9a896d8ebe 100644
--- a/cms/djangoapps/contentstore/features/section.py
+++ b/cms/djangoapps/contentstore/features/section.py
@@ -62,7 +62,7 @@ def i_click_to_edit_section_name(step):
 
 @step('I see the complete section name with a quote in the editor$')
 def i_see_complete_section_name_with_quote_in_editor(step):
-    css = '.edit-section-name'
+    css = '.section-name-edit input[type=text]'
     assert world.is_css_present(css)
     assert_equal(world.browser.find_by_css(css).value, 'Section with "Quote"')
 
diff --git a/cms/templates/checklists.html b/cms/templates/checklists.html
index e5227c71fd..6f78e952c0 100644
--- a/cms/templates/checklists.html
+++ b/cms/templates/checklists.html
@@ -9,7 +9,6 @@
 <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
 <script type="text/javascript" src="${static.url('js/views/checklists_view.js')}"></script>
 <script type="text/javascript" src="${static.url('js/models/checklists.js')}"></script>
-<script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
 
 <script type="text/javascript">
     $(document).ready(function () {
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html
index b2bf65ae53..b13a024fde 100644
--- a/cms/templates/course_info.html
+++ b/cms/templates/course_info.html
@@ -11,7 +11,6 @@
   <script type="text/javascript" src="${static.url('js/models/course_info.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/module_info.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/course_info_edit.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
   <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
   <script src="${static.url('js/vendor/timepicker/datepair.js')}"></script>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 5baf460e25..2adc0cd980 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -15,7 +15,6 @@ from contentstore import utils
   <script src="${static.url('js/vendor/date.js')}"></script>
 
   <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/validating_view.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/settings/main_settings_view.js')}"></script>
diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html
index 0400d95694..242148418e 100644
--- a/cms/templates/settings_advanced.html
+++ b/cms/templates/settings_advanced.html
@@ -11,7 +11,6 @@ from contentstore import utils
 <%block name="jsextra">
 
 <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
-<script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
 <script type="text/javascript" src="${static.url('js/views/validating_view.js')}"></script>
 <script type="text/javascript" src="${static.url('js/models/settings/advanced.js')}"></script>
 <script type="text/javascript" src="${static.url('js/views/settings/advanced_view.js')}"></script>
diff --git a/cms/templates/settings_discussions_faculty.html b/cms/templates/settings_discussions_faculty.html
index fc30b6eebb..5dfb4b76ae 100644
--- a/cms/templates/settings_discussions_faculty.html
+++ b/cms/templates/settings_discussions_faculty.html
@@ -6,27 +6,26 @@
 
 <%namespace name='static' file='static_content.html'/>
 <%!
-from contentstore import utils 
+from contentstore import utils
 %>
 
 
 <%block name="jsextra">
   <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/validating_view.js')}"></script>
-  
+
   <script type="text/javascript">
     $(document).ready(function(){
     });
-      
+
   </script>
 </%block>
 
 <%block name="content">
   <!-- -->
   <div class="main-wrapper">
-    <div class="inner-wrapper">      
+    <div class="inner-wrapper">
       <h1>Settings</h1>
       <article class="settings-overview">
         <div class="settings-page-section main-column">
@@ -74,7 +73,7 @@ from contentstore import utils
                         <div class="field">
                           <textarea class="long tall edit-box tinymce" id="course-faculty-1-bio"></textarea>
                           <span class="tip tip-stacked">A brief description of your education, experience, and expertise</span>
-                        </div>      
+                        </div>
                       </div>
 
                       <a href="#" class="remove-item remove-faculty-data"><span class="delete-icon"></span> Delete Faculty Member</a>
@@ -102,7 +101,7 @@ from contentstore import utils
                             <a href="#" class="new-item new-faculty-photo add-faculty-photo-data" id="course-faculty-2-photo">
                               <span class="upload-icon"></span>Upload Faculty Photo
                             </a>
-                            <span class="tip tip-inline">Max size: 30KB</span>          
+                            <span class="tip tip-inline">Max size: 30KB</span>
                           </div>
                         </div>
                       </div>
@@ -114,7 +113,7 @@ from contentstore import utils
                             <textarea class="long tall edit-box tinymce" id="course-faculty-2-bio"></textarea>
                             <span class="tip tip-stacked">A brief description of your education, experience, and expertise</span>
                           </div>
-                        </div>      
+                        </div>
                       </div>
                     </li>
                   </ul>
@@ -143,7 +142,7 @@ from contentstore import utils
                 <div class="field">
                   <div class="input input-radio">
                     <input checked="checked" type="radio" name="course-problems-general-randomization" id="course-problems-general-randomization-always" value="Always">
-                    
+
                     <div class="copy">
                       <label for="course-problems-general-randomization-always">Always</label>
                     <span class="tip tip-stacked"><strong>randomize all</strong> problems</span>
@@ -217,7 +216,7 @@ from contentstore import utils
                 <div class="field">
                   <div class="input input-radio">
                     <input checked="checked" type="radio" name="course-problems-assignment-1-randomization" id="course-problems-assignment-1-randomization-always" value="Always">
-                    
+
                     <div class="copy">
                       <label for="course-problems-assignment-1-randomization-always">Always</label>
                     <span class="tip tip-stacked"><strong>randomize all</strong> problems</span>
@@ -283,7 +282,7 @@ from contentstore import utils
 
           <section class="settings-discussions">
             <h2 class="title">Discussions</h2>
-            
+
             <section class="settings-discussions-general">
               <header>
                 <h3>General Settings</h3>
@@ -296,7 +295,7 @@ from contentstore import utils
                 <div class="field">
                   <div class="input input-radio">
                     <input type="radio" name="course-discussions-anonymous" id="course-discussions-anonymous-allow" value="Allow">
-                    
+
                     <div class="copy">
                       <label for="course-discussions-anonymous-allow">Allow</label>
                     <span class="tip tip-stacked">Students and faculty <strong>will be able to post anonymously</strong></span>
@@ -320,7 +319,7 @@ from contentstore import utils
                 <div class="field">
                   <div class="input input-radio">
                     <input checked="checked" type="radio" name="course-discussions-anonymous" id="course-discussions-anonymous-allow" value="Allow">
-                    
+
                     <div class="copy">
                       <label for="course-discussions-anonymous-allow">Allow</label>
                       <span class="tip tip-stacked">Students and faculty <strong>will be able to post anonymously</strong></span>
@@ -329,7 +328,7 @@ from contentstore import utils
 
                   <div class="input input-radio">
                     <input disabled="disabled" type="radio" name="course-discussions-anonymous" id="course-discussions-anonymous-dontallow" value="Do Not Allow">
-                    
+
                     <div class="copy">
                       <label for="course-discussions-anonymous-dontallow">Do not allow</label>
                       <span class="tip tip-stacked">This option is disabled since there are previous discussions that are anonymous.</span>
@@ -351,7 +350,7 @@ from contentstore import utils
 
                       <a href="#" class="drag-handle"></a>
                     </li>
-                    
+
                     <li class="input input-existing input-default course-discussions-categories-list-item sortable-item">
                       <div class="group">
                         <label for="course-discussions-categories-2-name">Category Name: </label>
diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html
index ceab8cd862..2c6846bece 100644
--- a/cms/templates/settings_graders.html
+++ b/cms/templates/settings_graders.html
@@ -12,7 +12,6 @@ from contentstore import utils
   <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
 
   <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/validating_view.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index 40b839ae24..79e9b0afdb 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -123,3 +123,17 @@ def save_the_html(path='/tmp'):
     f = open('%s/%s' % (path, filename), 'w')
     f.write(html)
     f.close()
+
+
+@world.absorb
+def click_course_settings():
+    course_settings_css = 'li.nav-course-settings'
+    if world.browser.is_element_present_by_css(course_settings_css):
+        world.css_click(course_settings_css)
+
+
+@world.absorb
+def click_tools():
+    tools_css = 'li.nav-course-tools'
+    if world.browser.is_element_present_by_css(tools_css):
+        world.css_click(tools_css)