work on collapse factor dialog, smooth out handlers