Added Switch Window Feature