refact nav