fixed the links in the menu
merged with master