Finished integrating DeviceListActivty and some xml files