Done changes to the device manage UI, And fixed some issues in edit