Tkt 1171: Minor UI Changes