Fixed markup issue with checkboxes in user screens