Capybara Bug Fix + Refactor