Updated a few things and added nav