Cleaned up xpath

Made xpath a little lighter and cleaner so less chance of errors with
changes to site