Organize links a bit