Fix forms template and button type extension