Cleaned up shop admin