fix menu order
factor out buddylist