Subnav bugfixes