Panel View support overhaul - Round 2