Fix and refactor UnderlineNav to resolve CLS issues and improve performance/code quality
#7506
+294
−597