colors and nav bar changed
second commit
Merge pull request #1 from GerryFudd/master

Bringing in Alan's changes