Mike refactored and improved admin functionality