Changed XPATH to use new style buttons
Merge pull request #1072 from psav/fix_buttons

Changed XPATH to use new style buttons