Refactoring Guardian Tab