Layout pass, fixing nav bar links