Update to checkbox/label/image/header, related to spacing and consistency