AQ UI: Incorporated feedback from Sri