New version window overhaul