Refactoring for multi-panel view