Fixed namespace issues with Welcome and Logout