Tech debt/2/refactor cluster popup