Refactored panel