Don't render the subnav select if there isn't subnav content

Also fixing the primary nav visibility