Refactoring the Admin Component as per issue #917
Refactoring the Admin Component as per issue #917