Updated navigation structure