Changed to use single window when opening new window