Small additional fixes for top nav