Nicer window handling