More changes to make it SS 2.4 compat. and some styling changes to make it appear more inline with other standard fields.