[TASK] merge nav updates to develop