Updated Links to new windows