Refactoring the Device Detail to move into the correct group