updated nav, updated content, working so far