Bug fixes in navigation