cleaned up a few merge mistakes and factored out boilerplate in distributor menus