Improve navigation css selectors

Improve navigation css selectors