Refactor demo window.