Fixes for top nav