cleanup in admin and added a place for system-wide settings