Refactored links menu