Fix bugs - moving windows