Fixed servlet linking issues and logout issues