Complete NBTC navbar updates