Add some UX modification

 - Add underline in TextBlock