add working login button, remove user cruft
Merge branch 'logout'