#10: Refactor form and add form validation for custom tags