Enhance devices management in general admin