credential swapping debugged and tested
made devices in the list look nicer