Major update - almost complete nav