Fixed issues with navigation