Fixed naming of Close/New window, moved code, added image