diff --git a/features/plain/changes_view_improvements.feature b/features/plain/changes_view_improvements.feature
index 4bbde523..53cbcedb 100644
--- a/features/plain/changes_view_improvements.feature
+++ b/features/plain/changes_view_improvements.feature
@@ -30,5 +30,5 @@ Feature: Changes view improvements
       
     Examples: Changes notices
       | link          | notice                                                                                    |
-      | merge changes | This change the source file. Unless you use source control, you may lose all changes |
+      | merge changes | This will change the source file. Unless you use source control, you may lose all changes |
       | merge system  | This change will update the system feature                                           |
diff --git a/spec/views/features/_legend.html.erb_spec.rb b/spec/views/features/_legend.html.erb_spec.rb
index 748ac766..33f390ee 100644
--- a/spec/views/features/_legend.html.erb_spec.rb
+++ b/spec/views/features/_legend.html.erb_spec.rb
@@ -7,7 +7,7 @@
     end
     
     it "should have a legend displaying system changes as green" do
-      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+      response.should have_selector :span, attribute = {:id => "legend"} do |legend_wrapper|
         legend_wrapper.should have_selector :span, attribute = {:class => "gd"} do |content|
           content.should contain "Removing from file"
         end
@@ -15,7 +15,7 @@
     end
 
     it "should have a legend displaying file changes as red" do
-      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+      response.should have_selector :span, attribute = {:id => "legend"} do |legend_wrapper|
         legend_wrapper.should have_selector :span, attribute = {:class => "gi"} do |content|
           content.should contain "Adding to file"
         end
@@ -29,7 +29,7 @@
     end
     
     it "should have a legend displaying system changes as green" do
-      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+      response.should have_selector :span, attribute = {:id => "legend"} do |legend_wrapper|
         legend_wrapper.should have_selector :span, attribute = {:class => "gi"} do |content|
           content.should contain "Adding to system"
         end
@@ -37,7 +37,7 @@
     end
 
     it "should have a legend displaying file changes as red" do
-      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+      response.should have_selector :span, attribute = {:id => "legend"} do |legend_wrapper|
         legend_wrapper.should have_selector :span, attribute = {:class => "gd"} do |content|
           content.should contain "Removing from system"
         end
@@ -50,7 +50,7 @@
       render :locals => {:diff_from => "system", :diff_to => "file", :change => true}
     end
     it "should display a different copy for changes to the system" do
-      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+      response.should have_selector :span, attribute = {:id => "legend"} do |legend_wrapper|
         legend_wrapper.should have_selector :span, attribute = {:class => "gd"} do |content|
           content.should contain "Changes to the system"
         end
@@ -58,7 +58,7 @@
     end
     
     it "should display a different copy for changes to the file" do
-      response.should have_selector :div, attribute = {:id => "legend"} do |legend_wrapper|
+      response.should have_selector :span, attribute = {:id => "legend"} do |legend_wrapper|
         legend_wrapper.should have_selector :span, attribute = {:class => "gi"} do |content|
           content.should contain "Changes to the file"
         end