Ashwin | #2229 |UI changes for device checkmarks.