payment buttons fix + messages separate