Basvi-Bug Fixes

UATNBNXR0015(all alignment issues)