Merge "Use ems instead of pixels for checkbox"