Fix nav, still need a better solution