Improved UI of Restrictions and Valid Values views