Basvi-Bug Fixes

UATNBNXR0017,UATNBNXR0018(Blue Button Missing)