Updated nav and final additions