Add more ids for capybara testing
Naming clarification
Clarify naming
Merge pull request #617 from flapjack/capybara

Add more ids for capybara testing