Fixed some button messages
Fixed button messages