more nav bar tweaks
Merge branch 'master' into css2

proper merge
done42day