improvment - swap window without change the layout you already have