Nav moved into header from layout. User links moved from footer to header.