Bug fixes for nav and listing