more nav bar tweaks
Merge branch 'master' into css2

proper merge
done42day
Merge pull request #20 from PLopezD/master

done42day