Bug fix for broken nav