changed links, added rescue for menu