modify the layout and the APIcall
merge deviceType and device, still null API call