Refactore into Application Window