Small tweaks to device tools app