Refactoring for multi-panel view
Refactoring for multi-folder view