Underline Tweaks

Fix style problems with last PR. Also better propagation of text-decoration.