#8 Fix navigation.