Improve output markup for checkbox field