Moved ContextWindow under app.wizard.page
Added more used of imports to increase readability of code