fix prefixing, and a nav issue