Fixed links in menu
Merge remote-tracking branch 'upstream/master'
full sync with okdios