changed the button type added user and com names