Fix the same duplicate method error I had in CButtonPart. Also add a few field border variations.