Added option to add and close individual windows
Updated multiple window