Added settings and updated nav bar