Updated Forms component