More form enhancements