Improve nav partial
Improve nav partial