reverted agenda window setup change