changed nav bar again, needs merging