minor modifications to forms, capybara related