GUI refactoring in progress.