working on nav bar
complete merge
to complete merge