fix onstate (green) color for main nav
Merge branch 'master' into nav-B