Login via xpath

and some more cleanup