#t668 fix 508 UI issues