Fix nav and update