Changed XPATH to use new style buttons

Changed XPATH to use new style buttons
Could you also change the `@disabled='true'` to `(@disabled='true' or contains(@class, 'btn-disabled'))` here?