rework secondary windows a bit