Switch Window - closes #128