OverviewPanel refactoring