better menu link support