Initial window refactored