Bugfixes logout and links