Topnav fixes for issue #3405