Make navigation menu more consistent