Changed XPATH to use new style buttons