Admin area code reorganization and clean-up