[WIP]Global nav improvements