Forms component improvements