Bug correction: duplicated form buttons