Updated Friends and Devices view and data model