more login stuff

Now displays correct stuff top right
Now logs off properly
Please no more
I also hope never to have to maintain this code...