changed button name, fixed wrapping of long names