DC | #3745 | text and ui changes