improve link structure, edit menu again