Fixes #4669: Fix Display in Setting page
Merge pull request #490 from fanf/ust_4668/implem_4669/Improve_settings_display

Fixes #4669: Fix Display in Setting page