Changed XPATH to use new style buttons

Changed XPATH to use new style buttons