Fixed Issue #419: Added admin settings into small groups to manage