Nav and articles updates 10/6
Attempting to merge our code