navigation fixes
redirection fixes