moar nav improvements