MAJOR FIX - the xpaths
Merge branch 'master' of github.com:cprodescu/mws-frontend