Partial Fix for UATNBNXR034 - 1st Revert

Alignment of buttons and wording
Pending “Failed cases