fix some minor issues with various fields in form theme