Admin Settings Refactor
Conflict Resolved while merge