Refactoring and prelim visualization panel.