Added creation of windows and cells