Fixed small bug with button names