Made some changes to the Windows