fix(ui): Adding overflow handling (also goes to oss)

fix(ui): Adding overflow handling (also goes to oss) #5226