Improve navigation css selectors