Feature/menulinks

Resolves #1134