Client window improvements