Fixed logged in header to save the login status over multiple pages
merge conflicts