diff --git a/app/views/contexts/_context_state_group.rhtml b/app/views/contexts/_context_state_group.rhtml
index da0c95e1..d2971eb3 100644
--- a/app/views/contexts/_context_state_group.rhtml
+++ b/app/views/contexts/_context_state_group.rhtml
@@ -1,5 +1,8 @@
 <div class="list-stategroup-contexts-container" id="list-<%= state %>-contexts-container">
-  <h2><span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span><%= t("states."+ state +"_plural")%> <%= t('common.contexts') %></h2>
+  <h2>
+    <span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span>
+    <%= t("states."+ state +"_plural")%> <%= t('common.contexts') %>
+  </h2>
   <div id="<%= state%>-contexts-empty-nd" style="<%= no_contexts ? 'display:block' : 'display:none'%>">
     <div class="message"><p><%= t('contexts.no_contexts_' + state) %></p></div>
   </div>
diff --git a/features/calendar.feature b/features/calendar.feature
index e6a9dcf1..ddc68106 100644
--- a/features/calendar.feature
+++ b/features/calendar.feature
@@ -10,7 +10,7 @@ Feature: Show all due actions in a calendar view
     And I have logged in as "testuser" with password "secret"
     And I have a context called "@calendar"
 
-  @selenium 
+  @selenium
   Scenario: Setting due date of a todo will show it in the calendar
     When I submit a new action with description "a new next action" in the context "@calendar"
     And I go to the calendar page
@@ -22,7 +22,7 @@ Feature: Show all due actions in a calendar view
     Then the badge should show 1
     And I should see "a new next action"
 
-  @selenium
+  @selenium 
   Scenario: Clearing the due date of a todo will remove it from the calendar
     When I go to the home page
     And I submit a new action with description "a new next action" in the context "@calendar"
@@ -32,7 +32,7 @@ Feature: Show all due actions in a calendar view
     When I clear the due date of "a new next action"
     Then I should not see "a new next action"
 
-  @selenium
+  @selenium 
   Scenario: Marking a todo complete will remove it from the calendar
     Given I have a todo "a new next action" in the context "@calendar" which is due tomorrow
     When I go to the calendar page
@@ -54,4 +54,4 @@ Feature: Show all due actions in a calendar view
     When I go to the calendar page
     Then I should see "a new next action"
     When I edit the due date of "a new next action" to next month
-    Then I should see "a new next action" in the due next month container
\ No newline at end of file
+    Then I should see "a new next action" in the due next month container
diff --git a/features/step_definitions/todo_steps.rb b/features/step_definitions/todo_steps.rb
index a9d9f4da..acedd92c 100644
--- a/features/step_definitions/todo_steps.rb
+++ b/features/step_definitions/todo_steps.rb
@@ -294,10 +294,10 @@ Then /^I should see "([^"]*)" in the due next month container$/ do |todo_descrip
   todo = @current_user.todos.find_by_description(todo_description)
   todo.should_not be_nil
 
-  xpath = "xpath=//div[@id='due_after_this_month']//div[@id='line_todo_#{todo.id}']"
+  xpath = "//div[@id='due_after_this_month']//div[@id='line_todo_#{todo.id}']"
 
   wait_for :timeout => 5 do
-    !selenium.is_element_present(xpath)
+    selenium.is_element_present(xpath)
   end
 end
 
@@ -309,4 +309,4 @@ end
 Then /^the selected context should be "([^"]*)"$/ do |content|
   # Works for mobile. TODO: make it work for both mobile and non-mobile
   field_labeled("Context").element.search(".//option[@selected = 'selected']").inner_html.should =~ /#{content}/
-end
\ No newline at end of file
+end