Improved windows closing