Guardian panel refactoring