Allow empty datasources when an $items param has been passed
Improve display for properties with the None source
Cosmetics