Updated nav bar, content