Refactored with Panels 3.4

## Ready State: No