Adding new window management