changed nav bar and the changed restrictions on what we can and can't seee
changed merges