edited table and nav bar