Satya - Bug Fixes

UATNBNXR044,
UATNBNXR045(navigation bar standardisation)