Window Management improving