Fixed to use correct value
Added class to display invalid values