Movement between windows improved