several big changes

working mainly on nav bar