Subject:UI related changes

Description: