Panel: Refactoring

Refactoring