Added Add and Remove Windows