Some more work on those panels