Refactored the panel structure.