Labeled input field enhancements - new version as requested