UI improvement to license type display
Merge branch 'my'