Changed top menu navigation items and the down page links.
Merge remote-tracking branch 'origin/master'