misc. refactoring
misc. refactor
fix alt-tab popup