Fix hidden tag and DRY input tags