Window

Moved display init